diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index fed2125..0000000 --- a/Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -ARG DOCKER_PREFIX=wapmobil/ -FROM ${DOCKER_PREFIX}android - -ARG LIBS_BUILD_NUMBER=9999 -ARG JOBS_COUNT=4 -WORKDIR /soft -#RUN svn co svn://db.shs.com.ru/libs --username peri4 --password a --no-auth-cache --non-interactive --trust-server-cert -RUN git clone -b release --depth 1 --recursive https://git.shs.tools/SHS/libs.git - -WORKDIR /soft/build_libs_linux -RUN cmake -DICU=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../libs/ \ - && make install -j${JOBS_COUNT} && rm -rf * \ - && ldconfig - -WORKDIR /soft/build_libs_windows -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLIB=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../libs/ \ - && make install -j${JOBS_COUNT} && rm -rf * - -WORKDIR /soft/build_libs_macos -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLIB=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../libs/ \ - && make install -j${JOBS_COUNT} && rm -rf * - -ENV _ANDROID_TOOLCHAIN=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake -ENV _CUR_ABI=armeabi-v7a -WORKDIR /soft/build_libs_android_${_CUR_ABI} -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../libs/ \ - && make install -j${JOBS_COUNT} && rm -rf * - -ENV _CUR_ABI=arm64-v8a -WORKDIR /soft/build_libs_android_${_CUR_ABI} -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../libs/ \ - && make install -j${JOBS_COUNT} && rm -rf * - -ENV _CUR_ABI=x86 -WORKDIR /soft/build_libs_android_${_CUR_ABI} -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../libs/ \ - && make install -j${JOBS_COUNT} && rm -rf * - -ENV _CUR_ABI=x86_64 -WORKDIR /soft/build_libs_android_${_CUR_ABI} -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../libs/ \ - && make install -j${JOBS_COUNT} && rm -rf * - -WORKDIR /soft/src - -# examples -# docker build --no-cache -t libs . -# cd -# docker run --rm -it -v $(pwd):/soft/src libs bash diff --git a/Jenkinsfile b/Jenkinsfile index e4ffc2c..07c840b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,13 +11,14 @@ def build_docker(name) { } def args = "${pref} --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER} --build-arg JOBS_COUNT=${jobs}" dir ("docker/${image}") { - //echo "build ${image} ${args}" sh "docker build ${args} --no-cache -t ${image} ." } return "\n - ${image}" } node { - checkout scm + stage("Download SRC") { + checkout scm + } def _envmap = [:] def _env = sh(script: "env", returnStdout: true).trim().split("\n") _env.each{ l -> @@ -26,12 +27,9 @@ node { def _v = l.substring(_ind + 1); _envmap["${_n}"] = "${_v}"; } - //println "done!" - //println "${_envmap}" def _msg = "Built images:" def platforms = ['debian', 'osx', 'windows', 'android', 'pi'] for (int i = 0; i < platforms.size(); ++i) { - //echo "check BUILD_${platforms[i]} -> ${_v}" if (_envmap["BUILD_${platforms[i]}"] == "1") { stage("${platforms[i]}-libs") { _msg += build_docker("${platforms[i]}") diff --git a/pip b/pip index b860d8b..1692d38 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit b860d8bbafcde76290321b3e1b79b8ec400e0700 +Subproject commit 1692d389c9d3c299696f968cb0a8238593f41413 diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index 69e7a44..6b30462 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -4,7 +4,7 @@ project(qad) set(_QAD_MAJOR 1) set(_QAD_MINOR 2) set(_QAD_REVISION 0) -set(_QAD_SUFFIX alpha) +set(_QAD_SUFFIX beta) set(_QAD_COMPANY SHS) set(_QAD_DOMAIN org.SHS) diff --git a/qad/cmake/QtWraps.cmake b/qad/cmake/QtWraps.cmake index 82668e7..1d43fc3 100644 --- a/qad/cmake/QtWraps.cmake +++ b/qad/cmake/QtWraps.cmake @@ -448,6 +448,14 @@ macro(_qt_split_add_args _P _A) endmacro() +macro(__qt_set_defines _NAME _T) + target_compile_definitions(${_T} PRIVATE "__TARGET_NAME__=\"${_NAME}\"") + target_compile_definitions(${_T} PRIVATE "__TARGET_LABEL__=\"${${_NAME}_LABEL}\"") + target_compile_definitions(${_T} PRIVATE "__TARGET_COMPANY__=\"${${_NAME}_COMPANY}\"") + target_compile_definitions(${_T} PRIVATE "__TARGET_VERSION__=\"${${_NAME}_VERSION}\"") +endmacro() + + macro(qt_add_executable _NAME) foreach(_v ${_QT_VERSIONS_}) if (LOCAL_FOUND${_v}) @@ -464,6 +472,7 @@ macro(qt_add_executable _NAME) add_executable(${_TARGET} ${_PREF} ${_ARGS}) set(_${_NAME}_is_qt 1) target_include_directories(${_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES}) + __qt_set_defines(${_NAME} ${_TARGET}) if(APPLE) set(CMAKE_INSTALL_NAME_DIR "${_PREV_CIND}") @@ -502,6 +511,7 @@ macro(qt_add_library _NAME) add_library(${_TARGET} ${_PREF} ${_ARGS}) set(_${_NAME}_is_qt 1) target_include_directories(${_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES}) + __qt_set_defines(${_NAME} ${_TARGET}) #message("add lib: \"${_TARGET}\"") if(APPLE) diff --git a/qad/utils/qad_types.h b/qad/utils/qad_types.h index 3ba3ac2..595e18e 100644 --- a/qad/utils/qad_types.h +++ b/qad/utils/qad_types.h @@ -22,7 +22,14 @@ #include "propertystorage.h" #include "qad_export.h" +#include +//! Set QCoreApplication properties from CMake "deploy_properties" +//! Affect applicationName, organizationName and applicationVersion +#define QAD_SETUP_APPLICATION \ + QCoreApplication::setApplicationName(__TARGET_NAME__); \ + QCoreApplication::setOrganizationName(__TARGET_COMPANY__); \ + QCoreApplication::setApplicationVersion(__TARGET_VERSION__); class QMetaEnum; diff --git a/qcd_utils/pult/CMakeLists.txt b/qcd_utils/pult/CMakeLists.txt index 464b304..b7f80cb 100644 --- a/qcd_utils/pult/CMakeLists.txt +++ b/qcd_utils/pult/CMakeLists.txt @@ -6,6 +6,10 @@ set_deploy_property(${PROJECT_NAME} FULLNAME "${_QCD_DOMAIN}.${PROJECT_NAME}" COMPANY ${_QCD_COMPANY} INFO "CD Pult") +if (Qt5_FOUND) + import_version(${PROJECT_NAME}5 ${PROJECT_NAME}) + import_deploy_properties(${PROJECT_NAME}5 ${PROJECT_NAME}) +endif() make_rc(${PROJECT_NAME} out_RC) qt_sources(SRC) qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) @@ -28,7 +32,5 @@ else() qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) endif() if (Qt5_FOUND) - import_version(${PROJECT_NAME}5 ${PROJECT_NAME}) - import_deploy_properties(${PROJECT_NAME}5 ${PROJECT_NAME}) deploy_target(${PROJECT_NAME}5 VERBOSE DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../release) endif()