Merge branch 'Develop'

Adrien SCHADLE · Adrien SCHADLE · commit 2cb8cb3a4ee2 · 2022-06-24T09:26:20.000+02:00
diff --git a/interfaces/xpcf/remoting/ISerializable.h b/interfaces/xpcf/remoting/ISerializable.h
@@ -116,7 +116,7 @@ BOOST_SERIALIZATION_SPLIT_FREE(std::chrono::system_clock::time_point)
 namespace boost {
 namespace serialization {
 
-template<uint N>
+template<unsigned int N>
 struct Serialize
 {
     template<class Archive, typename... Args>
diff --git a/samples/sample_component/packagedependencies.txt b/samples/sample_component/packagedependencies.txt
@@ -1,2 +1,2 @@
-xpcf|2.5.1|xpcf%USE_XPCF_BOOST|github|https://github.com/b-com-software-basis/xpcf/releases/download
-xpcf-std|2.5.1|xpcf-std%USE_XPCF_STD|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf|2.5.2|xpcf%USE_XPCF_BOOST|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf-std|2.5.2|xpcf-std%USE_XPCF_STD|github|https://github.com/b-com-software-basis/xpcf/releases/download
diff --git a/samples/sample_component/xpcfSampleComponent.pro b/samples/sample_component/xpcfSampleComponent.pro
@@ -3,7 +3,7 @@ CONFIG -= app_bundle qt
 
 TARGET = xpcfSampleComponent
 FRAMEWORK = $${TARGET}
-VERSION=2.5.1
+VERSION=2.5.2
 DEFINES += MYVERSION=$${VERSION}
 
 CONFIG += c++17
diff --git a/samples/xpcfHelloConfigurable/packagedependencies.txt b/samples/xpcfHelloConfigurable/packagedependencies.txt
@@ -1 +1 @@
-xpcf|2.5.1|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf|2.5.2|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
diff --git a/samples/xpcfHelloInjectableAdapter/packagedependencies.txt b/samples/xpcfHelloInjectableAdapter/packagedependencies.txt
@@ -1 +1 @@
-xpcf|2.5.1|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf|2.5.2|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
diff --git a/samples/xpcfHelloPeople/packagedependencies.txt b/samples/xpcfHelloPeople/packagedependencies.txt
@@ -1 +1 @@
-xpcf|2.5.1|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf|2.5.2|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
diff --git a/samples/xpcfHelloWithAllComponents/packagedependencies.txt b/samples/xpcfHelloWithAllComponents/packagedependencies.txt
@@ -1 +1 @@
-xpcf|2.5.1|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf|2.5.2|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
diff --git a/samples/xpcfHelloWorld/packagedependencies.txt b/samples/xpcfHelloWorld/packagedependencies.txt
@@ -1 +1 @@
-xpcf|2.5.1|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf|2.5.2|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
diff --git a/samples/xpcfSampleRunner/packagedependencies.txt b/samples/xpcfSampleRunner/packagedependencies.txt
@@ -1 +1 @@
-xpcf|2.5.1|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf|2.5.2|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
diff --git a/scripts/swig/build_swig_csharp.sh b/scripts/swig/build_swig_csharp.sh
@@ -3,7 +3,7 @@
 QTVERSION=5.15.2
 
 PLATFORM="linux-gcc"
-XPCF_VERSION=2.5.1
+XPCF_VERSION=2.5.2
 TARGET_LANG="csharp"
 DESTFOLDER="swig-xpcf-cxx"
 DESTSAMPLEFOLDER="swig-xpcf-sample-cxx"
diff --git a/scripts/swig/packagedependencies.txt b/scripts/swig/packagedependencies.txt
@@ -1,2 +1,2 @@
-xpcf|2.5.1|xpcf%USE_XPCF_BOOST|github|https://github.com/
-xpcf-std|2.5.1|xpcf-std%USE_XPCF_STD|github|https://github.com/
+xpcf|2.5.2|xpcf%USE_XPCF_BOOST|github|https://github.com/
+xpcf-std|2.5.2|xpcf-std%USE_XPCF_STD|github|https://github.com/
diff --git a/scripts/swig/swig_xpcf.pro b/scripts/swig/swig_xpcf.pro
@@ -5,7 +5,7 @@ CONFIG -= qt
 ## global defintions : target lib name, version
 TARGET = swig_xpcf
 FRAMEWORK = $${TARGET}
-VERSION=2.5.1
+VERSION=2.5.2
 
 DEFINES += MYVERSION=$${VERSION}
 DEFINES += TEMPLATE_LIBRARY
diff --git a/scripts/swig/swig_xpcf_sample.pro b/scripts/swig/swig_xpcf_sample.pro
@@ -5,7 +5,7 @@ CONFIG -= qt
 ## global defintions : target lib name, version
 TARGET = swig_xpcf_sample
 FRAMEWORK = $${TARGET}
-VERSION=2.5.1
+VERSION=2.5.2
 
 DEFINES += MYVERSION=$${VERSION}
 DEFINES += TEMPLATE_LIBRARY
diff --git a/scripts/swig/test/packagedependencies.txt b/scripts/swig/test/packagedependencies.txt
@@ -1 +1 @@
-swig_xpcf_sample|2.5.1|swig_xpcf_sample|github|https://github.com/
+swig_xpcf_sample|2.5.2|swig_xpcf_sample|github|https://github.com/
diff --git a/scripts/unixes/build_xpcf_grpc_test_sample.sh b/scripts/unixes/build_xpcf_grpc_test_sample.sh
@@ -34,5 +34,5 @@ if [ ! -d ${XPCFROOT}/scripts/unixes/build-xpcf_grpc_gen/static/release ]; then
 	exit 2
 fi
 
-${XPCFROOT}/scripts/unixes/build-xpcf_grpc_gen/static/release/${XPCF_GRPC_GEN_APPLICATION} -n xpcfSampleComponent -v 2.5.1 -r @github -u https://github.com/b-com-software-basis/xpcf/releases/releases/download --std c++1z --database_dir ../../samples/sample_component/ --remove_comments_in_macro -o ${XPCFROOT}/scripts/unixes/build-grpc_gen_folder_sampleComponent -g protobuf -i workspace/github/xpcf/samples/sample_component
+${XPCFROOT}/scripts/unixes/build-xpcf_grpc_gen/static/release/${XPCF_GRPC_GEN_APPLICATION} -n xpcfSampleComponent -v 2.5.2 -r @github -u https://github.com/b-com-software-basis/xpcf/releases/releases/download --std c++1z --database_dir ../../samples/sample_component/ --remove_comments_in_macro -o ${XPCFROOT}/scripts/unixes/build-grpc_gen_folder_sampleComponent -g protobuf -i workspace/github/xpcf/samples/sample_component
 ${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcfGrpcRemotingxpcfSampleComponent shared ${XPCFROOT}/scripts/unixes/build-grpc_gen_folder_sampleComponent
diff --git a/scripts/unixes/make_remaken_package.sh b/scripts/unixes/make_remaken_package.sh
@@ -36,11 +36,11 @@ do
 for buildMode in ${BUILDMODES}
 do
 BUILDFOLDER=$HOME/.remaken/packages/${REMAKEN_PLATFORM}/${linkMode}/${buildMode}
-if [ -d ${BUILDFOLDER}/${PKGNAME} ]
+if [ -d ${BUILDFOLDER}/${PKGNAME}_${PKGVERSION}/${PKGNAME} ]
 then
-echo "Packaging ${PKGNAME}-${PKGVERSION} from folder ${BUILDFOLDER}/${PKGNAME}"
-pushd ${BUILDFOLDER}
-zip -r -y ${PKGNAME}_${PKGVERSION}_x86_64_${linkMode}_${buildMode}.zip ${PKGNAME}
+echo "Packaging ${PKGNAME}-${PKGVERSION} from folder ${BUILDFOLDER}/${PKGNAME}_${PKGVERSION}/${PKGNAME}"
+pushd ${BUILDFOLDER}/${PKGNAME}_${PKGVERSION}
+zip -r -y ${BUILDFOLDER}/${PKGNAME}_${PKGVERSION}_x86_64_${linkMode}_${buildMode}.zip ${PKGNAME}
 popd
 fi
 done
diff --git a/scripts/unixes/package_xpcf.sh b/scripts/unixes/package_xpcf.sh
@@ -28,5 +28,5 @@ ${XPCFROOT}/scripts/unixes/build_remaken_project_package.sh xpcf shared ${XPCFRO
 ${XPCFROOT}/scripts/unixes/build_remaken_project_package.sh xpcf static ${XPCFROOT} ${QTVERSION}
 ${XPCFROOT}/scripts/unixes/build_remaken_project_package.sh xpcfSampleComponent shared ${XPCFROOT}/samples/sample_component ${QTVERSION}
 
-${XPCFROOT}/scripts/unixes/make_remaken_package.sh xpcf 2.5.1
-${XPCFROOT}/scripts/unixes/make_remaken_package.sh xpcfSampleComponent 2.5.1
+${XPCFROOT}/scripts/unixes/make_remaken_package.sh xpcf 2.5.2
+${XPCFROOT}/scripts/unixes/make_remaken_package.sh xpcfSampleComponent 2.5.2
diff --git a/scripts/win/build_remaken_project.bat b/scripts/win/build_remaken_project.bat
@@ -75,7 +75,7 @@ goto:eof
 
 :display_usage
 
-echo This script builds %PROJECTNAME% in static mode.
+echo This script builds a remaken project.
 echo It takes the project name as first argument and can receive threes optional arguments.
 echo.
 echo "Usage: [project name] [ build mode {shared|static} | default='%MODE%' ] [path to  project root - default='%PROJECTROOT%'] [Qt kit version to use - default='%QTVERSION%']"
diff --git a/scripts/win/build_remaken_project_package.bat b/scripts/win/build_remaken_project_package.bat
@@ -0,0 +1,84 @@
+@echo off
+setlocal
+
+REM default parameter value
+set QTVERSION=5.14.2
+set PROJECTROOT=../..
+set MODE=shared
+set QMAKEMODE=
+
+REM check whether user had supplied -h or --help . If yes display usage 
+for %%A in ("--help" "-h") do if "%1"==%%A (call:display_usage %1 & exit /b 0)
+
+REM default win walues
+if not "%1" == "" goto args_count_ok
+:args_count_ko
+call:display_usage
+exit /b 1
+:args_count_ok
+
+set PROJECTNAME=%1
+if NOT [%2]==[] set MODE=%2
+if NOT [%3]==[] set PROJECTROOT=%3
+if NOT [%4]==[] set QTVERSION=%4
+
+set JOM_PATH=c:\Qt\Tools\QtCreator\bin\jom
+set QMAKE_PATH=C:\Qt\%QTVERSION%\msvc2017_64\bin
+
+if not %MODE%==shared (if not %MODE%==static (echo "mode must be either shared or static - %MODE% is an unsupported value" & exit /b 2) )
+if %MODE%==static (
+	set QMAKEMODE="CONFIG+=staticlib"
+	if %MODE%==static (echo "%MODE% build enabled: building with "CONFIG+=staticlib" option")
+)
+
+if not exist %QMAKE_PATH% (echo "Qt path '%QMAKE_PATH%' doesn't exist : check your Qt installation and kits" & exit /b 2)
+
+if not exist %PROJECTROOT% (echo "Project root path '%PROJECTROOT%' doesn't exist" & exit /b 2)
+
+if not exist %PROJECTROOT%/%PROJECTNAME%.pro (
+    echo "Project path '%PROJECTROOT%/%PROJECTNAME%.pro' doesn't exist"
+    echo "Trying  %PROJECTROOT%/%PROJECTNAME%/%PROJECTNAME%.pro"
+    if exist %PROJECTROOT%/%PROJECTNAME%/%PROJECTNAME%.pro (set PROJECTROOT=%PROJECTROOT%/%PROJECTNAME%) else echo ("Project path '%PROJECTROOT%/%PROJECTNAME%/%PROJECTNAME%.pro' doesn't exist" & exit /b /2)
+)
+
+REM check path is relative or absolute
+if not %PROJECTROOT:~1,1%==: (set PROJECTROOT=../../../%PROJECTROOT%)
+echo "Project root path used is : %PROJECTROOT%"
+echo "Project path used is : %PROJECTROOT%/%PROJECTNAME%.pro"
+
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvars64.bat"
+
+set BUILDROOTFOLDER=build-%PROJECTNAME%-package
+
+if exist %BUILDROOTFOLDER%\%MODE% rmdir /S /Q %BUILDROOTFOLDER%\%MODE%
+if not exist %BUILDROOTFOLDER%\%MODE%\debug mkdir %BUILDROOTFOLDER%\%MODE%\debug
+if not exist %BUILDROOTFOLDER%\%MODE%\release mkdir %BUILDROOTFOLDER%\%MODE%\release
+
+echo "===========> building %PROJECTNAME% static <==========="
+pushd %BUILDROOTFOLDER%\%MODE%\debug
+%QMAKE_PATH%\qmake.exe %PROJECTROOT%/%PROJECTNAME%.pro -spec win32-msvc CONFIG+=debug %QMAKEMODE% CONFIG+=package_remaken
+%JOM_PATH%\jom.exe
+%JOM_PATH%\jom.exe install
+popd
+pushd %BUILDROOTFOLDER%\\%MODE%\release
+%QMAKE_PATH%\qmake.exe %PROJECTROOT%/%PROJECTNAME%.pro -spec win32-msvc %QMAKEMODE% CONFIG+=package_remaken
+%JOM_PATH%\jom.exe
+%JOM_PATH%\jom.exe install
+popd
+
+endlocal
+goto:eof
+
+::--------------------------------------------------------
+::-- Function display_usage starts below here
+::--------------------------------------------------------
+
+:display_usage
+
+echo This script builds a remaken project.
+echo It takes the project name as first argument and can receive threes optional arguments.
+echo.
+echo "Usage: [project name] [ build mode {shared|static} | default='%MODE%' ] [path to  project root - default='%PROJECTROOT%'] [Qt kit version to use - default='%QTVERSION%']"
+exit /b 0
+
+:end
diff --git a/scripts/win/build_test_xpcf.bat b/scripts/win/build_test_xpcf.bat
@@ -17,10 +17,15 @@ if NOT [%2]==[] set QTVERSION=%2
 if not exist %XPCFROOT% (echo "XPCF project root path '%XPCFROOT%' doesn't exist" & exit /b 2)
 echo "XPCF project root path used is : %XPCFROOT%"
 
-call %XPCFROOT%/scripts/win/build_xpcf.bat %XPCFROOT% %QTVERSION%
-call %XPCFROOT%/scripts/win/build_remaken_project.bat xpcfSampleComponent shared %XPCFROOT%/samples/sample_component %QTVERSION%
+if not exist %XPCFROOT%/scripts/win/build-xpcf (
+	pause
+	echo "%XPCFROOT%/scripts/win/build-xpcf path doesn't exist"
+	echo "Running build_xpcf.bat"
+	call %XPCFROOT%/scripts/win/build_xpcf.bat %XPCFROOT% %QTVERSION%
+	pause
+)
 call %XPCFROOT%/scripts/win/build_remaken_project.bat testxpcf shared %XPCFROOT%/test %QTVERSION%
-call %XPCFROOT%/scripts/win/build_remaken_project.bat xpcfcli static %XPCFROOT%/tools/cli %QTVERSION%
+call %XPCFROOT%/scripts/win/build_remaken_project.bat xpcfcli shared %XPCFROOT%/tools/cli %QTVERSION%
 
 endlocal
 goto:eof
diff --git a/scripts/win/build_xpcf.bat b/scripts/win/build_xpcf.bat
@@ -14,6 +14,7 @@ if NOT [%2]==[] set QTVERSION=%2
 
 call %XPCFROOT%/scripts/win/build_remaken_project.bat xpcf shared %XPCFROOT% %QTVERSION%
 call %XPCFROOT%/scripts/win/build_remaken_project.bat xpcf static %XPCFROOT% %QTVERSION%
+call %XPCFROOT%/scripts/win/build_remaken_project.bat xpcfSampleComponent shared %XPCFROOT%/samples/sample_component %QTVERSION%
 
 endlocal
 goto:eof
@@ -24,7 +25,7 @@ goto:eof
 
 :display_usage
 
-echo This script builds %PROJECT% in shared mode.
+echo This script builds XPCF in shared and static mode.
 echo It can receive two optional argument. 
 echo.
 echo Usage: param [path to xpcf project root - default='%XPCFROOT%'] [Qt kit version to use - default='%QTVERSION%']
diff --git a/scripts/win/make_remaken_package.bat b/scripts/win/make_remaken_package.bat
@@ -11,7 +11,7 @@ call:display_usage
 exit /b 1
 :args_count_ok
 
-echo "===========> package shared <==========="
+echo "===========> package <==========="
 set PKGNAME=%1
 set PKGVERSION=%2
 set REMAKEN_PLATFORM=win-cl-14.1
@@ -22,8 +22,8 @@ for %%b in (%BUILDMODES%) do (
 	REM https://stackoverflow.com/questions/8648178/getting-substring-of-a-token-in-for-loop
 	setlocal EnableDelayedExpansion
 	for %%l in (%LINKMODES%) do (
-		SET BUILDFOLDER=%USERPROFILE%\.remaken\packages\%REMAKEN_PLATFORM%\%%l\%%b
-		if exist !BUILDFOLDER!\%PKGNAME% (
+		SET BUILDFOLDER=%USERPROFILE%\.remaken\packages\%REMAKEN_PLATFORM%\%%l\%%b\%PKGNAME%_%PKGVERSION%
+		if exist !BUILDFOLDER!\%PKGNAME%\ (
 			echo Packaging %PKGNAME%-%PKGVERSION% from folder !BUILDFOLDER!\%PKGNAME%
 			7z a -tzip %PKGNAME%_%PKGVERSION%_x86_64_%%l_%%b.zip !BUILDFOLDER!\%PKGNAME% >NUL
 		)
diff --git a/scripts/win/package_xpcf.bat b/scripts/win/package_xpcf.bat
@@ -2,8 +2,7 @@
 cls
 setlocal
 
-set PROJECT=xpcf
-set PKGVERSION=2.5.1
+set PKGVERSION=2.5.2
 
 REM default parameter value
 set QTVERSION=5.14.2
@@ -16,48 +15,12 @@ REM default win walues
 if NOT [%1]==[] set XPCFROOT=%1
 if NOT [%2]==[] set QTVERSION=%2
 
-set JOM_PATH=c:\Qt\Tools\QtCreator\bin\jom
-set QMAKE_PATH=C:\Qt\%QTVERSION%\msvc2017_64\bin
+call %XPCFROOT%/scripts/win/build_remaken_project_package.bat xpcf shared %XPCFROOT% %QTVERSION%
+call %XPCFROOT%/scripts/win/build_remaken_project_package.bat xpcf static %XPCFROOT% %QTVERSION%
+call %XPCFROOT%/scripts/win/build_remaken_project_package.bat xpcfSampleComponent shared %XPCFROOT%/samples/sample_component %QTVERSION%
 
-if not exist %QMAKE_PATH% (echo "Qt path '%QMAKE_PATH%' doesn't exist : check your Qt installation and kits" & exit /b 2)
-if not exist %XPCFROOT% (echo "XPCF project root path '%XPCFROOT%' doesn't exist" & exit /b 2)
-echo "XPCF project root path used is : %XPCFROOT%"
-
-call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvars64.bat"
-
-if exist build-%PROJECT%-package\shared rmdir /S /Q build-%PROJECT%-package\shared
-if not exist build-%PROJECT%-package\shared\debug mkdir build-%PROJECT%-package\shared\debug
-if not exist build-%PROJECT%-package\shared\release mkdir build-%PROJECT%-package\shared\release
-
-REM echo "===========> building XPCF shared <==========="
-pushd build-%PROJECT%-package\shared\debug
-%QMAKE_PATH%\qmake.exe ../../../%XPCFROOT%/%PROJECT%.pro -spec win32-msvc CONFIG+=debug CONFIG+=package_remaken
-%JOM_PATH%\jom.exe
-%JOM_PATH%\jom.exe install
-popd
-pushd build-%PROJECT%-package\shared\release
-%QMAKE_PATH%\qmake.exe ../../../%XPCFROOT%/%PROJECT%.pro -spec win32-msvc CONFIG+=package_remaken
-%JOM_PATH%\jom.exe
-%JOM_PATH%\jom.exe install
-popd
-
-if exist build-%PROJECT%-package\static rmdir /S /Q build-%PROJECT%-package\static
-if not exist build-%PROJECT%-package\static\debug mkdir build-%PROJECT%-package\static\debug
-if not exist build-%PROJECT%-package\static\release mkdir build-%PROJECT%-package\static\release
-
-REM echo "===========> building XPCF static <==========="
-pushd build-%PROJECT%-package\static\debug
-%QMAKE_PATH%\qmake.exe ../../../%XPCFROOT%/%PROJECT%.pro -spec win32-msvc CONFIG+=staticlib CONFIG+=debug CONFIG+=package_remaken
-%JOM_PATH%\jom.exe
-%JOM_PATH%\jom.exe install
-popd
-pushd build-%PROJECT%-package\static\release
-%QMAKE_PATH%\qmake.exe ../../../%XPCFROOT%/%PROJECT%.pro -spec win32-msvc CONFIG+=staticlib CONFIG+=package_remaken
-%JOM_PATH%\jom.exe
-%JOM_PATH%\jom.exe install
-popd
-
-call %XPCFROOT%/scripts/win/make_remaken_package.bat %PROJECT% %PKGVERSION%
+call %XPCFROOT%/scripts/win/make_remaken_package.bat XPCF %PKGVERSION%
+call %XPCFROOT%/scripts/win/make_remaken_package.bat xpcfSampleComponent %PKGVERSION%
 
 endlocal
 goto:eof
@@ -69,7 +32,7 @@ goto:eof
 
 :display_usage
 
-echo This script builds %PROJECT% in shared with a special deployment option for packaging.
+echo This script builds XPCF and xpcfSamplecomponent in shared and static mode with a special deployment option for packaging.
 echo It also compress the various xpcf packages.
 echo It can receive one optional argument. 
 echo.
diff --git a/test/packagedependencies.txt b/test/packagedependencies.txt
@@ -1,4 +1,4 @@
-xpcf|2.5.1|xpcf%TEST_XPCF_BOOST|github|https://github.com/b-com-software-basis/xpcf/releases/download
-xpcf-std|2.5.1|xpcf-std%TEST_XPCF_STD|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf|2.5.2|xpcf%TEST_XPCF_BOOST|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf-std|2.5.2|xpcf-std%TEST_XPCF_STD|github|https://github.com/b-com-software-basis/xpcf/releases/download
 
 
diff --git a/test/testxpcf.pro b/test/testxpcf.pro
@@ -1,5 +1,5 @@
 TARGET = testxpcf
-VERSION=2.5.1
+VERSION=2.5.2
 
 CONFIG += c++1z
 CONFIG += console
diff --git a/test/xpcf_registry_test.xml b/test/xpcf_registry_test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <xpcf-registry autoAlias="true">
-    <module uuid="{3b899ff0-e098-4218-bdaa-82abdec22960}" name="xpcfSampleComponent" description="Sample component module" path="$REMAKENROOT/xpcfSampleComponent/2.5.1/lib/x86_64/shared">
+    <module uuid="{3b899ff0-e098-4218-bdaa-82abdec22960}" name="xpcfSampleComponent" description="Sample component module" path="$REMAKENROOT/xpcfSampleComponent/2.5.2/lib/x86_64/shared">
     <component uuid="ae9d10bb-4bd1-462b-8c01-43f1815c6ae0" name="HumanMusician component - not configurable" description="HumanMusician is not Configurable, it implements I0 and I1 interfaces">
         <interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="XPCF::IComponentIntrospect" description="Component introspection interface."/>
         <interface uuid="46333fd5-9eeb-4c9a-9912-b7df96ccf5fc" name="IHuman" description="provides human related methods"/>
diff --git a/tools/cli/packagedependencies.txt b/tools/cli/packagedependencies.txt
@@ -1 +1 @@
-xpcf|2.5.1|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf|2.5.2|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
diff --git a/tools/cli/xpcfcli.pro b/tools/cli/xpcfcli.pro
@@ -1,6 +1,6 @@
 FRAMEWORK = xpcfcli
 TARGET = xpcfcli
-VERSION=2.5.1
+VERSION=2.5.2
 
 CONFIG += c++17
 CONFIG += console
diff --git a/tools/generators/grpc/ProjectGenerator.cpp b/tools/generators/grpc/ProjectGenerator.cpp
@@ -23,7 +23,7 @@ std::string findRemakenRulesStr = "# Author(s) : Loic Touraine, Stephane Leduc\n
 "}\n\nmessage(\"Remaken qmake build rules used : \" $$QMAKE_REMAKEN_RULES_ROOT)\n";
 
 // TODO : package information should depend upon the generator used ! and grpc/protobuf version should be added from metadata !
-std::string pkgdepsStr = "xpcf|2.5.1|xpcf|@github|https://github.com/SolarFramework/binaries/releases/download\n";
+std::string pkgdepsStr = "xpcf|2.5.2|xpcf|@github|https://github.com/SolarFramework/binaries/releases/download\n";
 
 ProjectGenerator::ProjectGenerator():AbstractGenerator(xpcf::toMap<ProjectGenerator>())
 {
diff --git a/tools/generators/grpc/xpcf_grpc_gen.cpp b/tools/generators/grpc/xpcf_grpc_gen.cpp
@@ -120,7 +120,7 @@ try
 "2/ launch xpcf_grpc_gen with:\n"
 "xpcf_grpc_gen -n [framework name] -v [framework version] -r @github -u [framework binary release github url] --std c++1z --database_dir [compilation database folder path] --remove_comments_in_macro -o [code generation destination folder path] -g protobuf -i [relative framework interfaces path beneath the project starting at $HOME - this path will be removed from #include directives]\n\n"
 "Example: to generate grpc code from xpcf SampleComponent interfaces the command is (if the xpcf folder is located in the $HOME user folder):\n"
-"xpcf_grpc_gen -n xpcfSampleComponent -v 2.5.1 -r @github -u https://github.com/b-com-software-basis/xpcf/releases/download --std c++1z --database_dir xpcf/samples/build-xpcfSampleComponent-Desktop_Qt_5_12_10_clang_64bit-Debug/ --remove_comments_in_macro -o ~/tmp/grpc_gen_sampleComponent -g protobuf -i xpcf/samples/sample_component");
+"xpcf_grpc_gen -n xpcfSampleComponent -v 2.5.2 -r @github -u https://github.com/b-com-software-basis/xpcf/releases/download --std c++1z --database_dir xpcf/samples/build-xpcfSampleComponent-Desktop_Qt_5_12_10_clang_64bit-Debug/ --remove_comments_in_macro -o ~/tmp/grpc_gen_sampleComponent -g protobuf -i xpcf/samples/sample_component");
         // clang-format off
     option_list.add_options()
             ("h,help", "display this help and exit")
diff --git a/tools/generators/grpc/xpcf_grpc_gen.pro b/tools/generators/grpc/xpcf_grpc_gen.pro
@@ -1,5 +1,5 @@
 TARGET = xpcf_grpc_gen
-VERSION = 2.5.1
+VERSION = 2.5.2
 
 CONFIG += c++1z
 CONFIG += console
diff --git a/tools/packagedependencies.txt b/tools/packagedependencies.txt
@@ -1 +1 @@
-xpcf|2.5.1|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf|2.5.2|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
diff --git a/tools/xpcf_grpc_client/packagedependencies.txt b/tools/xpcf_grpc_client/packagedependencies.txt
@@ -1 +1 @@
-xpcf|2.5.1|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf|2.5.2|xpcf|github|https://github.com/b-com-software-basis/xpcf/releases/download
diff --git a/tools/xpcf_grpc_client/xpcfGrpcSampleComponentClient.xml b/tools/xpcf_grpc_client/xpcfGrpcSampleComponentClient.xml
diff --git a/tools/xpcf_grpc_client/xpcf_grpc_client.pro b/tools/xpcf_grpc_client/xpcf_grpc_client.pro
diff --git a/tools/xpcf_grpc_server/packagedependencies.txt b/tools/xpcf_grpc_server/packagedependencies.txt
diff --git a/tools/xpcf_grpc_server/xpcfGrpcSampleComponentServer.xml b/tools/xpcf_grpc_server/xpcfGrpcSampleComponentServer.xml
diff --git a/tools/xpcf_grpc_server/xpcf_grpc_server.pro b/tools/xpcf_grpc_server/xpcf_grpc_server.pro
diff --git a/xpcf-std.pro b/xpcf-std.pro
diff --git a/xpcf.pro b/xpcf.pro

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ BOOST_SERIALIZATION_SPLIT_FREE(std::chrono::system_clock::time_point)`
`116`	`116`	`namespace boost {`
`117`	`117`	`namespace serialization {`
`118`	`118`
`119`		`-template<uint N>`
	`119`	`+template<unsigned int N>`
`120`	`120`	`struct Serialize`
`121`	`121`	`{`
`122`	`122`	`template<class Archive, typename... Args>`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-xpcf\|2.5.1\|xpcf\|github\|https://github.com/b-com-software-basis/xpcf/releases/download`
	`1`	`+xpcf\|2.5.2\|xpcf\|github\|https://github.com/b-com-software-basis/xpcf/releases/download`