Merge pull request #17 from granger35/2.7.0_patch

2.7.0 patch

Author: AdrienSchadle

libs/build_cppast.sh

@@ -12,6 +12,12 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
     if [ ${LINUXVERSION} = "\"18.04\"" ]; then
         LLVMVERSION=10
     fi
+    if [ ${LINUXVERSION} = "\"20.04\"" ]; then
+        LLVMVERSION=11
+    fi
+    if [ ${LINUXVERSION} = "\"22.04\"" ]; then
+        LLVMVERSION=14
+    fi
     sudo apt-get install -y llvm-${LLVMVERSION} clang-${LLVMVERSION} libclang-${LLVMVERSION}-dev
     LLVMBREWPATH=/home/linuxbrew/.linuxbrew
     LLVMCONFIGPATH=/usr/bin/llvm-config-${LLVMVERSION}
@@ -66,4 +72,4 @@ build_cppast() {
 }
 
 build_cppast "Debug"
-build_cppast "Release"
+build_cppast "Release"

samples/sample_component/xpcfSampleComponent.pro

@@ -41,8 +41,8 @@ DEPENDENCIESCONFIG = shared
 #NOTE : CONFIG as staticlib or sharedlib, DEPENDENCIESCONFIG as staticlib or sharedlib and PROJECTDEPLOYDIR MUST BE DEFINED BEFORE templatelibbundle.pri inclusion
 include (../../builddefs/qmake/templatelibconfig.pri)
 
-DEFINES += BOOST_ALL_NO_LIB
-DEFINES += BOOST_ALL_DYN_LINK
+#DEFINES += BOOST_ALL_NO_LIB
+#DEFINES += BOOST_ALL_DYN_LINK
 
 SOURCES += \
     Ibanez7ElectricGuitar.cpp \
@@ -104,4 +104,5 @@ header_files.files += xpcfSampleComponent_traits.h
 INSTALLS += header_files
 DISTFILES += \
     Makefile \
-    swig/XPCF_SampleComponent.i
+    swig/XPCF_SampleComponent.i \
+    packagedependencies.txt

scripts/unixes/build_xpcf_grpc_test_sample.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
-QTVERSION=5.15.2
+QTVERSION=6.4.2
 XPCFROOT=../..
+XPCF_VERSION=2.7.0
 
 # default linux values
 QMAKEPATH=$HOME/Qt/${QTVERSION}/gcc_64/bin
@@ -45,10 +46,10 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 	XPCF_GRPC_GEN_APPLICATION=xpcf_grpc_gen.app/Contents/MacOS/xpcf_grpc_gen
 fi
 
-if [ ! -d ${XPCFROOT}/scripts/unixes/build-xpcf_grpc_gen/static/release ]; then
-	echo "${XPCFROOT}/scripts/unixes/build-xpcf_grpc_gen/static/release path doesn't exist: please run build_xpcf_grpc_tools.sh before building test sample"
+if [ ! -d ${XPCF_MODULE_ROOT}/xpcf_grpc_gen/${XPCF_VERSION}/bin/x86_64/static/release ]; then
+	echo "${XPCF_MODULE_ROOT}/xpcf_grpc_gen/${XPCF_VERSION}/bin/x86_64/static/release path doesn't exist: please run build_xpcf_grpc_tools.sh before building test sample"
 	exit 2
 fi
 
-${XPCFROOT}/scripts/unixes/build-xpcf_grpc_gen/static/release/${XPCF_GRPC_GEN_APPLICATION} -n xpcfSampleComponent -v 2.7.0 -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
+${XPCF_MODULE_ROOT}/xpcf_grpc_gen/${XPCF_VERSION}/bin/x86_64/static/release/${XPCF_GRPC_GEN_APPLICATION} -n xpcfSampleComponent -v ${XPCF_VERSION} -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 ${QTVERSION} ${QMAKEPATH}

tools/generators/grpc/xpcf_grpc_gen.pro

@@ -103,8 +103,8 @@ linux {
     QMAKE_CXXFLAGS += -fPIC
 #    LLVM_BINARIES = /home/linuxbrew/.linuxbrew/opt/llvm/bin
     LLVM_BINARIES = /usr/bin
-    LLVM_LIBDIR = $$system($${LLVM_BINARIES}/llvm-config-15 --libdir)
-    LLVM_INCDIR = $$system($${LLVM_BINARIES}/llvm-config-15 --includedir)
+    LLVM_LIBDIR = $$system($${LLVM_BINARIES}/llvm-config-14 --libdir)
+    LLVM_INCDIR = $$system($${LLVM_BINARIES}/llvm-config-14 --includedir)
     LIBS += -L$${LLVM_LIBDIR} -lclang
     LLVM_CLANG_LIBS = $$files($${LLVM_LIBDIR}/libclang*.a)
     LIBS += $${LLVM_CLANG_LIBS}

xpcf.pro

@@ -36,8 +36,8 @@ staticlib {
     REMAKEN_PKGSUBDIR=static
 } else {
     DEFINES += XPCF_SHARED
-    DEFINES += BOOST_ALL_DYN_LINK
-    DEPENDENCIESCONFIG = sharedlib
+ #   DEFINES += BOOST_ALL_DYN_LINK
+    DEPENDENCIESCONFIG = static #sharedlib
     REMAKEN_PKGSUBDIR=shared
 }
 
@@ -79,7 +79,7 @@ CONFIG(release,debug|release) {
     DEFINES += XPCFSUBDIRSEARCH=\\\"release\\\"
 }
 
-DEFINES += BOOST_ALL_NO_LIB
+#DEFINES += BOOST_ALL_NO_LIB
 
 
 DEFINES += TIXML_USE_STL