Merge pull request #34 from Hayao0819/master

Calamares v3.2.28 and Supported AlterISO2 and 3

Author: noMA-4

3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp

@@ -1119,7 +1119,7 @@ void KDSingleApplicationGuard::Private::poll() {
     }
 }
 
-#include "moc_kdsingleapplicationguard.cpp"
+// #include "moc_kdsingleapplicationguard.cpp"
 
 #ifdef KDTOOLSCORE_UNITTESTS
 

CHANGES

@@ -3,6 +3,63 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
+# 3.2.28.2 (2020-08-12) #
+
+A second hotfix, for autologin support -- the autologin group was not
+created in the target system before assigning the user to it. Reported
+by Marco Obaid.
+
+
+# 3.2.28.1 (2020-08-10) #
+
+This is a hotfix release for #1482 and #1483, where no user was
+created during installation and a chmod was failing (resulting in
+a failed installation). Reported by Jonathan Riddell.
+
+With incidental improvements in SPDX tagging (code licensing)
+and some new icon options for the welcomeq and localeq modules.
+
+
+# 3.2.28 (2020-08-09) #
+
+This release contains contributions from (alphabetically by first name):
+ - Anke Boersma
+ - apt-ghetto
+ - Victor Ibragimov
+
+## Core ##
+ - A new object *Network* is available to QML modules in `io.calamares.core`.
+   It exposes network status through the *hasInternet* property.
+ - Welcome to Tajik translations. The Tajik language has quickly reached
+   100% completion. Thanks Victor!
+ - Welcome to [Interlingue](https://en.wikipedia.org/wiki/Interlingue).
+   The translation is at an early stage. Qt does not support language
+   code *ie* though, so it may take some time to be integrated (much
+   like Esperanto wasn't supported until Qt 5.12).
+
+## Modules ##
+ - The *locale* module has been completely redone on the inside.
+   Users should see no changes. #1391
+ - The *localeq* module uses the redone internals of the locale module.
+   It can now be used to set timezone, language and locale information
+   and is a suitable alternative module. Thanks to Anke Boersma who did
+   the work of figuring out maps. Note that the map uses several GeoIP
+   and GeoData providers and you may need to configure the URLs
+   with suitable usernames for those services. #1426
+ - Both *locale* and *localeq* can now be configured to use the system's
+   timezone setting -- this can be useful to avoid both hard-coding an
+   initial zone and doing extra GeoIP lookups, in the case where the
+   live system already does so. #1391
+ - The *locale* and *localeq* modules have additional machinery for
+   timezone lookups; please report cases where clicking on the map
+   returns an obviously bogus timezone (up until this release, for
+   instance, Cape Town).
+ - The *users* module no longer accepts `root` as a username. #1462
+ - The *keyboardq* module is now more inline with the look of the rest
+   of the Calamares modules, use of a background image is removed.
+ - The *grubcfg* module now understands `/etc/default/grub.d`. #1457
+
+
 # 3.2.27 (2020-07-11) #
 
 This release contains contributions from (alphabetically by first name):

CMakeLists.txt

@@ -1,5 +1,8 @@
 # === This file is part of Calamares - <https://github.com/calamares> ===
 #
+#   SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
+#   SPDX-License-Identifier: GPL-3.0-or-later
+#
 #   Calamares is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation, either version 3 of the License, or
@@ -13,9 +16,6 @@
 #   You should have received a copy of the GNU General Public License
 #   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
 #
-#   SPDX-License-Identifier: GPL-3.0-or-later
-#   License-Filename: LICENSE
-#
 ###
 #
 # Generally, this CMakeLists.txt will find all the dependencies for Calamares
@@ -46,7 +46,7 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.27
+    VERSION 3.2.28.2
     LANGUAGES C CXX )
 
 set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
@@ -140,20 +140,18 @@ set( CALAMARES_DESCRIPTION_SUMMARY
 # TODO: drop the es_ES translation from Transifex
 #
 # NOTE: move eo (Esperanto) to _ok once Qt can actually create a
-#       locale for it. (Qt 5.12.2 can, see check later on).
-# NOTE: update these lines by running txstats.py, or 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).
-#
-# Total 66 languages
-set( _tx_complete az az_AZ ca he hi hr ja sq tr_TR uk zh_TW )
-set( _tx_good as ast be cs_CZ da de es fi_FI fr hu it_IT ko lt ml
-    nl pt_BR pt_PT ru sk sv zh_CN )
-set( _tx_ok ar bg el en_GB es_MX es_PR et eu fa gl id is mr nb pl
-    ro sl sr sr@latin th )
-set( _tx_incomplete bn ca@valencia eo fr_CH gu kk kn lo lv mk ne_NP
+#       locale for it. (Qt 5.12.2 can, see Translation Status section).
+# NOTE: move ie (Interlingue) to _ok once Qt supports it.
+# NOTE: update these lines by running `txstats.py`, or for full automation
+#       `txstats.py -e`. See also
+#
+# Total 68 languages
+set( _tx_complete ca fi_FI he hr nl pt_BR sq tg tr_TR uk zh_TW )
+set( _tx_good as ast az az_AZ be cs_CZ da de es fr hi hu it_IT ja
+    ko lt ml pt_PT ru sk sv zh_CN )
+set( _tx_ok ar bg el en_GB es_MX es_PR et eu fa gl id is mr nb
+    pl ro sl sr sr@latin th )
+set( _tx_incomplete bn ca@valencia eo fr_CH gu ie kk kn lo lv mk ne_NP
     ur uz )
 
 ### Required versions
@@ -286,14 +284,6 @@ find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Concurrent Core Gui LinguistTool
 if( WITH_QML )
     find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Quick QuickWidgets )
 endif()
-if( Qt5_VERSION VERSION_GREATER 5.12.1 )
-    # At least Qt 5.12.2 seems to support Esperanto in QLocale
-    if( "eo" IN_LIST _tx_incomplete )
-        message(STATUS "Esperanto support since Qt 5.12.2, enabling Esperanto locale")
-        list( REMOVE_ITEM _tx_incomplete "eo" )
-        list( APPEND _tx_ok "eo" )
-    endif()
-endif()
 # Optional Qt parts
 find_package( Qt5DBus CONFIG )
 
@@ -355,23 +345,33 @@ set_package_properties(
     URL "https://python.org"
     PURPOSE "Python 3 interpreter for certain tests."
 )
+
+set( _schema_explanation "" )
 if ( PYTHONINTERP_FOUND )
-    message(STATUS "Found Python 3 interpreter ${PYTHON_EXECUTABLE}")
     if ( BUILD_SCHEMA_TESTING )
         # The configuration validator script has some dependencies,
         # and if they are not installed, don't run. If errors out
         # with exit(1) on missing dependencies.
-        exec_program( ${PYTHON_EXECUTABLE} ARGS "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" -x RETURN_VALUE _validator_deps )
+        if ( CALAMARES_CONFIGVALIDATOR_CHECKED )
+            set( _validator_deps ${CALAMARES_CONFIGVALIDATOR_RESULT} )
+        else()
+            exec_program( ${PYTHON_EXECUTABLE} ARGS "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" -x RETURN_VALUE _validator_deps )
+            set( CALAMARES_CONFIGVALIDATOR_CHECKED TRUE CACHE INTERNAL "Dependencies for configvalidator checked" )
+            set( CALAMARES_CONFIGVALIDATOR_RESULT ${_validator_deps} CACHE INTERNAL "Result of configvalidator dependency check" )
+        endif()
         # It should never succeed, but only returns 1 when the imports fail
         if ( _validator_deps EQUAL 1 )
-            message(STATUS "BUILD_SCHEMA_TESTING dependencies are missing." )
+            set( _schema_explanation " Missing dependencies for configvalidator.py." )
             set( BUILD_SCHEMA_TESTING OFF )
         endif()
     endif()
 else()
     # Can't run schema tests without Python3.
+    set( _schema_explanation " Missing Python3." )
     set( BUILD_SCHEMA_TESTING OFF )
 endif()
+add_feature_info( yaml-schema BUILD_SCHEMA_TESTING "Validate YAML (config files) with schema.${_schema_explanation}" )
+
 find_package( PythonLibs ${PYTHONLIBS_VERSION} )
 set_package_properties(
     PythonLibs PROPERTIES
@@ -419,30 +419,22 @@ set(Calamares_WITH_QML ${WITH_QML})
 
 ### Transifex Translation status
 #
-# 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.
+# Construct language lists for use.
 #
-set( prev_tx ${p_tx_complete} ${p_tx_good} ${p_tx_ok} ${p_tx_incomplete} )
+if( Qt5_VERSION VERSION_GREATER 5.12.1 )
+    # At least Qt 5.12.2 seems to support Esperanto in QLocale
+    if( "eo" IN_LIST _tx_incomplete )
+        message(STATUS "Esperanto support since Qt 5.12.2, enabling Esperanto locale")
+        list( REMOVE_ITEM _tx_incomplete "eo" )
+        list( APPEND _tx_ok "eo" )
+    endif()
+endif()
+
 set( curr_tx ${_tx_complete} ${_tx_good} ${_tx_ok} ${_tx_incomplete} )
 set( tx_errors OFF )
-if ( prev_tx )
-    # Gone in new list
-    foreach( l ${prev_tx} )
-        list( FIND curr_tx ${l} p_l )
-        if( p_l EQUAL -1 )
-            message(WARNING "Language ${l} was present in previous translations and is now absent.")
-            set( tx_errors ON )
-        endif()
-    endforeach()
-
+if ( curr_tx )
     # New in list
     foreach( l ${curr_tx} )
-        list( FIND prev_tx ${l} p_l )
-        if( p_l EQUAL -1 )
-            message(WARNING "Language ${l} is new.")
-            set( tx_errors ON )
-        endif()
         set( p_l "lang/calamares_${l}.ts" )
         if( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${p_l} )
             message(WARNING "Language ${l} has no .ts file yet.")
@@ -453,7 +445,6 @@ if ( prev_tx )
     unset( p_l )
     unset( l )
 endif()
-unset( prev_tx )
 unset( curr_tx )
 if( tx_errors )
     message( FATAL_ERROR "Translation warnings, see above." )
@@ -464,14 +455,6 @@ list( SORT CALAMARES_TRANSLATION_LANGUAGES )
 
 add_subdirectory( lang )  # i18n tools
 
-if ( INSTALL_COMPLETION )
-    if( NOT CMAKE_INSTALL_BASHCOMPLETIONDIR )
-        set( CMAKE_INSTALL_BASHCOMPLETIONDIR "${CMAKE_INSTALL_DATADIR}/bash-completion/completions" )
-    endif()
-
-    install( FILES ${CMAKE_SOURCE_DIR}/data/completion/bash/calamares DESTINATION "${CMAKE_INSTALL_BASHCOMPLETIONDIR}" )
-endif()
-
 ### Example Distro
 #
 # For testing purposes Calamares includes a very, very, limited sample
@@ -536,7 +519,11 @@ if( CALAMARES_VERSION_RC )
     set( CALAMARES_VERSION ${CALAMARES_VERSION}rc${CALAMARES_VERSION_RC} )
 endif()
 
-# additional info for non-release builds
+# Additional info for non-release builds. The "extended" version information
+# with date and git information (commit, dirty status) is used only
+# by CalamaresVersionX.h, which is included by consumers that need a full
+# version number with all that information; normal consumers can include
+# CalamaresVersion.h with more stable numbers.
 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}" )
@@ -657,6 +644,14 @@ if( INSTALL_POLKIT )
     )
 endif()
 
+if ( INSTALL_COMPLETION )
+    if( NOT CMAKE_INSTALL_BASHCOMPLETIONDIR )
+        set( CMAKE_INSTALL_BASHCOMPLETIONDIR "${CMAKE_INSTALL_DATADIR}/bash-completion/completions" )
+    endif()
+
+    install( FILES ${CMAKE_SOURCE_DIR}/data/completion/bash/calamares DESTINATION "${CMAKE_INSTALL_BASHCOMPLETIONDIR}" )
+endif()
+
 install(
   FILES calamares.desktop
   DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

CMakeModules/CalamaresAddLibrary.cmake

@@ -62,10 +62,8 @@ function(calamares_add_library)
     include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
     # add resources from current dir
-    if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${LIBRARY_RESOURCES}")
-        qt5_add_resources(LIBRARY_RC_SOURCES "${LIBRARY_RESOURCES}")
-        list(APPEND LIBRARY_SOURCES ${LIBRARY_RC_SOURCES})
-        unset(LIBRARY_RC_SOURCES)
+    if(LIBRARY_RESOURCES)
+        list(APPEND LIBRARY_SOURCES ${LIBRARY_RESOURCES})
     endif()
 
     # add target
@@ -81,6 +79,9 @@ function(calamares_add_library)
     if(LIBRARY_UI)
         calamares_autouic(${target} ${LIBRARY_UI})
     endif()
+    if(LIBRARY_RESOURCES)
+        calamares_autorcc(${target} ${LIBRARY_RESOURCES})
+    endif()
 
     if(LIBRARY_EXPORT_MACRO)
         set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS ${LIBRARY_EXPORT_MACRO})

CMakeModules/CalamaresAddPlugin.cmake

@@ -187,13 +187,22 @@ function( calamares_add_plugin )
         install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_DESC_FILE}
                 DESTINATION ${PLUGIN_DESTINATION} )
 
+        set( _warned_config OFF )
         foreach( PLUGIN_CONFIG_FILE ${PLUGIN_CONFIG_FILES} )
-            configure_file( ${PLUGIN_CONFIG_FILE} ${PLUGIN_CONFIG_FILE} COPYONLY )
+            if( ${CMAKE_CURRENT_SOURCE_DIR}/${PLUGIN_CONFIG_FILE} IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_CONFIG_FILE} OR INSTALL_CONFIG )
+                configure_file( ${PLUGIN_CONFIG_FILE} ${PLUGIN_CONFIG_FILE} COPYONLY )
+            else()
+                message( "   ${BoldYellow}Not updating${ColorReset} ${PLUGIN_CONFIG_FILE}" )
+                set( _warned_config ON )
+            endif()
             if ( INSTALL_CONFIG )
                 install(
                     FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_CONFIG_FILE}
                     DESTINATION ${PLUGIN_DATA_DESTINATION} )
             endif()
         endforeach()
+        if ( _warned_config )
+            message( "" )
+        endif()
     endif()
 endfunction()