fix(compilation): dll import export management

AdrienSchadle · AdrienSchadle · commit cc94af240c71 · 2023-11-29T11:37:53.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -90,11 +90,11 @@ jobs:
       - working-directory: ./scripts/win
         run: .\build_remaken_project.bat xpcf static ..\.. 5.15.2 "${{ github.workspace }}\tools\Qt\5.15.2\msvc2019_64\bin" "${{ github.workspace }}\tools\Qt\Tools\qtcreator\bin\jom"
       - working-directory: ./scripts/win
-        run: .\build_remaken_project.bat xpcf-static-deps shared ..\.. 5.15.2 "${{ github.workspace }}\tools\Qt\5.15.2\msvc2019_64\bin" "${{ github.workspace }}\tools\Qt\Tools\qtcreator\bin\jom"
+        run: .\build_remaken_project.bat xpcf_static_deps shared ..\.. 5.15.2 "${{ github.workspace }}\tools\Qt\5.15.2\msvc2019_64\bin" "${{ github.workspace }}\tools\Qt\Tools\qtcreator\bin\jom"
       # - working-directory: ./scripts/win
       #   run: .\build_remaken_project.bat xpcfSampleComponent shared ..\..\samples\sample_component 5.15.2 "${{ github.workspace }}\tools\Qt\5.15.2\msvc2019_64\bin" "${{ github.workspace }}\tools\Qt\Tools\qtcreator\bin\jom"
       # - working-directory: ./scripts/win
-      #   run: .\build_remaken_project.bat xpcfSampleComponent-static-deps shared ..\..\samples\sample_component 5.15.2 "${{ github.workspace }}\tools\Qt\5.15.2\msvc2019_64\bin" "${{ github.workspace }}\tools\Qt\Tools\qtcreator\bin\jom"
+      #   run: .\build_remaken_project.bat xpcfSampleComponent_static_deps shared ..\..\samples\sample_component 5.15.2 "${{ github.workspace }}\tools\Qt\5.15.2\msvc2019_64\bin" "${{ github.workspace }}\tools\Qt\Tools\qtcreator\bin\jom"
 
   linux-ci:
     runs-on: ubuntu-22.04
@@ -166,4 +166,4 @@ jobs:
       - working-directory: ./scripts/unixes
         run: ./build_remaken_project.sh xpcf shared ../.. 5.15.2 /usr/bin
       - working-directory: ./scripts/unixes
-        run: ./build_remaken_project.sh xpcf-static-deps shared ../.. 5.15.2 /usr/bin
+        run: ./build_remaken_project.sh xpcf_static_deps shared ../.. 5.15.2 /usr/bin
diff --git a/interfaces/xpcf/xpcf_api_define.h b/interfaces/xpcf/xpcf_api_define.h
@@ -6,8 +6,12 @@
 #ifdef xpcf_API_DLLEXPORT
 #define XPCF_EXPORT_API __declspec(dllexport)
 #else
+#ifdef xpcf_static_deps_API_DLLEXPORT
+#define XPCF_EXPORT_API __declspec(dllexport)
+#else
 #define XPCF_EXPORT_API __declspec(dllimport)
 #endif
+#endif
 #else
 #define XPCF_EXPORT_API
 #endif
diff --git a/samples/sample_component/packagedependencies.txt b/samples/sample_component/packagedependencies.txt
@@ -1,2 +1,2 @@
-xpcf|2.7.0|xpcf%XPCF_SHARED|github|https://github.com/b-com-software-basis/xpcf/releases/download
-xpcf-static-deps|2.7.0|xpcf-static-deps%XPCF_STATIC_DEPS|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf|2.7.0|xpcf%XPCF_SHARED_DEPS|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf_static_deps|2.7.0|xpcf_static_deps%XPCF_STATIC_DEPS|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
@@ -2,6 +2,6 @@ TARGET = xpcfSampleComponent
 
 REMAKEN_PKGSUBDIR=sharedlib
 DEPENDENCIESCONFIG = sharedlib
-DEFINES += XPCF_SHARED
+DEFINES += XPCF_SHARED_DEPS
 
 include(xpcfSampleComponent.pri)
diff --git a/samples/sample_component/xpcfSampleComponent_static_deps.pro b/samples/sample_component/xpcfSampleComponent_static_deps.pro
@@ -1,4 +1,4 @@
-TARGET = xpcfSampleComponent-static-deps
+TARGET = xpcfSampleComponent_static_deps
 
 REMAKEN_PKGSUBDIR=shared
 DEPENDENCIESCONFIG -= sharedlib
diff --git a/scripts/unixes/build_test_xpcf.sh b/scripts/unixes/build_test_xpcf.sh
@@ -45,4 +45,4 @@ if [ ! -d ${XPCFROOT}/scripts/unixes/build-xpcf ]; then
 fi
 
 ${XPCFROOT}/scripts/unixes/build_remaken_project.sh testxpcf shared ${XPCFROOT}/test ${QTVERSION} ${QMAKEPATH}
-${XPCFROOT}/scripts/unixes/build_remaken_project.sh testxpcf-static-deps static ${XPCFROOT}/test ${QTVERSION} ${QMAKEPATH}
+${XPCFROOT}/scripts/unixes/build_remaken_project.sh testxpcf_static_deps static ${XPCFROOT}/test ${QTVERSION} ${QMAKEPATH}
diff --git a/scripts/unixes/build_xpcf.sh b/scripts/unixes/build_xpcf.sh
@@ -40,6 +40,6 @@ fi
 
 ${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcf shared ${XPCFROOT} ${QTVERSION} ${QMAKEPATH}
 ${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcf static ${XPCFROOT} ${QTVERSION} ${QMAKEPATH}
-${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcf-static-deps shared ${XPCFROOT} ${QTVERSION} ${QMAKEPATH}
+${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcf_static_deps shared ${XPCFROOT} ${QTVERSION} ${QMAKEPATH}
 ${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcfSampleComponent shared ${XPCFROOT}/samples/sample_component ${QTVERSION} ${QMAKEPATH}
-${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcfSampleComponent-static-deps shared ${XPCFROOT}/samples/sample_component ${QTVERSION} ${QMAKEPATH}
+${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcfSampleComponent_static_deps shared ${XPCFROOT}/samples/sample_component ${QTVERSION} ${QMAKEPATH}
diff --git a/scripts/unixes/build_xpcf_grpc_tools.sh b/scripts/unixes/build_xpcf_grpc_tools.sh
@@ -46,7 +46,7 @@ if [ ! -d ${XPCFROOT}/scripts/unixes/build-xpcf ]; then
 fi
 
 ${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcf_grpc_client shared ${XPCFROOT}/tools ${QTVERSION} ${QMAKEPATH}
-${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcf_grpc_client-static-deps shared ${XPCFROOT}/tools/xpcf_grpc_client ${QTVERSION} ${QMAKEPATH}
+${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcf_grpc_client_static_deps shared ${XPCFROOT}/tools/xpcf_grpc_client ${QTVERSION} ${QMAKEPATH}
 ${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcf_grpc_server shared ${XPCFROOT}/tools ${QTVERSION} ${QMAKEPATH}
-${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcf_grpc_server-static-deps shared ${XPCFROOT}/tools/xpcf_grpc_server ${QTVERSION} ${QMAKEPATH}
+${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcf_grpc_server_static_deps shared ${XPCFROOT}/tools/xpcf_grpc_server ${QTVERSION} ${QMAKEPATH}
 ${XPCFROOT}/scripts/unixes/build_remaken_project.sh xpcf_grpc_gen static ${XPCFROOT}/tools/generators/grpc ${QTVERSION} ${QMAKEPATH}
diff --git a/scripts/win/build_test_xpcf.bat b/scripts/win/build_test_xpcf.bat
@@ -32,7 +32,7 @@ if not exist %XPCFROOT%/scripts/win/build-xpcf (
 	pause
 )
 call %XPCFROOT%/scripts/win/build_remaken_project.bat testxpcf shared %XPCFROOT%/test %QTVERSION% %QMAKEPATH% %JOMPATH%
-call %XPCFROOT%/scripts/win/build_remaken_project.bat testxpcf-static-deps static %XPCFROOT%/test %QTVERSION% %QMAKEPATH% %JOMPATH%
+call %XPCFROOT%/scripts/win/build_remaken_project.bat testxpcf_static_deps shared %XPCFROOT%/test %QTVERSION% %QMAKEPATH% %JOMPATH%
 
 endlocal
 goto:eof
diff --git a/scripts/win/build_xpcf.bat b/scripts/win/build_xpcf.bat
@@ -25,9 +25,9 @@ echo "jom path used is : %JOMPATH%"
 
 call %XPCFROOT%/scripts/win/build_remaken_project.bat xpcf shared %XPCFROOT% %QTVERSION% %QMAKEPATH% %JOMPATH%
 call %XPCFROOT%/scripts/win/build_remaken_project.bat xpcf static %XPCFROOT% %QTVERSION% %QMAKEPATH% %JOMPATH%
-call %XPCFROOT%/scripts/win/build_remaken_project.bat xpcf-static-deps shared %XPCFROOT% %QTVERSION% %QMAKEPATH% %JOMPATH%
+call %XPCFROOT%/scripts/win/build_remaken_project.bat xpcf_static_deps shared %XPCFROOT% %QTVERSION% %QMAKEPATH% %JOMPATH%
 call %XPCFROOT%/scripts/win/build_remaken_project.bat xpcfSampleComponent shared %XPCFROOT%/samples/sample_component %QTVERSION% %QMAKEPATH% %JOMPATH%
-call %XPCFROOT%/scripts/win/build_remaken_project.bat xpcfSampleComponent-static-deps shared %XPCFROOT%/samples/sample_component %QTVERSION% %QMAKEPATH% %JOMPATH%
+call %XPCFROOT%/scripts/win/build_remaken_project.bat xpcfSampleComponent_static_deps shared %XPCFROOT%/samples/sample_component %QTVERSION% %QMAKEPATH% %JOMPATH%
 
 endlocal
 goto:eof
diff --git a/test/packagedependencies.txt b/test/packagedependencies.txt
@@ -1,4 +1,4 @@
-xpcf|2.7.0|xpcf%XPCF_SHARED|github|https://github.com/b-com-software-basis/xpcf/releases/download
-xpcf-static-deps|2.7.0|xpcf-static-deps%XPCF_STATIC_DEPS|github|https://github.com/b-com-software-basis/xpcf/releases/download|shared
+xpcf|2.7.0|xpcf%XPCF_SHARED_DEPS|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf_static_deps|2.7.0|xpcf_static_deps%XPCF_STATIC_DEPS|github|https://github.com/b-com-software-basis/xpcf/releases/download|shared
 
 
diff --git a/test/testxpcf-static-deps.pro b/test/testxpcf-static-deps.pro
diff --git a/test/testxpcf.pro b/test/testxpcf.pro
@@ -3,133 +3,6 @@ TARGET = testxpcf
 CONFIG += shared
 DEPENDENCIESCONFIG = sharedlib recurse
 DEFINES += BOOST_ALL_DYN_LINK
-DEFINES += XPCF_SHARED
+DEFINES += XPCF_SHARED_DEPS
 
 include(testxpcf.pri)
-
-#TARGET = testxpcf
-#VERSION=2.7.0
-#
-#!staticlib {
-#    message("xpcf shared used")
-#    CONFIG += shared
-#    DEPENDENCIESCONFIG = sharedlib recurse
-#    DEFINES += BOOST_ALL_DYN_LINK
-#    DEFINES += XPCF_SHARED
-#} else {
-#    message("xpcf static deps used")
-#    CONFIG -= shared
-#    DEPENDENCIESCONFIG = staticlib recurse
-#    DEFINES += XPCF_STATIC_DEPS
-#}
-#
-#CONFIG += c++1z
-#CONFIG += console
-#CONFIG -= qt
-#
-#DEFINES += MYVERSION=$${VERSION}
-#
-##include(findremakenrules.pri)
-#
-#CONFIG(debug,debug|release) {
-#    DEFINES += _DEBUG=1
-#    DEFINES += DEBUG=1
-#}
-#
-#CONFIG(release,debug|release) {
-#    DEFINES += NDEBUG=1
-#}
-#
-#macx {
-#    # EXPERIMENTAL : needs to use remaken configure first
-#    # REMAKENCONFIG += use_remaken_parser
-#}
-#
-##DEFINES += TEST_XPCF_STD
-##!contains(DEFINES,TEST_XPCF_STD) {
-##   DEFINES += TEST_XPCF_BOOST
-##}
-#
-#DEFINES += XPCF_USE_BOOST
-#DEFINES += BOOST_ALL_NO_LIB
-#
-#QMAKE_TARGET.arch = x86_64 #must be defined prior to include
-##NOTE : CONFIG as staticlib or sharedlib,  DEPENDENCIESCONFIG as staticlib or sharedlib, QMAKE_TARGET.arch and PROJECTDEPLOYDIR MUST BE DEFINED BEFORE templatelibconfig.pri inclusion
-## include ($${QMAKE_REMAKEN_RULES_ROOT}/templateappconfig.pri)
-#include (../builddefs/qmake/templateappconfig.pri)
-##HEADERS += \
-##    TestDefines.h
-#
-#SOURCES += \
-#    \   # xpcf_dynamic_test.cpp #\
-#    #xpcf_properties_test.cpp \
-#    #xpcf_dynamic_test.cpp #\
-#    #xpcf_threading_test.cpp 
-#    #xpcf_xml_test.cpp
-#    #xpcf_dynamic_test_copy.cpp
-##    xpcf_in_code_test.cpp
-#    xpcf_xml_test.cpp
-#
-#unix {
-#    QMAKE_CXXFLAGS += --coverage
-#    QMAKE_LFLAGS += --coverage
-#}
-#
-#linux {
-#    LIBS += -ldl
-#}
-#
-#macx {
-#    contains(DEFINES,TEST_XPCF_STD) {
-#        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
-#    }
-#    QMAKE_MAC_SDK= macosx
-#    QMAKE_CXXFLAGS += -fasm-blocks -x objective-c++ -std=c++17
-#    LIBS += -L/usr/local/lib # temporary fix caused by grpc with -lre2 ... without -L in grpc.pc
-#}
-#
-#win32 {
-#    QMAKE_LFLAGS += /MACHINE:X64
-#    DEFINES += WIN64 UNICODE _UNICODE
-#    QMAKE_COMPILER_DEFINES += _WIN64
-#
-#    # Windows Kit (msvc2013 64)
-#    LIBS += -L$$(WINDOWSSDKDIR)lib/winv6.3/um/x64 -lshell32 -lgdi32 -lComdlg32
-#    INCLUDEPATH += $$(WINDOWSSDKDIR)lib/winv6.3/um/x64
-#}
-#
-#INCLUDEPATH += $${PWD}/../samples/sample_component
-#
-#DISTFILES += \
-#    packagedependencies.txt \
-#    xpcf_registry_test.xml \
-#    xpcf_conf_test.xml \
-#    xpcf_xml_test_valid.xml \
-#    xpcf_xml_test_missing_start_tag.xml \
-#    xpcf_xml_test_missing_end_tag.xml \
-#    xpcf_xml_test_uuid_format_ko.xml
-#
-#xpcf_xml_files.path = $${USERHOMEFOLDER}/.xpcf
-#xpcf_xml_files.files = $${PWD}/xpcf_registry_test.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_conf_test.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_valid.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_missing_start_tag.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_missing_end_tag.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_module_uuid_format_ko.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_alias_uuid_format_ko.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_factory_bindings_to_uuid_format_ko.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_factory_bindings_component_uuid_format_ko.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_factory_inject_uuid_format_ko
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_configuration_uuid_format_ko.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_properties_uuid_format_ko.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_unknown_component.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_property_type_invalid.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_unknown_property.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_property_unknown_component.xml
-#xpcf_xml_files.files += $${PWD}/xpcf_xml_test_factory_inject_uuid_format_ko.xml
-#
-#xpcf_xml_sample_structure_files.path = $${PROJECTDEPLOYDIR}/
-#xpcf_xml_sample_structure_files.files = $${PWD}/xpcf_registry_test.xml
-#
-#INSTALLS += xpcf_xml_files xpcf_xml_sample_structure_files
-#
diff --git a/test/testxpcf_static_deps.pro b/test/testxpcf_static_deps.pro
@@ -0,0 +1,12 @@
+TARGET = testxpcf_static_deps
+
+# CONFIG -= shared
+# DEPENDENCIESCONFIG = staticlib recurse
+# DEFINES += XPCF_STATIC_DEPS
+CONFIG += shared
+DEPENDENCIESCONFIG = staticlib recurse
+#DEFINES += BOOST_ALL_DYN_LINK
+DEFINES += XPCF_STATIC_DEPS
+
+
+include(testxpcf.pri)
diff --git a/test/testxpcf_static_deps_backup.pro b/test/testxpcf_static_deps_backup.pro
@@ -0,0 +1,9 @@
+TARGET = testxpcf_static_deps
+
+CONFIG += shared
+DEPENDENCIESCONFIG = sharedlib recurse
+DEFINES += BOOST_ALL_DYN_LINK
+DEFINES += XPCF_SHARED_DEPS
+
+
+include(testxpcf.pri)
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.7.0|xpcf\%XPCF_SHARED|@github|https://github.com/SolarFramework/binaries/releases/download\nxpcf-static-deps|2.7.0|xpcf-static-deps\%XPCF_STATIC_DEPS|@github|https://github.com/SolarFramework/binaries/releases/download\n";
+std::string pkgdepsStr = "xpcf|2.7.0|xpcf\%XPCF_SHARED_DEPS|@github|https://github.com/SolarFramework/binaries/releases/download\nxpcf_static_deps|2.7.0|xpcf_static_deps\%XPCF_STATIC_DEPS|@github|https://github.com/SolarFramework/binaries/releases/download\n";
 
 ProjectGenerator::ProjectGenerator():AbstractGenerator(xpcf::toMap<ProjectGenerator>())
 {
@@ -136,15 +136,15 @@ void ProjectGenerator::generateProjectFile(std::map<MetadataType,std::string> me
     projectFilePathShared = m_folder/projectFilePathShared;
     std::ofstream projectFileShared(projectFilePathShared.generic_string(utf8).c_str(), std::ios::out);
     projectFileShared << "TARGET = xpcfGrpcRemoting"<< metadata[MetadataType::PROJECT_NAME] << "\n";
-    projectFileShared << "DEFINES += XPCF_SHARED\n\n";
+    projectFileShared << "DEFINES += XPCF_SHARED_DEPS\n\n";
     projectFileShared << "include (" << priBaseFileName << ")\n\n" ;
     projectFileShared.close();
 
     // Pro using static deps xpcf
-    fs::path projectFilePathStatDeps("xpcfGrpcRemoting" + metadata[MetadataType::PROJECT_NAME] + "-static-deps.pro",utf8);
+    fs::path projectFilePathStatDeps("xpcfGrpcRemoting" + metadata[MetadataType::PROJECT_NAME] + "_static_deps.pro",utf8);
     projectFilePathStatDeps = m_folder/projectFilePathStatDeps;
     std::ofstream projectFileStatDeps(projectFilePathStatDeps.generic_string(utf8).c_str(), std::ios::out);
-    projectFileStatDeps << "TARGET = xpcfGrpcRemoting"<< metadata[MetadataType::PROJECT_NAME]<< "-static-deps" << "\n";
+    projectFileStatDeps << "TARGET = xpcfGrpcRemoting"<< metadata[MetadataType::PROJECT_NAME]<< "_static_deps" << "\n";
     projectFileStatDeps << "DEFINES += XPCF_STATIC_DEPS\n    DEFINES += XPCF_USE_BOOST\n\n";
     projectFileStatDeps << "include (" << priBaseFileName << ")\n\n" ;
     projectFileStatDeps.close();
diff --git a/tools/xpcf_grpc_client/packagedependencies.txt b/tools/xpcf_grpc_client/packagedependencies.txt
@@ -1,2 +1,2 @@
-xpcf|2.7.0|xpcf%XPCF_SHARED|github|https://github.com/b-com-software-basis/xpcf/releases/download
-xpcf-static-deps|2.7.0|xpcf-static-deps%XPCF_STATIC_DEPS|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf|2.7.0|xpcf%XPCF_SHARED_DEPS|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf_static_deps|2.7.0|xpcf_static_deps%XPCF_STATIC_DEPS|github|https://github.com/b-com-software-basis/xpcf/releases/download
diff --git a/tools/xpcf_grpc_client/xpcf_grpc_client.pro b/tools/xpcf_grpc_client/xpcf_grpc_client.pro
@@ -1,5 +1,5 @@
 TARGET = xpcf_grpc_client
 
-DEFINES += XPCF_SHARED
+DEFINES += XPCF_SHARED_DEPS
 
 include(xpcf_grpc_client.pri)
diff --git a/tools/xpcf_grpc_client/xpcf_grpc_client_static_deps.pro b/tools/xpcf_grpc_client/xpcf_grpc_client_static_deps.pro
@@ -1,4 +1,4 @@
-TARGET = xpcf_grpc_client-static-deps
+TARGET = xpcf_grpc_client_static_deps
 
 DEFINES += XPCF_STATIC_DEPS
 DEFINES += XPCF_USE_BOOST
diff --git a/tools/xpcf_grpc_server/packagedependencies.txt b/tools/xpcf_grpc_server/packagedependencies.txt
@@ -1,2 +1,2 @@
-xpcf|2.7.0|xpcf%XPCF_SHARED|github|https://github.com/b-com-software-basis/xpcf/releases/download
-xpcf-static-deps|2.7.0|xpcf-static-deps%XPCF_STATIC_DEPS|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf|2.7.0|xpcf%XPCF_SHARED_DEPS|github|https://github.com/b-com-software-basis/xpcf/releases/download
+xpcf_static_deps|2.7.0|xpcf_static_deps%XPCF_STATIC_DEPS|github|https://github.com/b-com-software-basis/xpcf/releases/download
diff --git a/tools/xpcf_grpc_server/xpcf_grpc_server.pro b/tools/xpcf_grpc_server/xpcf_grpc_server.pro
@@ -1,5 +1,5 @@
 TARGET = xpcf_grpc_server
 
-DEFINES += XPCF_SHARED
+DEFINES += XPCF_SHARED_DEPS
 
 include(xpcf_grpc_server.pri)
diff --git a/tools/xpcf_grpc_server/xpcf_grpc_server_static_deps.pro b/tools/xpcf_grpc_server/xpcf_grpc_server_static_deps.pro
@@ -1,4 +1,4 @@
-TARGET = xpcf_grpc_server-static-deps
+TARGET = xpcf_grpc_server_static_deps
 
 DEFINES += XPCF_STATIC_DEPS
 DEFINES += XPCF_USE_BOOST
diff --git a/xpcf-std.pro b/xpcf-std.pro
@@ -22,6 +22,7 @@ staticlib {
     DEFINES += XPCF_STATIC
 } else {
     DEFINES += XPCF_SHARED
+    DEFINES += XPCF_SHARED_DEPS
 }
 
 CONFIG(debug,debug|release) {
diff --git a/xpcf.pro b/xpcf.pro
@@ -35,6 +35,7 @@ staticlib {
     REMAKEN_PKGSUBDIR=static
 } else {
     DEFINES += XPCF_SHARED
+    DEFINES += XPCF_SHARED_DEPS
     DEFINES += BOOST_ALL_DYN_LINK
     DEPENDENCIESCONFIG = sharedlib
     REMAKEN_PKGSUBDIR=shared
diff --git a/xpcf_static_deps.pro b/xpcf_static_deps.pro
@@ -1,6 +1,6 @@
 QT       -= core gui
 CONFIG -= app_bundle qt
-TARGET = xpcf-static-deps
+TARGET = xpcf_static_deps
 FRAMEWORK = $${TARGET}
 VERSION=2.7.0
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-TARGET = xpcfSampleComponent-static-deps`
	`1`	`+TARGET = xpcfSampleComponent_static_deps`
`2`	`2`
`3`	`3`	`REMAKEN_PKGSUBDIR=shared`
`4`	`4`	`DEPENDENCIESCONFIG -= sharedlib`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ if not exist %XPCFROOT%/scripts/win/build-xpcf (`
`32`	`32`	`pause`
`33`	`33`	`)`
`34`	`34`	`call %XPCFROOT%/scripts/win/build_remaken_project.bat testxpcf shared %XPCFROOT%/test %QTVERSION% %QMAKEPATH% %JOMPATH%`
`35`		`-call %XPCFROOT%/scripts/win/build_remaken_project.bat testxpcf-static-deps static %XPCFROOT%/test %QTVERSION% %QMAKEPATH% %JOMPATH%`
	`35`	`+call %XPCFROOT%/scripts/win/build_remaken_project.bat testxpcf_static_deps shared %XPCFROOT%/test %QTVERSION% %QMAKEPATH% %JOMPATH%`
`36`	`36`
`37`	`37`	`endlocal`
`38`	`38`	`goto:eof`