Sync1 (#1)

* Version 6.2.0 : sortie du projet GUIToolkits.

* Version 6.2.0 du 23/06/23. Sortie du projet GUIToolkits. Les includes (XercesC.cmake) sont remplacés par des find_package/dependency (XercesC)

* New CI workflows

---------

Co-authored-by: Charles PIGNEROL <>

.github/workflows/make-release.yml

@@ -0,0 +1,11 @@
+name: Make release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  call:
+    name: Call check version CI
+    uses: LIHPC-Computational-Geometry/lihpccg-ci/.github/workflows/make-release-reusable.yml@main

.github/workflows/spack-ci.yml

@@ -1,13 +1,14 @@
 name: Spack CI
 
 on:
-  workflow_dispatch:
   push:
-    branches: [ main ]
+    branches:
+      - '**'
   pull_request:
-    branches: [ main ]
+  # Allows you to run this workflow manually
+  workflow_dispatch:
 
 jobs:
   call:
-    name: Call Spack reusable workflow
+    name: Call Spack CI
     uses: LIHPC-Computational-Geometry/lihpccg-ci/.github/workflows/spack-reusable.yml@main

CMakeLists.txt

@@ -3,8 +3,11 @@ cmake_minimum_required(VERSION 3.12)
 project (Preferences CXX)
 
 include (GNUInstallDirs)
+
+find_package (GUIToolkitsVariables)
+
 include (cmake/version.cmake)
-include (cmake/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
 
 set (Preferences_VERSION ${PREFERENCES_VERSION})
 

cmake/version.cmake

@@ -2,9 +2,9 @@
 # version.cmake : version du projet
 #
 
-set (PREFERENCES_MAJOR_VERSION "5")
-set (PREFERENCES_MINOR_VERSION "6")
-set (PREFERENCES_RELEASE_VERSION "2")
+set (PREFERENCES_MAJOR_VERSION "6")
+set (PREFERENCES_MINOR_VERSION "2")
+set (PREFERENCES_RELEASE_VERSION "0")
 set (PREFERENCES_VERSION ${PREFERENCES_MAJOR_VERSION}.${PREFERENCES_MINOR_VERSION}.${PREFERENCES_RELEASE_VERSION})
 
 

src/CfgEditor/CMakeLists.txt

@@ -1,8 +1,10 @@
 set (CURRENT_PACKAGE_NAME "CfgEditor")
 
+find_package (GUIToolkitsVariables)
+
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/workarounds.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
 
 add_executable (CfgEdit CfgEdit.cpp)
 

src/CfgUpdater/CMakeLists.txt

@@ -1,8 +1,10 @@
 set (CURRENT_PACKAGE_NAME "CfgUpdater")
 
+find_package (GUIToolkitsVariables)
+
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/workarounds.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
 
 add_executable (CfgUpdate CfgUpdate.cpp)
 

src/PrefsCore/BoolNamedValue.cpp

@@ -39,22 +39,25 @@ string BoolNamedValue::getStrValue ( ) const
 
 void BoolNamedValue::setStrValue (const string& value)
 {
+	checkForModification (true);	// v 5.7.0
+
 	if (trueStr == value)
 		setValue (true);
 	else if (falseStr == value)
 		setValue (false);
 	else
 	{
 		UTF8String	msg (charset);
-		msg << "Impossible de convertir la chaine de caractères "
-		    << value << " en booléen.";
+		msg << "Impossible de convertir la chaine de caractères " << value << " en booléen.";
 		throw Exception (msg);
 	}
 }	// BoolNamedValue::setStrValue
 
 
 void BoolNamedValue::setValue (bool value)
 {
+	checkForModification (true);	// v 5.7.0
+
 	_value	= value;
 }	// BoolNamedValue::setValue
 

src/PrefsCore/CMakeLists.txt

@@ -1,11 +1,13 @@
 set (CURRENT_PACKAGE_NAME "PrefsCore")
 set (CURRENT_PACKAGE_MACRO_NAME "PREFERENCES")
 
+find_package (GUIToolkitsVariables)
+
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/workarounds.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
 
-find_package (TkUtil 5 REQUIRED)
+find_package (TkUtil 6 REQUIRED)
 file (GLOB HEADERS public/${CURRENT_PACKAGE_NAME}/*.h)
 file (GLOB CPP_SOURCES *.cpp)
 

src/PrefsCore/ColorNamedValue.cpp

@@ -27,10 +27,11 @@ ColorNamedValue& ColorNamedValue::operator = (const ColorNamedValue& color)
 
 
 ColorNamedValue::ColorNamedValue (const UTF8String& name, double red, double green, double blue,
-                                  const UTF8String& comment)
-	: DoubleTripletNamedValue (name, 0., 0., 0., comment)
+                                  const UTF8String& comment, bool overloadable, bool safeguardable)
+	: DoubleTripletNamedValue (name, 0., 0., 0., comment, true, safeguardable)
 {
 	setValue (red, green, blue);
+	setOverloadable (overloadable);
 }	// ColorNamedValue::ColorNamedValue
 
 
@@ -42,6 +43,8 @@ Element* ColorNamedValue::clone ( ) const
 
 void ColorNamedValue::setStrValue (const string& value)
 {
+	checkForModification (true);	// v 5.7.0
+
 	double		red, green, blue;
 	char		p1, p2, c1, c2;
 	istringstream	stream (value.c_str ( ));
@@ -64,6 +67,8 @@ void ColorNamedValue::setStrValue (const string& value)
 
 void ColorNamedValue::setValue (double red, double green, double blue)
 {
+	checkForModification (true);	// v 5.7.0
+
 	evaluateValue (red, "rouge");
 	evaluateValue (green, "vert");
 	evaluateValue (blue, "bleu");
@@ -87,8 +92,7 @@ void ColorNamedValue::evaluateValue (double value, const string& name)
 		return;
 
 	UTF8String	errorMsg (charset);
-	errorMsg << "La composante " << name << " (" << value << ") de la couleur "
-	         << getName ( ) << " n'est pas comprise entre 0 et 1.";
+	errorMsg << "La composante " << name << " (" << value << ") de la couleur " << getName ( ) << " n'est pas comprise entre 0 et 1.";
 	throw Exception (errorMsg);
 }	// ColorNamedValue::evaluateValue
 

src/PrefsCore/DoubleNamedValue.cpp

@@ -42,6 +42,8 @@ string DoubleNamedValue::getStrValue ( ) const
 
 void DoubleNamedValue::setStrValue (const string& value)
 {
+	checkForModification (true);	// v 5.7.0
+
 	double		val;
 	istringstream	stream (value.c_str ( ));
 
@@ -50,8 +52,7 @@ void DoubleNamedValue::setStrValue (const string& value)
 	    (false == stream.eof ( )))
 	{
 		UTF8String	msg (charset);
-		msg << "Impossible de convertir la chaine de caractères "
-		    << value << " en double.";
+		msg << "Impossible de convertir la chaine de caractères " << value << " en double.";
 		throw Exception (msg);
 	}	// if ((true == stream.fail ( )) || ...
 
@@ -61,6 +62,8 @@ void DoubleNamedValue::setStrValue (const string& value)
 
 void DoubleNamedValue::setValue (double value)
 {
+	checkForModification (true);	// v 5.7.0
+
 	_value	= value;
 }	// DoubleNamedValue::setValue