From 40b60abcb31e9f088c25e403e7225fff5ccd1ffe Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 29 May 2018 11:29:44 -0400 Subject: [PATCH 01/14] [locale] Move constants for map-munging These don't have to be defines at all. --- src/modules/locale/timezonewidget/timezonewidget.cpp | 3 +++ src/modules/locale/timezonewidget/timezonewidget.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/locale/timezonewidget/timezonewidget.cpp b/src/modules/locale/timezonewidget/timezonewidget.cpp index 64557c151..6609160d5 100644 --- a/src/modules/locale/timezonewidget/timezonewidget.cpp +++ b/src/modules/locale/timezonewidget/timezonewidget.cpp @@ -27,6 +27,9 @@ #include "timezonewidget.h" + +static constexpr double MAP_Y_OFFSET = 0.125; +static constexpr double MAP_X_OFFSET = -0.0370; constexpr static double MATH_PI = 3.14159265; #ifdef DEBUG_TIMEZONES diff --git a/src/modules/locale/timezonewidget/timezonewidget.h b/src/modules/locale/timezonewidget/timezonewidget.h index a96a0309c..8589dc74d 100644 --- a/src/modules/locale/timezonewidget/timezonewidget.h +++ b/src/modules/locale/timezonewidget/timezonewidget.h @@ -36,8 +36,6 @@ #include "localeglobal.h" -#define MAP_Y_OFFSET 0.125 -#define MAP_X_OFFSET -0.0370 #define RGB_TRANSPARENT 0 #define ZONES "0.0 1.0 2.0 3.0 3.5 4.0 4.5 5.0 5.5 5.75 6.0 6.5 7.0 8.0 9.0 9.5 10.0 10.5 11.0 11.5 12.0 12.75 13.0 -1.0 -2.0 -3.0 -3.5 -4.0 -4.5 -5.0 -5.5 -6.0 -7.0 -8.0 -9.0 -9.5 -10.0 -11.0" #define X_SIZE 780 From 41d427e543071a8692b994f95354989aad6aa209 Mon Sep 17 00:00:00 2001 From: Gabriel Craciunescu Date: Fri, 1 Jun 2018 17:45:40 +0200 Subject: [PATCH 02/14] [modules]: hwclock fix typo - methode -> method --- src/modules/hwclock/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/hwclock/main.py b/src/modules/hwclock/main.py index d247ccd00..e2f70ee61 100644 --- a/src/modules/hwclock/main.py +++ b/src/modules/hwclock/main.py @@ -46,7 +46,7 @@ def run(): libcalamares.utils.debug("Hwclock returned error code {}".format(ret)) libcalamares.utils.debug(" .. ISA bus method failed.") else: - libcalamares.utils.debug("Hwclock set using ISA bus methode.") + libcalamares.utils.debug("Hwclock set using ISA bus method.") if is_broken_rtc and is_broken_isa: libcalamares.utils.debug("BIOS or Kernel BUG: Setting hwclock failed.") From 8430970e719251cb871a79743455c010e1d66ae0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 7 Jun 2018 13:47:41 +0200 Subject: [PATCH 03/14] [preservefiles] Reduce copying by using const-ref into list --- src/modules/preservefiles/PreserveFiles.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/preservefiles/PreserveFiles.cpp b/src/modules/preservefiles/PreserveFiles.cpp index 29564fcd1..0fe1d278b 100644 --- a/src/modules/preservefiles/PreserveFiles.cpp +++ b/src/modules/preservefiles/PreserveFiles.cpp @@ -93,7 +93,7 @@ Calamares::JobResult PreserveFiles::exec() prefix.append( '/' ); int count = 0; - for ( const auto it : m_items ) + for ( const auto& it : m_items ) { QString source = it.source; QString dest = prefix + atReplacements( it.dest ); @@ -162,7 +162,7 @@ void PreserveFiles::setConfigurationMap(const QVariantMap& configurationMap) QVariantList l = files.toList(); unsigned int c = 0; - for ( const auto li : l ) + for ( const auto& li : l ) { if ( li.type() == QVariant::String ) { From d82b103edae31067d5d7f71ddb9bf7a747f6ba4c Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 4 Jun 2018 08:21:57 -0400 Subject: [PATCH 04/14] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_da.ts | 6 +- lang/calamares_et.ts | 14 ++-- lang/calamares_fr.ts | 14 ++-- lang/calamares_id.ts | 14 ++-- lang/calamares_it_IT.ts | 165 ++++++++++++++++++++-------------------- lang/calamares_pl.ts | 8 +- 6 files changed, 111 insertions(+), 110 deletions(-) diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index 8ee303ef1..edbe2737f 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -485,12 +485,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. - + Kommandoen kører i værtsmiljøet og har brug for at kende rodstien, men der er ikke defineret nogen rootMountPoint. The command needs to know the user's name, but no username is defined. - + Kommandoen har brug for at kende brugerens navn, men der er ikke defineret noget brugernavn. @@ -1670,7 +1670,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead. - + Partitionstabellen på %1 har allerede %2 primære partitioner, og der kan ikke tilføjes flere. Fjern venligst en primær partition og tilføj i stedet en udviddet partition. diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts index e56118622..871f447da 100644 --- a/lang/calamares_et.ts +++ b/lang/calamares_et.ts @@ -485,12 +485,12 @@ Installija sulgub ja kõik muutused kaovad. The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. - + See käsklus käivitatakse hostikeskkonnas ning peab teadma juurteed, kuid rootMountPoint pole defineeritud. The command needs to know the user's name, but no username is defined. - + Käsklus peab teadma kasutaja nime, aga kasutajanimi pole defineeritud. @@ -1665,12 +1665,12 @@ Installija sulgub ja kõik muutused kaovad. Can not create new partition - + Uut partitsiooni ei saa luua The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead. - + Partitsioonitabel kohas %1 juba omab %2 peamist partitsiooni ning rohkem juurde ei saa lisada. Palun eemalda selle asemel üks peamine partitsioon ja lisa juurde laiendatud partitsioon. @@ -1816,17 +1816,17 @@ Installija sulgub ja kõik muutused kaovad. Saving files for later ... - + Salvestan faile hiljemaks... No files configured to save for later. - + Ühtegi faili ei konfigureeritud hiljemaks salvestamiseks. Not all of the configured files could be preserved. - + Ühtegi konfigureeritud faili ei suudetud säilitada. diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index f9796a5c9..b2356b5d2 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -485,12 +485,12 @@ L'installateur se fermera et les changements seront perdus. The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. - + La commande est exécutée dans l'environnement hôte et a besoin de connaître le chemin racine, mais aucun point de montage racine n'est défini. The command needs to know the user's name, but no username is defined. - + La commande a besoin de connaître le nom de l'utilisateur, mais aucun nom d'utilisateur n'est défini. @@ -1665,12 +1665,12 @@ L'installateur se fermera et les changements seront perdus. Can not create new partition - + Impossible de créer une nouvelle partition The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead. - + La table de partition sur %1 contient déjà %2 partitions primaires, et aucune supplémentaire ne peut être ajoutée. Veuillez supprimer une partition primaire et créer une partition étendue à la place. @@ -1817,17 +1817,17 @@ Vous pouvez obtenir un aperçu des différentes apparences en cliquant sur celle Saving files for later ... - + Sauvegarde des fichiers en cours pour plus tard... No files configured to save for later. - + Aucun fichier de sélectionné pour sauvegarde ultérieure. Not all of the configured files could be preserved. - + Certains des fichiers configurés n'ont pas pu être préservés. diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index ebfb416c3..3e6e991bd 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -487,12 +487,12 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. - + Perintah berjalan di lingkungan host dan perlu diketahui alur root-nya, tetapi bukan rootMountPoint yang ditentukan. The command needs to know the user's name, but no username is defined. - + Perintah perlu diketahui nama si pengguna, tetapi bukan nama pengguna yang ditentukan. @@ -1667,12 +1667,12 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Can not create new partition - + Tidak bisa menciptakan partisi baru. The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead. - + Partisi tabel pada %1 sudah memiliki %2 partisi primer, dan tidak ada lagi yang bisa ditambahkan. Silakan hapus salah satu partisi primer dan tambahkan sebuah partisi extended, sebagai gantinya. @@ -1818,17 +1818,17 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Saving files for later ... - + Menyimpan file untuk kemudian... No files configured to save for later. - + Tiada file yang dikonfigurasi untuk penyimpanan nanti. Not all of the configured files could be preserved. - + Tidak semua file yang dikonfigurasi dapat dipertahankan. diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts index 889f60c97..453321e44 100644 --- a/lang/calamares_it_IT.ts +++ b/lang/calamares_it_IT.ts @@ -4,7 +4,7 @@ The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - L'<strong>ambiente di avvio</strong> di questo sistema. <br><br>I vecchi sistemi x86 supportano solo <strong>BIOS</strong>. <bt>I sistemi moderni normalmente usano <strong>EFI</strong> ma possono anche usare BIOS se l'avvio viene eseguito in modalità compatibile. + L'<strong>ambiente di avvio</strong> di questo sistema. <br><br>I vecchi sistemi x86 supportano solo <strong>BIOS</strong>. <bt>I sistemi moderni normalmente usano <strong>EFI</strong> ma possono anche apparire come sistemi BIOS se avviati in modalità compatibile. @@ -241,7 +241,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno The installation is complete. Close the installer. - L'installazione è terminata. Chiudere l'installer. + L'installazione è terminata. Chiudere il programma d'installazione. @@ -485,12 +485,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. - + Il comando viene eseguito nell'ambiente host e richiede il percorso di root ma nessun rootMountPoint (punto di montaggio di root) è definito. The command needs to know the user's name, but no username is defined. - + Il comando richiede il nome utente, nessun nome utente definito. @@ -498,7 +498,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Contextual Processes Job - Attività dei processi contestuali + Job dei processi contestuali @@ -536,7 +536,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno LVM LV name - Nome LVM LV + Nome LV di LVM @@ -915,7 +915,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style=" font-style:italic;">Done</span> or close the installer.</p></body></html> - + <html><head/><body><p>Quando questa casella è selezionata, il sistema sarà riavviato immediatamente al click su <span style=" font-style:italic;">Fatto</span> o alla chiusura del programma d'installazione.</p></body></html> @@ -943,12 +943,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Installation Complete - Installazione Eseguita + Installazione completata The installation of %1 is complete. - L'installazione di %1 è completa. + L'installazione di %1 è completata. @@ -979,12 +979,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Konsole not installed - Konsole non installato + Konsole non installata Please install KDE Konsole and try again! - Si prega di installare KDE Konsole e provare nuovamente! + Si prega di installare KDE Konsole e riprovare! @@ -1195,7 +1195,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Network Installation. (Disabled: Received invalid groups data) - Installazione di rete. (Disabilitata: Ricevuti dati non validi sui gruppi) + Installazione di rete. (Disabilitata: Ricevuti dati non validi dei gruppi) @@ -1221,12 +1221,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Password is too weak - La password è troppo debole + Password troppo debole Memory allocation error when setting '%1' - + Errore di allocazione della memoria quando si imposta '%1' @@ -1236,217 +1236,217 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno The password is the same as the old one - La nuova password coincide con la precedente + La password coincide con la precedente The password is a palindrome - La password è palindroma + La password è un palindromo The password differs with case changes only - + La password differisce solo per lettere minuscole e maiuscole The password is too similar to the old one - La nuova password è troppo simile a quella precedente + La password è troppo simile a quella precedente The password contains the user name in some form - La password contiene il nome utente in una qualche forma + La password contiene il nome utente in qualche campo The password contains words from the real name of the user in some form - La password contiene parte del nome reale dell'utente in qualche forma + La password contiene parti del nome utente reale in qualche campo The password contains forbidden words in some form - + La password contiene parole vietate in alcuni campi The password contains less than %1 digits - La password contiene meno di %1 numeri + La password contiene meno di %1 cifre The password contains too few digits - La password contiene troppo pochi numeri + La password contiene poche cifre The password contains less than %1 uppercase letters - + La password contiene meno di %1 lettere maiuscole The password contains too few uppercase letters - + La password contiene poche lettere maiuscole The password contains less than %1 lowercase letters - + La password contiene meno di %1 lettere minuscole The password contains too few lowercase letters - + La password contiene poche lettere minuscole The password contains less than %1 non-alphanumeric characters - + La password contiene meno di %1 caratteri non alfanumerici The password contains too few non-alphanumeric characters - + La password contiene pochi caratteri non alfanumerici The password is shorter than %1 characters - + La password ha meno di %1 caratteri The password is too short - + La password è troppo corta The password is just rotated old one - + La password è solo una rotazione della precedente The password contains less than %1 character classes - + La password contiene meno di %1 classi di caratteri The password does not contain enough character classes - + La password non contiene classi di caratteri sufficienti The password contains more than %1 same characters consecutively - + La password contiene più di %1 caratteri uguali consecutivi The password contains too many same characters consecutively - + La password contiene troppi caratteri uguali consecutivi The password contains more than %1 characters of the same class consecutively - + La password contiene più di %1 caratteri consecutivi della stessa classe The password contains too many characters of the same class consecutively - + La password contiene molti caratteri consecutivi della stessa classe The password contains monotonic sequence longer than %1 characters - + La password contiene una sequenza monotona più lunga di %1 caratteri The password contains too long of a monotonic character sequence - + La password contiene una sequenza di caratteri monotona troppo lunga No password supplied - + Nessuna password fornita Cannot obtain random numbers from the RNG device - + Impossibile ottenere numeri casuali dal dispositivo RNG Password generation failed - required entropy too low for settings - + Generazione della password fallita - entropia richiesta troppo bassa per le impostazioni The password fails the dictionary check - %1 - + La password non supera il controllo del dizionario - %1 The password fails the dictionary check - + La password non supera il controllo del dizionario Unknown setting - %1 - + Impostazioni sconosciute - %1 Unknown setting - + Impostazione sconosciuta Bad integer value of setting - %1 - + Valore intero non valido per l'impostazione - %1 Bad integer value - + Valore intero non valido Setting %1 is not of integer type - + Impostazione %1 non è di tipo intero Setting is not of integer type - + Impostazione non è di tipo intero Setting %1 is not of string type - + Impostazione %1 non è di tipo stringa Setting is not of string type - + Impostazione non è di tipo stringa Opening the configuration file failed - + Apertura del file di configurazione fallita The configuration file is malformed - + Il file di configurazione non è corretto Fatal failure - + Errore fatale Unknown error - + Errore sconosciuto @@ -1665,12 +1665,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Can not create new partition - + Impossibile creare nuova partizione The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead. - + La tabella delle partizioni su %1 contiene già %2 partizioni primarie, non se ne possono aggiungere altre. Rimuovere una partizione primaria e aggiungere una partizione estesa invece. @@ -1776,13 +1776,13 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Plasma Look-and-Feel Job - Attività del tema di Plasma + Job di Plasma Look-and-Feel Could not select KDE Plasma Look-and-Feel package - Impossibile selezionare il pacchetto del tema di KDE Plasma + Impossibile selezionare il pacchetto di KDE Plasma Look-and-Feel @@ -1800,7 +1800,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. - + Scegliere il tema per il desktop KDE Plasma. Si può anche saltare questa scelta e configurare il tema dopo aver installato il sistema. Cliccando su selezione del tema, ne sarà mostrata un'anteprima dal vivo. @@ -1808,7 +1808,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Look-and-Feel - Tema + Look-and-Feel @@ -1816,17 +1816,17 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Saving files for later ... - + Salvataggio dei file per dopo ... No files configured to save for later. - + Nessun file configurato per dopo. Not all of the configured files could be preserved. - + Non tutti i file configurati possono essere preservati. @@ -1835,7 +1835,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno There was no output from the command. - + Non c'era output dal comando. @@ -1864,7 +1864,8 @@ Output: Command <i>%1</i> failed to start. - Il comando %1 non si è avviato. + Il comando %1 non si è avviato. + @@ -1874,7 +1875,7 @@ Output: Bad parameters for process job call. - Parametri errati per elaborare l'attività richiesta + Parametri errati per elaborare la chiamata al job. @@ -2334,7 +2335,7 @@ Output: Shell Processes Job - + Job dei processi della shell @@ -2343,7 +2344,7 @@ Output: %L1 / %L2 slide counter, %1 of %2 (numeric) - + %L1 / %L2 @@ -2372,7 +2373,7 @@ Output: Sending installation feedback. - Invio in corso della valutazione dell'installazione + Invio della valutazione dell'installazione. @@ -2382,7 +2383,7 @@ Output: HTTP request timed out. - La richiesta HTTP ha raggiunto il timeout. + La richiesta HTTP è scaduta. @@ -2406,12 +2407,12 @@ Output: Could not configure machine feedback correctly, script error %1. - Non è stato possibile configurare correttamente la valutazione automatica, errore script %1. + Non è stato possibile configurare correttamente la valutazione automatica, errore dello script %1. Could not configure machine feedback correctly, Calamares error %1. - Non è stato possibile configurare correttamente la valutazione automatica, errore Calamares %1. + Non è stato possibile configurare correttamente la valutazione automatica, errore di Calamares %1. @@ -2429,7 +2430,7 @@ Output: <html><head/><body><p>By selecting this, you will send <span style=" font-weight:600;">no information at all</span> about your installation.</p></body></html> - <html><head/><body><p>Selezionando questo, non verrà inviata <span style=" font-weight:600;">alcuna informazione</span> riguardo la propria installazione.</p></body></html> + <html><head/><body><p>Selezionando questo, non verrà inviata <span style=" font-weight:600;">alcuna informazione</span> relativa alla propria installazione.</p></body></html> @@ -2448,27 +2449,27 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> - <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Cliccare qui per maggiori informazioni riguardo la valutazione degli utenti</span></a></p></body></html> + <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Cliccare qui per maggiori informazioni sulla valutazione degli utenti</span></a></p></body></html> Install tracking helps %1 to see how many users they have, what hardware they install %1 to and (with the last two options below), get continuous information about preferred applications. To see what will be sent, please click the help icon next to each area. - Il tracciamento dell'installazione aiuta %1 a capire quanti utenti vengono serviti, su quale hardware installano %1 e (con le ultime due opzioni qui sotto), a ricevere continue informazioni riguardo le applicazioni preferite. Per vedere cosa verrà inviato, si prega di cliccare sull'icona di aiuto vicino ad ogni area. + Il tracciamento dell'installazione aiuta %1 a capire quanti utenti vengono serviti, su quale hardware si installa %1 e (con le ultime due opzioni sotto), a ricevere continue informazioni sulle applicazioni preferite. Per vedere cosa verrà inviato, cliccare sull'icona di aiuto accanto ad ogni area. By selecting this you will send information about your installation and hardware. This information will <b>only be sent once</b> after the installation finishes. - Selezionando questa opzione verranno inviate informazioni riguardo l'installazione e l'hardware. Queste informazioni verranno <b>inviate solo una volta</b> dopo che l'installazione è terminata. + Selezionando questa opzione saranno inviate informazioni relative all'installazione e all'hardware. I dati saranno <b>inviati solo una volta</b> al termine dell'installazione. By selecting this you will <b>periodically</b> send information about your installation, hardware and applications, to %1. - Selezionando questa opzione verranno inviate <b>periodicamente</b> informazioni riguardo l'installazione, l'hardware e le applicazioni, a %1. + Selezionando questa opzione saranno inviate <b>periodicamente</b> informazioni sull'installazione, l'hardware e le applicazioni, a %1. By selecting this you will <b>regularly</b> send information about your installation, hardware, applications and usage patterns, to %1. - Selezionando questa opzione verranno inviate <b>regolarmente</b> informazioni riguardo l'installazione, l'hardware, le applicazioni e il modo di utilizzo, a %1. + Selezionando questa opzione verranno inviate <b>regolarmente</b> informazioni sull'installazione, l'hardware, le applicazioni e i modi di utilizzo, a %1. @@ -2571,7 +2572,7 @@ Output: <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Grazie a: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg e al <a href="https://www.transifex.com/calamares/calamares/">team dei traduttori di Calamares</a>.<br/><br/>Lo sviluppo di<a href="https://calamares.io/">Calamares</a> è sponsorizzato da <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts index ea5512300..65c0343f0 100644 --- a/lang/calamares_pl.ts +++ b/lang/calamares_pl.ts @@ -490,7 +490,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. The command needs to know the user's name, but no username is defined. - + Polecenie musi znać nazwę użytkownika, ale żadna nazwa nie została jeszcze zdefiniowana. @@ -1816,17 +1816,17 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. Saving files for later ... - + Zapisywanie plików na później ... No files configured to save for later. - + Nie skonfigurowano żadnych plików do zapisania na później. Not all of the configured files could be preserved. - + Nie wszystkie pliki konfiguracyjne mogą być zachowane. From 8acb88ed4dd1e82e2abd5f4a60821d9b9f9f6561 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 4 Jun 2018 08:21:58 -0400 Subject: [PATCH 05/14] i18n: [desktop] Automatic merge of Transifex translations --- calamares.desktop | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/calamares.desktop b/calamares.desktop index caba57a7e..f8be5d1f3 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -92,9 +92,9 @@ GenericName[lt]=Sistemos diegimas į kompiuterį Comment[lt]=Calamares — Sistemos diegimo programa Name[lt]=Įdiegti Sistemą Icon[it_IT]=calamares -GenericName[it_IT]=Programma di installazione -Comment[it_IT]=Calamares — Installare il Sistema -Name[it_IT]=Installa il Sistema +GenericName[it_IT]=Programma d'installazione del sistema +Comment[it_IT]=Calamares — Programma d'installazione del sistema +Name[it_IT]=Installa il sistema Icon[nb]=calamares GenericName[nb]=Systeminstallatør Comment[nb]=Calamares-systeminstallatør From 54515688f7afa87592376e4e8d439b5e9cb43d8f Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 4 Jun 2018 08:21:59 -0400 Subject: [PATCH 06/14] i18n: [dummypythonqt] Automatic merge of Transifex translations --- .../lang/it_IT/LC_MESSAGES/dummypythonqt.mo | Bin 970 -> 979 bytes .../lang/it_IT/LC_MESSAGES/dummypythonqt.po | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.mo index 14d83f4892241afb32aee1a8c69b5ee5b3c93ee7..2c001df40a95891aa1c484f764d780697ee2e759 100644 GIT binary patch delta 141 zcmX@bewlqji0O7l28IM67Gz*xkYHwDFaXk8K$;s!M+0doAe|1RMS*k^khTKSGd6Z= zFbY`c8kp)DStuBoSecsZ8kkHz$Y`SzoLH7xl$oz!Qw(9~B^4#+B_}2)XXZPk=O$+6 b=q2ap+UY1585o*vR$vNXWK5e}$Q%g(2gn~} delta 132 zcmcc2eu{lUi0L{;28IM67Gz*x;AduFFaXkuK$;s!2LWj*ARPy!MS*lBkhTKS{Tn+q z7zNCA4UKe-3>6H`tV~R_4GbqAWVBKCO)N^zSBTP6u*uELORO?8GjmAKP0Y;EOU}== W(@`)oFf`w+$rQlI=r*~EIT8Sxwi;Cc diff --git a/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po index 02dec56cb..6b22b4b65 100644 --- a/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-21 16:44+0100\n" +"POT-Creation-Date: 2018-05-28 04:57-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Marco Z. , 2017\n" +"Last-Translator: Saverio , 2016\n" "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +28,7 @@ msgstr "Una nuova QLabel." #: src/modules/dummypythonqt/main.py:97 msgid "Dummy PythonQt ViewStep" -msgstr "PythonQt ViewStep Fittizio" +msgstr "PythonQt ViewStep fittizio" #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" From 430ca800f7454f341375c78f96494c4492a45cb6 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 4 Jun 2018 08:21:59 -0400 Subject: [PATCH 07/14] i18n: [python] Automatic merge of Transifex translations --- lang/python/it_IT/LC_MESSAGES/python.mo | Bin 1162 -> 1173 bytes lang/python/it_IT/LC_MESSAGES/python.po | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lang/python/it_IT/LC_MESSAGES/python.mo b/lang/python/it_IT/LC_MESSAGES/python.mo index 2407dbe213cb18d12278dc8098376a97dc9363bb..9aee6696ec0bbaacade9577ec1c0e5ad4d389a30 100644 GIT binary patch delta 254 zcmeC;oXR;N#dRek1H*M77GYpuXk=z!5C_uJfV2>hUI(Owf%HKjZ40EY0%;>4EzH8e zU;(7vfV3!(uHU%wG^1QVW@<@MzJgm(VqS7;aWasVpI4HYm#Cv)WMF7Mc{0;`W3T)q zg@VeGjQl)>w9Jx{%&N?MJ%#{?KygWGfkJgHT!O(pH7~U&ak2oT$mGM!`r1IXd8rC1 znF^{Jd8N6UDGCLN$;lb1KvVP>TyqkW@{1CoN>V3_usCq$!!%5eW|0z5$OIakld4c$ K3A86yj{yLesz*lv delta 174 zcmbQr*~K{_#dQ@U1H*M77Gz*xXkuny5CPItfV2>hUJ0ayf%G0AZ2_b&0BJoS&B?;R zUSaQa(;Y4VsffOZgHMoa(=Fzj)IYap~d7$Oz$T? z)SbMA*_k;nC4cgNW@#26tuR@M#euyvzbq9bn9U+3nx3ASuaJ_OqmY)Fld4c$SzMBu G%K!iuXe-hH diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po index 24100878d..0ad2a26ed 100644 --- a/lang/python/it_IT/LC_MESSAGES/python.po +++ b/lang/python/it_IT/LC_MESSAGES/python.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-05-28 04:57-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Mark , 2018\n" +"Last-Translator: Pietro Francesco Fontana, 2017\n" "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,15 +20,15 @@ msgstr "" #: src/modules/umount/main.py:40 msgid "Unmount file systems." -msgstr "Smontaggio del file system" +msgstr "Smonta i file system." #: src/modules/dummypython/main.py:44 msgid "Dummy python job." -msgstr "Dummy python job." +msgstr "Job python fittizio." #: src/modules/dummypython/main.py:97 msgid "Dummy python step {}" -msgstr "Dummy python step {}" +msgstr "Python step {} fittizio" #: src/modules/machineid/main.py:35 msgid "Generate machine-id." @@ -37,7 +37,7 @@ msgstr "Genera machine-id." #: src/modules/packages/main.py:61 #, python-format msgid "Processing packages (%(count)d / %(total)d)" -msgstr "Elaborando i pacchetti (%(count)d / %(total)d)" +msgstr "Elaborazione dei pacchetti (%(count)d / %(total)d)" #: src/modules/packages/main.py:63 src/modules/packages/main.py:73 msgid "Install packages." @@ -48,11 +48,11 @@ msgstr "Installa pacchetti." msgid "Installing one package." msgid_plural "Installing %(num)d packages." msgstr[0] "Installando un pacchetto." -msgstr[1] "Installando %(num)d pacchetti." +msgstr[1] "Installazione di %(num)d pacchetti." #: src/modules/packages/main.py:69 #, python-format msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "Rimuovendo un pacchetto." -msgstr[1] "Rimuovendo %(num)d pacchetti." +msgstr[1] "Rimozione di %(num)d pacchetti." From 91a5ec426d57aa1724fd7ca0e4faa4e0eb14c426 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 7 Jun 2018 13:16:57 +0200 Subject: [PATCH 08/14] CMake: shuffle the top-level CMakeLists - Put all the options near the top, easy to spot when reading the file - Put the settings that need regular updates, like version, near the top - Add some "section headers" --- CMakeLists.txt | 61 +++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e7ca237f..2de3d661a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,12 +33,33 @@ project( calamares C CXX ) cmake_minimum_required( VERSION 3.2 ) -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" ) -set( CMAKE_CXX_STANDARD 14 ) -set( CMAKE_CXX_STANDARD_REQUIRED ON ) -set( CMAKE_C_STANDARD 99 ) -set( CMAKE_C_STANDARD_REQUIRED ON ) +### OPTIONS +# +option( INSTALL_CONFIG "Install configuration files" ON ) +option( BUILD_TESTING "Build the testing tree." ON ) +option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) +option( WITH_PYTHONQT "Enable next generation Python modules API (experimental, requires PythonQt)." ON ) +option( WITH_KF5Crash "Enable crash reporting with KCrash." ON ) + + +### Calamares application info +# +set( CALAMARES_ORGANIZATION_NAME "Calamares" ) +set( CALAMARES_ORGANIZATION_DOMAIN "github.com/calamares" ) +set( CALAMARES_APPLICATION_NAME "Calamares" ) +set( CALAMARES_DESCRIPTION_SUMMARY + "The distribution-independent installer framework" ) + +set( CALAMARES_VERSION_MAJOR 3 ) +set( CALAMARES_VERSION_MINOR 2 ) +set( CALAMARES_VERSION_PATCH 0 ) +set( CALAMARES_VERSION_RC 0 ) + + +### CMAKE SETUP +# +set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" ) # CMake 3.9, 3.10 compatibility if( POLICY CMP0071 ) @@ -52,8 +73,15 @@ if(NOT CMAKE_VERSION VERSION_LESS "3.10.0") ) endif() - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" ) +### C++ SETUP +# +set( CMAKE_CXX_STANDARD 14 ) +set( CMAKE_CXX_STANDARD_REQUIRED ON ) +set( CMAKE_C_STANDARD 99 ) +set( CMAKE_C_STANDARD_REQUIRED ON ) + +set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" ) if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) message( STATUS "Found Clang ${CMAKE_CXX_COMPILER_VERSION}, setting up Clang-specific compiler flags." ) set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" ) @@ -139,12 +167,6 @@ if( ECM_FOUND ) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) endif() -option( INSTALL_CONFIG "Install configuration files" ON ) -option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) -option( WITH_PYTHONQT "Enable next generation Python modules API (experimental, requires PythonQt)." ON ) -option( WITH_KF5Crash "Enable crash reporting with KCrash." ON ) -option( BUILD_TESTING "Build the testing tree." ON ) - find_package( KF5 COMPONENTS CoreAddons Crash ) if( NOT KF5Crash_FOUND ) set( WITH_KF5Crash OFF ) @@ -245,23 +267,10 @@ endif() unset( prev_tx ) unset( curr_tx ) -add_subdirectory( lang ) # i18n tools - -### -### Calamares application info -### -set( CALAMARES_ORGANIZATION_NAME "Calamares" ) -set( CALAMARES_ORGANIZATION_DOMAIN "github.com/calamares" ) -set( CALAMARES_APPLICATION_NAME "Calamares" ) -set( CALAMARES_DESCRIPTION_SUMMARY "The distribution-independent installer framework" ) set( CALAMARES_TRANSLATION_LANGUAGES en ${_tx_complete} ${_tx_good} ${_tx_ok} ) list( SORT CALAMARES_TRANSLATION_LANGUAGES ) -### Bump version here -set( CALAMARES_VERSION_MAJOR 3 ) -set( CALAMARES_VERSION_MINOR 2 ) -set( CALAMARES_VERSION_PATCH 0 ) -set( CALAMARES_VERSION_RC 0 ) +add_subdirectory( lang ) # i18n tools set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} ) set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" ) From fc979404d1e8e443f7820e0efcfbbea023442219 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 7 Jun 2018 13:26:22 +0200 Subject: [PATCH 09/14] CMake: move translation settings up - Follow previous move of user-adaptable settings and regularly-updated variables to the top of CMakeLists.txt with a move of the list of translated languages. --- CMakeLists.txt | 60 ++++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2de3d661a..73af6b201 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,6 +57,37 @@ set( CALAMARES_VERSION_PATCH 0 ) set( CALAMARES_VERSION_RC 0 ) +### Transifex (languages) info +# +# complete = 100% translated, +# good = nearly complete (use own judgement, right now >= 75%) +# ok = incomplete (more than 25% untranslated), +# bad = 0% translated, placeholder in tx; these are not included. +# +# Language en (source language) is added later. It isn't listed in +# Transifex either. Get the list of languages and their status +# from https://transifex.com/calamares/calamares/ . +# +# When adding a new language, take care that it is properly loaded +# by the translation framework. Languages with alternate scripts +# (sr@latin in particular) may need special handling in CalamaresUtils.cpp. +# +# TODO: drop the es_ES translation from Transifex +# TODO: move eo (Esperanto) to _ok once Qt can actually create a +# locale for it. +# +# NOTE: when updating the list from Transifex, copy these four lines +# and prefix each variable name with "p", so that the automatic +# checks for new languages and misspelled ones are done (that is, +# copy these four lines to four backup lines, add "p", and then update +# the original four lines with the current translations). +set( _tx_complete da pt_PT ro tr_TR zh_TW zh_CN pt_BR fr hr ca lt id cs_CZ ) +set( _tx_good sq es pl ja sk it_IT hu ru he de nl bg uk ) +set( _tx_ok ast is ar sv el es_MX gl en_GB th fi_FI hi eu sr nb + sl sr@latin mr es_PR kk kn et be ) +set( _tx_bad uz lo ur gu fr_CH fa eo ) + + ### CMAKE SETUP # set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" ) @@ -211,33 +242,10 @@ endif() ### Transifex Translation status # -# complete = 100% translated, -# good = nearly complete (use own judgement, right now >= 75%) -# ok = incomplete (more than 25% untranslated), -# bad = 0% translated, placeholder in tx; these are not included. +# Construct language lists for use. If there are p_tx* variables, +# then run an extra cmake-time check for consistency of the old +# (p_tx*) and new (_tx*) lists. # -# Language en (source language) is added later. It isn't listed in -# Transifex either. Get the list of languages and their status -# from https://transifex.com/calamares/calamares/ . -# -# When adding a new language, take care that it is properly loaded -# by the translation framework. Languages with alternate scripts -# (sr@latin in particular) may need special handling in CalamaresUtils.cpp. -# -# TODO: drop the es_ES translation from Transifex -# TODO: move eo (Esperanto) to _ok once Qt can actually create a -# locale for it. -# -# NOTE: when updating the list from Transifex, copy these four lines -# and prefix each variable name with "p", so that the automatic -# checks for new languages and misspelled ones are done. -set( _tx_complete da pt_PT ro tr_TR zh_TW zh_CN pt_BR fr hr ca lt id cs_CZ ) -set( _tx_good sq es pl ja sk it_IT hu ru he de nl bg uk ) -set( _tx_ok ast is ar sv el es_MX gl en_GB th fi_FI hi eu sr nb - sl sr@latin mr es_PR kk kn et be ) -set( _tx_bad uz lo ur gu fr_CH fa eo ) - -# check translation update set( prev_tx ${p_tx_complete} ${p_tx_good} ${p_tx_ok} ${p_tx_bad} ) set( curr_tx ${_tx_complete} ${_tx_good} ${_tx_ok} ${_tx_bad} ) if ( prev_tx ) From 15b97f8e3f330b5548c365dbedd84d3059e32a1b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 7 Jun 2018 13:31:12 +0200 Subject: [PATCH 10/14] [libcalamares] Add missing include-dir - Fix build on FreeBSD, where the yaml-cpp headers don't live in any normally-searched include directory. --- src/libcalamares/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index cbc049ac6..598d3c313 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -40,6 +40,7 @@ mark_thirdparty_code( ${kdsagSources} ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} + ${YAMLCPP_INCLUDE_DIR} ) if( WITH_PYTHON ) From dfd76ed384f617856870e361759e088f97cc8331 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 7 Jun 2018 13:34:15 +0200 Subject: [PATCH 11/14] CMake: drop unused variable (no thirdparty/ dir anymore) --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73af6b201..1c393a675 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -329,7 +329,6 @@ configure_file( set( CALAMARES_CMAKE_DIR "${CMAKE_SOURCE_DIR}/CMakeModules" ) set( CALAMARES_LIBRARIES calamares ) -set( THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/thirdparty" ) ### Example Distro # @@ -382,7 +381,6 @@ endif() # "http://tldp.org/HOWTO/SquashFS-HOWTO/creatingandusing.html" add_feature_info( ExampleDistro ${mksquashfs_FOUND} "Create example-distro target.") -# add_subdirectory( thirdparty ) add_subdirectory( src ) add_feature_info(Python ${WITH_PYTHON} "Python job modules") From fd2afc3ba9e1058b9ee284a49f1a2d60a70d52b5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 7 Jun 2018 13:39:28 +0200 Subject: [PATCH 12/14] CMake: move dependency-versioning info to top --- CMakeLists.txt | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c393a675..66550a13e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,6 +88,16 @@ set( _tx_ok ast is ar sv el es_MX gl en_GB th fi_FI hi eu sr nb set( _tx_bad uz lo ur gu fr_CH fa eo ) +### Required versions +# +# See DEPENDENCIES section below. +set( QT_VERSION 5.6.0 ) +set( YAMLCPP_VERSION 0.5.1 ) +set( ECM_VERSION 5.18 ) +set( PYTHONLIBS_VERSION 3.3 ) +set( BOOSTPYTHON_VERSION 1.54.0 ) + + ### CMAKE SETUP # set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" ) @@ -182,17 +192,17 @@ endif() include( FeatureSummary ) include( CMakeColors ) -set( QT_VERSION 5.6.0 ) +### DEPENDENCIES +# find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core Gui Widgets LinguistTools Svg Quick QuickWidgets ) -find_package( YAMLCPP 0.5.1 REQUIRED ) +find_package( YAMLCPP ${YAMLCPP_VERSION} REQUIRED ) find_package( PolkitQt5-1 REQUIRED ) # Find ECM once, and add it to the module search path; Calamares # modules that need ECM can do # find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE), # no need to mess with the module path after. -set( ECM_VERSION 5.18 ) find_package(ECM ${ECM_VERSION} NO_MODULE) if( ECM_FOUND ) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) @@ -207,7 +217,7 @@ if( BUILD_TESTING ) enable_testing() endif () -find_package( PythonLibs 3.3 ) +find_package( PythonLibs ${PYTHONLIBS_VERSION} ) set_package_properties( PythonLibs PROPERTIES DESCRIPTION "C interface libraries for the Python 3 interpreter." @@ -217,7 +227,7 @@ set_package_properties( if ( PYTHONLIBS_FOUND ) include( BoostPython3 ) - find_boost_python3( 1.54.0 ${PYTHONLIBS_VERSION_STRING} CALAMARES_BOOST_PYTHON3_FOUND ) + find_boost_python3( ${BOOSTPYTHON_VERSION} ${PYTHONLIBS_VERSION_STRING} CALAMARES_BOOST_PYTHON3_FOUND ) set_package_properties( Boost PROPERTIES PURPOSE "Boost.Python is used for Python job modules." From e52c99685d1165ea8de0ae532c636860e7868cf9 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 7 Jun 2018 13:43:44 +0200 Subject: [PATCH 13/14] CMake: untangle more sections of top-level CMakeLists.txt --- CMakeLists.txt | 119 ++++++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 57 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66550a13e..4d4a24550 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -290,55 +290,6 @@ list( SORT CALAMARES_TRANSLATION_LANGUAGES ) add_subdirectory( lang ) # i18n tools -set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} ) -set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" ) -if( CALAMARES_VERSION_RC ) - set( CALAMARES_VERSION ${CALAMARES_VERSION}rc${CALAMARES_VERSION_RC} ) -endif() - -# additional info for non-release builds -if( NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" ) - include( CMakeDateStamp ) - set( CALAMARES_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" ) - if( CALAMARES_VERSION_DATE GREATER 0 ) - set( CALAMARES_VERSION ${CALAMARES_VERSION}.${CALAMARES_VERSION_DATE} ) - endif() - - include( CMakeVersionSource ) - if( CMAKE_VERSION_SOURCE ) - set( CALAMARES_VERSION ${CALAMARES_VERSION}-${CMAKE_VERSION_SOURCE} ) - endif() -endif() - -# enforce using constBegin, constEnd for const-iterators -add_definitions( "-DQT_STRICT_ITERATORS" ) - -# set paths -set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) -set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) -set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - -# Better default installation paths: GNUInstallDirs defines -# CMAKE_INSTALL_FULL_SYSCONFDIR to be CMAKE_INSTALL_PREFIX/etc by default -# but we really want /etc -if( NOT DEFINED CMAKE_INSTALL_SYSCONFDIR ) - set( CMAKE_INSTALL_SYSCONFDIR "/etc" ) -endif() - -# make predefined install dirs available everywhere -include( GNUInstallDirs ) - -# make uninstall support -configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY -) - -# Early configure these files as we need them later on -set( CALAMARES_CMAKE_DIR "${CMAKE_SOURCE_DIR}/CMakeModules" ) -set( CALAMARES_LIBRARIES calamares ) - ### Example Distro # @@ -391,6 +342,58 @@ endif() # "http://tldp.org/HOWTO/SquashFS-HOWTO/creatingandusing.html" add_feature_info( ExampleDistro ${mksquashfs_FOUND} "Create example-distro target.") + +### CALAMARES PROPER +# +set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} ) +set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" ) +if( CALAMARES_VERSION_RC ) + set( CALAMARES_VERSION ${CALAMARES_VERSION}rc${CALAMARES_VERSION_RC} ) +endif() + +# additional info for non-release builds +if( NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" ) + include( CMakeDateStamp ) + set( CALAMARES_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" ) + if( CALAMARES_VERSION_DATE GREATER 0 ) + set( CALAMARES_VERSION ${CALAMARES_VERSION}.${CALAMARES_VERSION_DATE} ) + endif() + + include( CMakeVersionSource ) + if( CMAKE_VERSION_SOURCE ) + set( CALAMARES_VERSION ${CALAMARES_VERSION}-${CMAKE_VERSION_SOURCE} ) + endif() +endif() + +# enforce using constBegin, constEnd for const-iterators +add_definitions( "-DQT_STRICT_ITERATORS" ) + +# set paths +set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) +set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) +set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) + +# Better default installation paths: GNUInstallDirs defines +# CMAKE_INSTALL_FULL_SYSCONFDIR to be CMAKE_INSTALL_PREFIX/etc by default +# but we really want /etc +if( NOT DEFINED CMAKE_INSTALL_SYSCONFDIR ) + set( CMAKE_INSTALL_SYSCONFDIR "/etc" ) +endif() + +# make predefined install dirs available everywhere +include( GNUInstallDirs ) + +# make uninstall support +configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY +) + +# Early configure these files as we need them later on +set( CALAMARES_CMAKE_DIR "${CMAKE_SOURCE_DIR}/CMakeModules" ) +set( CALAMARES_LIBRARIES calamares ) + add_subdirectory( src ) add_feature_info(Python ${WITH_PYTHON} "Python job modules") @@ -398,14 +401,6 @@ add_feature_info(PythonQt ${WITH_PYTHONQT} "Python view modules") add_feature_info(Config ${INSTALL_CONFIG} "Install Calamares configuration") add_feature_info(KCrash ${WITH_KF5Crash} "Crash dumps via KCrash") -feature_summary(WHAT ALL) - -get_directory_property( SKIPPED_MODULES - DIRECTORY src/modules - DEFINITION LIST_SKIPPED_MODULES -) -calamares_explain_skipped_modules( ${SKIPPED_MODULES} ) - # Add all targets to the build-tree export set set( CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Calamares" CACHE PATH "Installation directory for CMake files" ) set( CMAKE_INSTALL_FULL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}" ) @@ -490,3 +485,13 @@ configure_file( add_custom_target( uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake ) + +### CMAKE SUMMARY REPORT +# +feature_summary(WHAT ALL) + +get_directory_property( SKIPPED_MODULES + DIRECTORY src/modules + DEFINITION LIST_SKIPPED_MODULES +) +calamares_explain_skipped_modules( ${SKIPPED_MODULES} ) From 52f2161c35d84b921681649d2a1e4f49c8d7a914 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 7 Jun 2018 14:17:43 +0200 Subject: [PATCH 14/14] CMake: make polkit-qt5-1 optional - This is only found in order to know where polkit files should be installed. In distro's that don't use polkit, may as well make it entirely optional. --- CMakeLists.txt | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d4a24550..c33ad8e6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ cmake_minimum_required( VERSION 3.2 ) ### OPTIONS # option( INSTALL_CONFIG "Install configuration files" ON ) +option( INSTALL_POLKIT "Install Polkit configuration" ON ) option( BUILD_TESTING "Build the testing tree." ON ) option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) option( WITH_PYTHONQT "Enable next generation Python modules API (experimental, requires PythonQt)." ON ) @@ -197,7 +198,18 @@ include( CMakeColors ) # find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core Gui Widgets LinguistTools Svg Quick QuickWidgets ) find_package( YAMLCPP ${YAMLCPP_VERSION} REQUIRED ) -find_package( PolkitQt5-1 REQUIRED ) +if( INSTALL_POLKIT ) + find_package( PolkitQt5-1 REQUIRED ) +else() + # Find it anyway, for dependencies-reporting + find_package( PolkitQt5-1 ) +endif() +set_package_properties( + PolkitQt5-1 PROPERTIES + DESCRIPTION "Qt5 support for Polkit" + URL "https://cgit.kde.org/polkit-qt-1.git" + PURPOSE "PolkitQt5-1 helps with installing Polkit configuration" +) # Find ECM once, and add it to the module search path; Calamares # modules that need ECM can do @@ -454,12 +466,14 @@ if( INSTALL_CONFIG ) ) endif() -install( - FILES - com.github.calamares.calamares.policy - DESTINATION - "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" -) +if( INSTALL_POLKIT ) + install( + FILES + com.github.calamares.calamares.policy + DESTINATION + "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" + ) +endif() install( FILES