From df1cadde824940dcc75b8027981633597c2ab5c8 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 24 Mar 2020 23:29:37 +0100 Subject: [PATCH] fix CI files and licence path --- .gitlab-ci-files/job-linux-archlinux.yml | 51 ----------- .gitlab-ci-files/job-linux-centos7.yml | 79 ---------------- .gitlab-ci-files/job-linux-debian8.yml | 51 ----------- .gitlab-ci-files/job-linux-debian9.yml | 51 ----------- .gitlab-ci-files/job-linux-desktop.yml | 16 +--- .gitlab-ci-files/job-linux-ubuntu.yml | 51 ----------- .gitlab-ci-files/job-linux.yml | 66 -------------- .gitlab-ci-files/job-macosx-desktop.yml | 27 ++---- .gitlab-ci-files/job-macosx.yml | 91 ------------------- .gitlab-ci-files/job-windows-desktop.yml | 35 ++----- .gitlab-ci-files/job-windows.yml | 36 -------- CMakeLists.txt | 4 +- linphone-desktop/build/CMakeLists.txt | 2 +- .../linphone_package/CMakeLists.txt | 2 +- 14 files changed, 28 insertions(+), 534 deletions(-) delete mode 100644 .gitlab-ci-files/job-linux-archlinux.yml delete mode 100644 .gitlab-ci-files/job-linux-centos7.yml delete mode 100644 .gitlab-ci-files/job-linux-debian8.yml delete mode 100644 .gitlab-ci-files/job-linux-debian9.yml delete mode 100644 .gitlab-ci-files/job-linux-ubuntu.yml delete mode 100644 .gitlab-ci-files/job-linux.yml delete mode 100644 .gitlab-ci-files/job-macosx.yml delete mode 100644 .gitlab-ci-files/job-windows.yml diff --git a/.gitlab-ci-files/job-linux-archlinux.yml b/.gitlab-ci-files/job-linux-archlinux.yml deleted file mode 100644 index 9dedf4a90..000000000 --- a/.gitlab-ci-files/job-linux-archlinux.yml +++ /dev/null @@ -1,51 +0,0 @@ -################################################# -# Makefile -################################################# - -job-archlinux-latest-makefile-gcc: - - tags: [ "docker-archlinux-latest" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: gcc - CXX: g++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .scheduled-job-linux-desktop - - -job-archlinux-latest-makefile-clang: - - tags: [ "docker-archlinux-latest" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: clang - CXX: clang++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .scheduled-job-linux-desktop - -################################################# -# Ninja -################################################# - -job-archlinux-latest-ninja-gcc: - - tags: [ "docker-archlinux-latest" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest - variables: - CMAKE_GENERATOR: Ninja - CC: gcc - CXX: g++ - extends: .job-linux-desktop - - -job-archlinux-latest-ninja-clang: - - tags: [ "docker-archlinux-latest" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest - variables: - CMAKE_GENERATOR: Ninja - CC: clang - CXX: clang++ - extends: .job-linux-desktop \ No newline at end of file diff --git a/.gitlab-ci-files/job-linux-centos7.yml b/.gitlab-ci-files/job-linux-centos7.yml deleted file mode 100644 index cfcb4d6b9..000000000 --- a/.gitlab-ci-files/job-linux-centos7.yml +++ /dev/null @@ -1,79 +0,0 @@ -################################################# -# Makefile -################################################# - -job-centos7-makefile-gcc: - - tags: [ "docker-centos7" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: gcc - CXX: g++ - ADDITIONAL_BUILD_OPTIONS: -j1 - extends: .job-linux-desktop - - -job-centos7-makefile-clang: - - tags: [ "docker-centos7" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: clang - CXX: clang++ - ADDITIONAL_BUILD_OPTIONS: -j1 - extends: .job-linux-desktop - -################################################# -# Ninja -################################################# - -#job-centos7-ninja-gcc: -# -# tags: [ "docker-centos7" ] -# image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 -# variables: -# CMAKE_GENERATOR: Ninja -# CC: gcc -# CXX: g++ -# extends: .job-linux-desktop - - -#job-centos7-ninja-clang: -# -# tags: [ "docker-centos7" ] -# image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 -# variables: -# CMAKE_GENERATOR: Ninja -# CC: clang -# CXX: clang++ -# extends: .job-linux-desktop - -################################################# -# RPM -################################################# - -job-centos7-rpm: - - tags: [ "docker-centos7" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 - extends: .job-linux-rpm - -################################################# -# Deploy -################################################# - -job-centos7-rpm-deploy: - - stage: deploy - tags: [ "deploy-linux" ] - - only: - - schedules - dependencies: - - job-centos7-rpm - - script: - - cd WORK/desktop-rpm/rpmbuild/RPMS/x86_64/ && rsync -pr . $DEPLOY_SERVER:$CENTOS7_DEPLOY_DIRECTORY - - ssh $DEPLOY_SERVER "chmod a+r $CENTOS7_DEPLOY_DIRECTORY/*.rpm && createrepo_c --update $CENTOS7_DEPLOY_DIRECTORY/." \ No newline at end of file diff --git a/.gitlab-ci-files/job-linux-debian8.yml b/.gitlab-ci-files/job-linux-debian8.yml deleted file mode 100644 index 346ea4f19..000000000 --- a/.gitlab-ci-files/job-linux-debian8.yml +++ /dev/null @@ -1,51 +0,0 @@ -################################################# -# Makefile -################################################# - -job-debian8-makefile-gcc: - - tags: [ "docker-debian8" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8 - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: gcc - CXX: g++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .job-linux-desktop - - -job-debian8-makefile-clang: - - tags: [ "docker-debian8" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8 - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: clang - CXX: clang++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .job-linux-desktop - -################################################# -# Ninja -################################################# - -#job-debian8-ninja-gcc: -# -# tags: [ "docker-debian8" ] -# image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8 -# variables: -# CMAKE_GENERATOR: Ninja -# CC: gcc -# CXX: g++ -# extends: .job-linux-desktop - - -#job-debian8-ninja-clang: -# -# tags: [ "docker-debian8" ] -# image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8 -# variables: -# CMAKE_GENERATOR: Ninja -# CC: clang -# CXX: clang++ -# extends: .job-linux-desktop \ No newline at end of file diff --git a/.gitlab-ci-files/job-linux-debian9.yml b/.gitlab-ci-files/job-linux-debian9.yml deleted file mode 100644 index 16a57ae16..000000000 --- a/.gitlab-ci-files/job-linux-debian9.yml +++ /dev/null @@ -1,51 +0,0 @@ -################################################# -# Makefile -################################################# - -job-debian9-makefile-gcc: - - tags: [ "docker-debian9" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: gcc - CXX: g++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .scheduled-job-linux-desktop - - -job-debian9-makefile-clang: - - tags: [ "docker-debian9" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: clang - CXX: clang++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .scheduled-job-linux-desktop - -################################################# -# Ninja -################################################# - -job-debian9-ninja-gcc: - - tags: [ "docker-debian9" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - variables: - CMAKE_GENERATOR: Ninja - CC: gcc - CXX: g++ - extends: .job-linux-desktop - - -job-debian9-ninja-clang: - - tags: [ "docker-debian9" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - variables: - CMAKE_GENERATOR: Ninja - CC: clang - CXX: clang++ - extends: .job-linux-desktop \ No newline at end of file diff --git a/.gitlab-ci-files/job-linux-desktop.yml b/.gitlab-ci-files/job-linux-desktop.yml index e00ab5453..31705d7dd 100644 --- a/.gitlab-ci-files/job-linux-desktop.yml +++ b/.gitlab-ci-files/job-linux-desktop.yml @@ -11,26 +11,18 @@ - cmake --version - export CC=$CC - export CXX=$CXX - - mkdir -p build-desktop/OUTPUT + - mkdir -p build/OUTPUT - echo $CMAKE_GENERATOR - echo $DEFAULT_LINUX_CMAKE_OPTIONS - echo $CMAKE_OPTIONS - echo $CMAKE_SANITIZER_OPTIONS # SDK Building - - cd build-desktop + - cd build - cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS - - cmake --build . --target sdk $LBC_NODEBUG_OPTIONS -# Minizip install to OUTPUT folder - - cmake .. - - cmake --build . --target minizip $LBC_NODEBUG_OPTIONS - - cmake --build . --target install $LBC_NODEBUG_OPTIONS -# Update CMake installation - - cmake .. -G "$CMAKE_GENERATOR" $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS - - cmake --build . --target linphone-qt $LBC_NODEBUG_OPTIONS - - cmake --build . --target install + - cmake --build . --target all $LBC_NODEBUG_OPTIONS artifacts: paths: - - build-desktop/OUTPUT + - build/OUTPUT expire_in: 1 week diff --git a/.gitlab-ci-files/job-linux-ubuntu.yml b/.gitlab-ci-files/job-linux-ubuntu.yml deleted file mode 100644 index 3dde1fdbc..000000000 --- a/.gitlab-ci-files/job-linux-ubuntu.yml +++ /dev/null @@ -1,51 +0,0 @@ -################################################# -# Makefile -################################################# - -job-ubuntu-rolling-makefile-gcc: - - tags: [ "docker-ubuntu-rolling" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: gcc - CXX: g++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .scheduled-job-linux-desktop - - -job-ubuntu-rolling-makefile-clang: - - tags: [ "docker-ubuntu-rolling" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: clang - CXX: clang++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .scheduled-job-linux-desktop - -################################################# -# Ninja -################################################# - -job-ubuntu-rolling-ninja-gcc: - - tags: [ "docker-ubuntu-rolling" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling - variables: - CMAKE_GENERATOR: Ninja - CC: gcc - CXX: g++ - extends: .job-linux-desktop - - -job-ubuntu-rolling-ninja-clang: - - tags: [ "docker-ubuntu-rolling" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling - variables: - CMAKE_GENERATOR: Ninja - CC: clang - CXX: clang++ - extends: .job-linux-desktop \ No newline at end of file diff --git a/.gitlab-ci-files/job-linux.yml b/.gitlab-ci-files/job-linux.yml deleted file mode 100644 index 6a9814f24..000000000 --- a/.gitlab-ci-files/job-linux.yml +++ /dev/null @@ -1,66 +0,0 @@ -################################################# -# Ccache -################################################# - -.linux-ccache: - - cache: - key: $CI_JOB_NAME - paths: - - ccache/ - - before_script: - - mkdir -p ccache - - echo "max_size = $CCACHE_SIZE" > ccache/ccache.conf - - export CCACHE_BASEDIR=${PWD} - - export CCACHE_DIR=${PWD}/ccache - - ccache -s - - after_script: - - export CCACHE_DIR=${PWD}/ccache - - ccache -s - -################################################# -# Job -################################################# - -.job-linux-desktop: - - stage: build - - extends: .linux-ccache - - script: - - export CC=$CC - - export CXX=$CXX - - ./prepare.py -G "$CMAKE_GENERATOR" -cc $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS - - cmake --build WORK/desktop/cmake -- $ADDITIONAL_BUILD_OPTIONS - -################################################# -# RPM -################################################# - -.job-linux-rpm: - - stage: package - - script: - - sudo rpm -i --replacepkgs /linphone-qt-* - - ./prepare.py desktop-rpm $DEFAULT_CMAKE_OPTIONS $CMAKE_OPTIONS - - make - - artifacts: - paths: - - WORK/desktop-rpm/rpmbuild/RPMS/x86_64/*.rpm - when: always - expire_in: 1 week - -################################################# -# Schedule -################################################# - -.scheduled-job-linux-desktop: - - extends: .job-linux-desktop - only: - - schedules \ No newline at end of file diff --git a/.gitlab-ci-files/job-macosx-desktop.yml b/.gitlab-ci-files/job-macosx-desktop.yml index 028abf981..6813a89d5 100644 --- a/.gitlab-ci-files/job-macosx-desktop.yml +++ b/.gitlab-ci-files/job-macosx-desktop.yml @@ -7,24 +7,16 @@ ccache -s export Qt5_DIR=/usr/local/opt/qt/lib/cmake export PATH=$PATH:/usr/local/opt/qt/bin - if [ -d "build-desktop" ]; then rm -rf build-desktop; fi; - mkdir -p build-desktop/OUTPUT - cd build-desktop + if [ -d "build" ]; then rm -rf build; fi; + mkdir -p build/OUTPUT + cd build #SDK Building echo $CMAKE_GENERATOR echo $DEFAULT_MACOS_CMAKE_OPTIONS echo $CMAKE_OPTIONS echo $ADDITIONAL_BUILD_OPTIONS cmake .. -G "$CMAKE_GENERATOR" -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 $DEFAULT_MACOS_CMAKE_OPTIONS $XCODE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS - cmake --build . --target sdk $LBC_NODEBUG_OPTIONS -- $ADDITIONAL_BUILD_OPTIONS - # Minizip install to OUTPUT folder - cmake .. - cmake --build . --target minizip - cmake --build . --target install - # Update CMake installation - cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 $DEFAULT_MACOS_CMAKE_OPTIONS $XCODE_OPTIONS $CMAKE_OPTIONS - cmake --build . --target linphone-qt -- $ADDITIONAL_BUILD_OPTIONS - cmake --build . --target install -- $ADDITIONAL_BUILD_OPTIONS + cmake --build . --target all $LBC_NODEBUG_OPTIONS -- $ADDITIONAL_BUILD_OPTIONS ccache -s .job-macosx-desktop: @@ -34,7 +26,7 @@ - *build_all_script artifacts: paths: - - build-desktop/OUTPUT + - build/OUTPUT expire_in: 1 week ################################################# @@ -91,14 +83,15 @@ job-macosx-makefile-package: only: variables: - $NIGHTLY_MASTER + variables: + CMAKE_OPTIONS: -DENABLE_PACKAGING=YES extends: job-macosx-makefile script: - *build_all_script - - cmake --build . --target package -- $ADDITIONAL_BUILD_OPTIONS - - codesign --verbose -s "$MACOS_SIGNING_IDENTITY" CPackBuild/Linphone*.dmg + - codesign --verbose -s "$MACOS_SIGNING_IDENTITY" OUTPUT/Packages/Linphone*.dmg artifacts: paths: - - build-desktop/CPackBuild/Linphone*.dmg + - build/OUTPUT/Packages/Linphone*.dmg expire_in: 1 week ################################################# @@ -114,4 +107,4 @@ job-macosx-makefile-deploy: variables: - $NIGHTLY_MASTER script: - - scp build-desktop/CPackBuild/Linphone*.dmg $DEPLOY_SERVER:$MACOSX_UPLOAD_DIRECTORY/app/ + - scp build/OUTPUT/Packages/Linphone*.dmg $DEPLOY_SERVER:$MACOSX_UPLOAD_DIRECTORY/app/ diff --git a/.gitlab-ci-files/job-macosx.yml b/.gitlab-ci-files/job-macosx.yml deleted file mode 100644 index 1f54baae4..000000000 --- a/.gitlab-ci-files/job-macosx.yml +++ /dev/null @@ -1,91 +0,0 @@ - -.job-macosx: - - stage: build - - tags: [ "macosx" ] - - script: - - ccache -s - - export Qt5_DIR=/usr/local/opt/qt/lib/cmake - - export PATH=$PATH:/usr/local/opt/qt/bin - - python prepare.py -G "$CMAKE_GENERATOR" -cc --package -DLINPHONE_BUILDER_SIGNING_IDENTITY="$MACOS_SIGNING_IDENTITY" $DEFAULT_MACOS_CMAKE_OPTIONS $CMAKE_OPTIONS - - cmake --build WORK/desktop/cmake -- $ADDITIONAL_BUILD_OPTIONS - - codesign --verbose -s "$MACOS_SIGNING_IDENTITY" WORK/desktop/Build/linphone_package/Linphone-*.dmg - - ccache -s - - artifacts: - paths: - - WORK/desktop/Build/linphone_package/$PACKAGE_NAME-*.dmg - - WORK/desktop/Build/linphone_package/linphone-sdk-*-mac.zip - when: always - expire_in: 1 week - - -.scheduled-job-macosx: - - extends: .job-macosx - only: - - schedules - - -################################################# -# Makefile -################################################# - -job-macosx-makefile: - - variables: - CMAKE_GENERATOR: Unix Makefiles - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .scheduled-job-macosx - -################################################# -# Ninja -################################################# - -job-macosx-ninja: - - variables: - CMAKE_GENERATOR: Ninja - extends: .job-macosx - -################################################# -# Xcode -################################################# - -job-macosx-xcode: - - stage: build - - tags: [ "macosx" ] - - only: - - schedules - script: - - export Qt5_DIR=/usr/local/opt/qt/lib/cmake - - export PATH=$PATH:/usr/local/opt/qt/bin - - python prepare.py -G Xcode -cc --package $DEFAULT_MACOS_CMAKE_OPTIONS $CMAKE_OPTIONS - - cmake --build WORK/desktop/cmake -- -IDEBuildOperationMaxNumberOfConcurrentCompileTasks=`sysctl -n hw.ncpu` - - artifacts: - paths: - - WORK/desktop/Build/linphone_package/$PACKAGE_NAME-*.dmg - - WORK/desktop/Build/linphone_package/linphone-sdk-*-mac.zip - when: always - expire_in: 1 week - -################################################# -# Deploy -################################################# - -job-macosx-deploy: - - stage: deploy - tags: [ "deploy" ] - - dependencies: - - job-macosx-ninja - - script: - - scp WORK/desktop/Build/linphone_package/$PACKAGE_NAME-*-mac.dmg $DEPLOY_SERVER:$MACOSX_UPLOAD_DIRECTORY/ diff --git a/.gitlab-ci-files/job-windows-desktop.yml b/.gitlab-ci-files/job-windows-desktop.yml index efdbf1659..be904b705 100644 --- a/.gitlab-ci-files/job-windows-desktop.yml +++ b/.gitlab-ci-files/job-windows-desktop.yml @@ -54,9 +54,9 @@ script: - SET Qt5_DIR=C:\Qt\5.12.6\msvc2017\lib\cmake - SET PATH=%PATH%;C:\Qt\5.12.6\msvc2017\bin - - IF EXIST build-desktop RMDIR /S /Q build-desktop - - mkdir build-desktop - - cd build-desktop + - IF EXIST build RMDIR /S /Q build + - mkdir build + - cd build - mkdir OUTPUT #SDK Building #we launch the msvc-cl wrapper located in python scripts folder @@ -65,19 +65,11 @@ - C:\PROGRA~1\Python37\Scripts\cl -s - cmake .. -G "Visual Studio 15 2017" -DLINPHONESDK_PLATFORM=Desktop -DENABLE_CSHARP_WRAPPER=YES -DCMAKE_BUILD_TYPE=Release %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% - cmake --build . --target ALL_BUILD --config Release %LBC_NODEBUG_OPTIONS% -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false -# Minizip install to OUTPUT folder - - cmake .. - - cmake --build . --target minizip - - cmake --build . --target install --config Release %LBC_NODEBUG_OPTIONS% -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false -# Update CMake installation - - cmake .. -G "Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=Release %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% - - cmake --build . --target linphone-qt --config Release -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false - - cmake --build . --target install --config Release -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false - C:\PROGRA~1\Python37\Scripts\cl -s artifacts: paths: - - build-desktop\OUTPUT + - build\OUTPUT expire_in: 2 days .job-windows-vs2017-scheduled: @@ -124,28 +116,21 @@ job-windows-vs2017-package: script: - SET Qt5_DIR=C:\Qt\5.12.6\msvc2017\lib\cmake - SET PATH=%PATH%;C:\Qt\5.12.6\msvc2017\bin - - IF EXIST build-desktop RMDIR /S /Q build-desktop - - mkdir build-desktop - - cd build-desktop + - IF EXIST build RMDIR /S /Q build + - mkdir build + - cd build - mkdir OUTPUT #SDK Building #we launch the msvc-cl wrapper located in python scripts folder #this wrapper relays only needed calls to the real compiler #cache stats display - C:\PROGRA~1\Python37\Scripts\cl -s - - cmake .. -G "Visual Studio 15 2017" -DLINPHONESDK_PLATFORM=Desktop -DENABLE_CSHARP_WRAPPER=YES -DCMAKE_BUILD_TYPE=Release %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% + - cmake .. -G "Visual Studio 15 2017" -DLINPHONESDK_PLATFORM=Desktop -DENABLE_CSHARP_WRAPPER=YES -DCMAKE_BUILD_TYPE=Release -DENABLE_PACKAGING=YES %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% - cmake --build . --target ALL_BUILD --config Release %LBC_NODEBUG_OPTIONS% -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false -# Minizip install to OUTPUT folder - - cmake .. - - cmake --build . --target minizip - - cmake --build . --target install --config Release %LBC_NODEBUG_OPTIONS% -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false -# Update CMake installation - - cmake .. -G "Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=Release %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% - - cmake --build . --target linphone-qt --config Release -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false - - cmake --build . --target package --config Release -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false - C:\PROGRA~1\Python37\Scripts\cl -s - mkdir "%CI_PROJECT_DIR%/results" - - cd CPackBuild + - cd OUTPUT + - cd Packages - copy /B *.exe "%CI_PROJECT_DIR%/results" artifacts: diff --git a/.gitlab-ci-files/job-windows.yml b/.gitlab-ci-files/job-windows.yml deleted file mode 100644 index a7532d539..000000000 --- a/.gitlab-ci-files/job-windows.yml +++ /dev/null @@ -1,36 +0,0 @@ -################################################# -# Visual Studio 2015 -################################################# - -job-windows-vs2015: - - stage: build - - tags: [ "windows" ] - - script: - - echo %Qt5_DIR% - - echo %PATH% - - if DEFINED WINDOWS_SIGNING_DIRECTORY ( xcopy /I /Y "%WINDOWS_SIGNING_DIRECTORY%" "cmake_builder\\linphone_package\\sign" ) - - python prepare.py -G "Visual Studio 14 2015" --package %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% - - cmake --build WORK/desktop/cmake --config Release -- /maxcpucount - - artifacts: - paths: - - WORK/desktop/Build/linphone_package/%PACKAGE_NAME%-*-win32.exe - expire_in: 1 week - -################################################# -# Deploy -################################################# - -job-windows-deploy: - - stage: deploy - tags: [ "deploy" ] - - dependencies: - - job-windows-vs2015 - - script: - - scp WORK/desktop/Build/linphone_package/$PACKAGE_NAME-*-win32.exe $DEPLOY_SERVER:$WINDOWS_UPLOAD_DIRECTORY/ \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index d914c67a0..a7455821f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,7 @@ endif() # SET OPTIONS #------------------------------------------------------------------------------- -option(ENABLE_PACKAGING "Enable packaging" NO) +option(ENABLE_APP_PACKAGING "Enable packaging" NO) option(ENABLE_UPDATE_CHECK "Enable update check." NO) option(ENABLE_UNIT_TESTS "Enable unit test of SDK." NO ) option(ENABLE_TESTS "Build with testing binaries of SDK" NO ) @@ -87,7 +87,7 @@ endif() option(ENABLE_RELATIVE_PREFIX "Set Internal packages relative to the binary" YES) set(ALL_OPTIONS "-DENABLE_UPDATE_CHECK=${ENABLE_UPDATE_CHECK}") -list(APPEND ALL_OPTIONS "-DENABLE_PACKAGING=${ENABLE_PACKAGING}") +list(APPEND ALL_OPTIONS "-DENABLE_APP_PACKAGING=${ENABLE_APP_PACKAGING}") list(APPEND ALL_OPTIONS "-DENABLE_UNIT_TESTS=${ENABLE_UNIT_TESTS}") list(APPEND ALL_OPTIONS "-DENABLE_TESTS=${ENABLE_TESTS}") list(APPEND ALL_OPTIONS "-DENABLE_TESTS_COMPONENTS=${ENABLE_TESTS_COMPONENTS}") diff --git a/linphone-desktop/build/CMakeLists.txt b/linphone-desktop/build/CMakeLists.txt index e8475f09d..13f0f5236 100644 --- a/linphone-desktop/build/CMakeLists.txt +++ b/linphone-desktop/build/CMakeLists.txt @@ -24,7 +24,7 @@ if(NOT CPACK_PACKAGE_NAME) set(CPACK_PACKAGE_NAME "linphone") endif () -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE.txt") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE.txt") set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) diff --git a/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt b/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt index 8bb6f2e4e..cb764dadd 100644 --- a/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt @@ -258,7 +258,7 @@ endif () # ============================================================================== # CPack. # ============================================================================== -if(${ENABLE_PACKAGING}) +if(${ENABLE_APP_PACKAGING}) set(CPACK_BINARY_STGZ OFF) set(CPACK_BINARY_TGZ OFF) set(CPACK_BINARY_TZ OFF)