palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-09-19 15:24:03 +02:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: palo:aa22dcf8705755e9f76b8ba957cb28b4244eab2b
Branches Tags
palo:develop
palo:v0.6.x
palo:master
palo:v0.7.53
palo:v0.7.45
palo:v0.7.42
palo:v0.7.41
palo:v0.7.39
palo:v0.7.40
palo:v0.7.50
palo:v0.7.51
palo:v0.7.52
palo:v0.7.49
palo:v0.7.48
palo:v0.7.47
palo:v0.7.46
palo:v0.7.44
palo:v0.7.43
palo:v0.7.38
palo:v0.7.37
palo:v0.7.36
palo:v0.6.1
palo:v0.6.0
palo:v0.5.0
palo:v0.4.5
palo:v0.4.4
palo:v0.4.3
palo:v0.4.2
palo:v0.4.1
palo:v0.4.0
palo:v0.3.3
palo:v0.3.2
palo:v0.3.1
palo:v0.3.0
palo:v0.2.9
palo:v0.2.2
palo:v0.2.1
palo:v0.2.0
palo:v0.1.0
..
compare: palo:e4cc5b52bc8a83abc3d59f0a2b2e941209ec00a8
Branches Tags
palo:develop
palo:v0.6.x
palo:master
palo:v0.7.53
palo:v0.7.45
palo:v0.7.42
palo:v0.7.41
palo:v0.7.39
palo:v0.7.40
palo:v0.7.50
palo:v0.7.51
palo:v0.7.52
palo:v0.7.49
palo:v0.7.48
palo:v0.7.47
palo:v0.7.46
palo:v0.7.44
palo:v0.7.43
palo:v0.7.38
palo:v0.7.37
palo:v0.7.36
palo:v0.6.1
palo:v0.6.0
palo:v0.5.0
palo:v0.4.5
palo:v0.4.4
palo:v0.4.3
palo:v0.4.2
palo:v0.4.1
palo:v0.4.0
palo:v0.3.3
palo:v0.3.2
palo:v0.3.1
palo:v0.3.0
palo:v0.2.9
palo:v0.2.2
palo:v0.2.1
palo:v0.2.0
palo:v0.1.0

7 commits
aa22dcf870 ... e4cc5b52bc

Author SHA1 Message Date
Roman Telezhynskyi e4cc5b52bc Remove conan. 2023-09-22 21:04:23 +03:00
Roman Telezhynskyi 01715e10e6 Qt 5 doesn't require openssl. 2023-09-22 20:36:24 +03:00
Roman Telezhynskyi b3f2e76cc3 Fix path to conan user home. 2023-09-22 20:35:26 +03:00
Roman Telezhynskyi b3e0138d67 Use xerces-c from brew where possible. 2023-09-22 20:21:42 +03:00
Roman Telezhynskyi 393243bb87 Add paths to Qt library. 2023-09-22 19:33:19 +03:00
Roman Telezhynskyi d27e28410d Because we install qbs with brew we must use Qt from brew too. 2023-09-22 17:27:51 +03:00
Roman Telezhynskyi a5e6e35e26 Conan doesn't support arch x64. Use x86_64 instead. 2023-09-22 16:31:20 +03:00
2 changed files with 16 additions and 35 deletions
Show stats Expand all files Collapse all files

19
.cirrus.yml
View file

@ -229,17 +229,17 @@ macos_task_template: &MACOS_TASK_TEMPLATE
# This won't display anything secret. # This won't display anything secret.
- security find-identity -v -p codesigning - security find-identity -v -p codesigning
- brew update > /dev/null - brew update > /dev/null
- brew install qt6 coreutils ccache qbs cmake ninja git openssl@1.1 pkg-config poppler - brew install qt6 coreutils ccache qbs cmake ninja git openssl@1.1 pkg-config poppler xerces-c
- echo $PATH - echo $PATH
- export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH" - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
- echo $PATH - echo $PATH
- chmod -R 755 /opt/homebrew/opt/qt6/* - chmod -R 755 /opt/homebrew/opt/qt6/*
- chmod -R 755 /opt/homebrew/opt/openssl@1.1/* - chmod -R 755 /opt/homebrew/opt/openssl@1.1/*
- chmod -R 755 /opt/homebrew/opt/poppler/* - chmod -R 755 /opt/homebrew/opt/poppler/*
- chmod -R 755 /opt/homebrew/opt/xerces-c/*
- python3 --version - python3 --version
- pip3 install --user --upgrade pip dropbox conan==1.61.0 - pip3 install --user --upgrade pip dropbox
- ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE" - ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE"
- conan --version
- qmake --version - qmake --version
- which qmake - which qmake
- qbs --version - qbs --version
@ -260,22 +260,13 @@ macos_task_template: &MACOS_TASK_TEMPLATE
- unzip ${HOME}/macdeployqt-main.zip -d ${HOME} - unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
- cmake ${HOME}/macdeployqt-main -GNinja -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release - cmake ${HOME}/macdeployqt-main -GNinja -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release
- cmake --build ${HOME}/macdeployqt-build-dir --target install - cmake --build ${HOME}/macdeployqt-build-dir --target install
- conan profile new valentina
- conan profile update settings.build_type=Release valentina
- conan profile update settings.os=Macos valentina
- conan profile update settings.os.version=${MACOS_DEPLOYMENT_TARGET} valentina
- conan profile update settings.arch=${ARCH} valentina
- conan profile update settings.compiler=apple-clang valentina
- conan profile update settings.compiler.libcxx=libc++ valentina
- conan profile update settings.compiler.version=14 valentina
- conan install . --build=missing -pr valentina
- qbs setup-toolchains --detect - qbs setup-toolchains --detect
- qbs config --list profiles - qbs config --list profiles
- qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6 - qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6
- qbs-config defaultProfile qt6 - qbs-config defaultProfile qt6
- qbs config profiles.qt6.baseProfile clang - qbs config profiles.qt6.baseProfile clang
- qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:${ENABLE_CCACHE} project.conanProfiles:valentina moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir - qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:${ENABLE_CCACHE} moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix xerces-c)/lib/pkgconfig,$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
- qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:${ENABLE_CCACHE} project.conanProfiles:valentina moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir - qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:${ENABLE_CCACHE} moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix xerces-c)/lib/pkgconfig,$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
# Store the notarization credentials so that we can prevent a UI password dialog # Store the notarization credentials so that we can prevent a UI password dialog
# from blocking the CI # from blocking the CI
- echo "Create keychain profile" - echo "Create keychain profile"

32
appveyor.yml
View file

@ -45,7 +45,7 @@ environment:
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
COMPILER: clang COMPILER: clang
QT: Qt/6.4/macos QT: Qt/6.4/macos
QT_VERSION: Qt6_4 QT_VERSION: Qt6
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
XCODE_VERSION: 13.4.1 XCODE_VERSION: 13.4.1
@ -58,7 +58,7 @@ environment:
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
COMPILER: clang COMPILER: clang
QT: Qt/6.4/macos QT: Qt/6.4/macos
QT_VERSION: Qt6_4 QT_VERSION: Qt6
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
XCODE_VERSION: 13.4.1 XCODE_VERSION: 13.4.1
@ -583,7 +583,7 @@ for:
- job_name: MacOS_12_Qt_6_4 (singlebundle) - job_name: MacOS_12_Qt_6_4 (singlebundle)
environment: environment:
CONAN_USER_HOME: /Users/appveyor/.conan CONAN_USER_HOME: /Users/appveyor
HOMEBREW_NO_INSTALL_CLEANUP: 1 HOMEBREW_NO_INSTALL_CLEANUP: 1
# Should contain the base64 of the certificate # Should contain the base64 of the certificate
MACOS_CERTIFICATE: MACOS_CERTIFICATE:
@ -693,7 +693,7 @@ for:
python3 ./scripts/treestate.py scan /usr/local usrlocal.json python3 ./scripts/treestate.py scan /usr/local usrlocal.json
brew update brew update
brew install coreutils ccache git openssl@1.1 pkg-config qbs cmake ninja poppler brew install coreutils ccache git openssl@1.1 pkg-config qbs qt6 cmake ninja poppler xerces-c
# The build environment is now ready for use. We can complete # The build environment is now ready for use. We can complete
# the rest of the process of creating the Homebrew archive # the rest of the process of creating the Homebrew archive
@ -716,11 +716,10 @@ for:
fi fi
- sudo python3 -m pip install --upgrade pip - sudo python3 -m pip install --upgrade pip
- pip3 install --user --upgrade pip dropbox conan==1.61.0 - pip3 install --user --upgrade pip dropbox
- export PATH="$PATH:`python3 -m site --user-base`/bin" - export PATH="$PATH:`python3 -m site --user-base`/bin"
- echo $PATH - echo $PATH
- python3 --version - python3 --version
- conan --version
- clang --version - clang --version
- qmake --version - qmake --version
- which qmake - which qmake
@ -738,22 +737,13 @@ for:
build_script: build_script:
- pwd - pwd
- conan profile new valentina
- conan profile update settings.build_type=Release valentina
- conan profile update settings.os=Macos valentina
- conan profile update settings.os.version=${MACOS_DEPLOYMENT_TARGET} valentina
- conan profile update settings.arch=${ARCH} valentina
- conan profile update settings.compiler=apple-clang valentina
- conan profile update settings.compiler.libcxx=libc++ valentina
- conan profile update settings.compiler.version=14 valentina
- conan install . --build=missing -pr valentina
- qbs setup-toolchains --detect - qbs setup-toolchains --detect
- qbs config --list profiles - qbs config --list profiles
- qbs setup-qt ${QTDIR}/bin/qmake qt6 - qbs setup-qt $(brew --prefix qt6)/bin/qmake qt6
- qbs config defaultProfile qt6 - qbs config defaultProfile qt6
- qbs config profiles.qt6.baseProfile clang - qbs config profiles.qt6.baseProfile clang
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false project.conanProfiles:valentina moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir - qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix xerces-c)/lib/pkgconfig,$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false project.conanProfiles:valentina moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir - qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix xerces-c)/lib/pkgconfig,$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
# Store the notarization credentials so that we can prevent a UI password dialog # Store the notarization credentials so that we can prevent a UI password dialog
# from blocking the CI # from blocking the CI
- echo "Create keychain profile" - echo "Create keychain profile"
@ -779,7 +769,7 @@ for:
- job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle) - job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
environment: environment:
CONAN_USER_HOME: /Users/appveyor/.conan CONAN_USER_HOME: /Users/appveyor
HOMEBREW_NO_INSTALL_CLEANUP: 1 HOMEBREW_NO_INSTALL_CLEANUP: 1
# Should contain the base64 of the certificate # Should contain the base64 of the certificate
MACOS_CERTIFICATE: MACOS_CERTIFICATE:
@ -871,7 +861,7 @@ for:
- conan profile update settings.build_type=Release valentina - conan profile update settings.build_type=Release valentina
- conan profile update settings.os=Macos valentina - conan profile update settings.os=Macos valentina
- conan profile update settings.os.version=${MACOS_DEPLOYMENT_TARGET} valentina - conan profile update settings.os.version=${MACOS_DEPLOYMENT_TARGET} valentina
- conan profile update settings.arch=${ARCH} valentina - conan profile update settings.arch=x86_64 valentina
- conan profile update settings.compiler=apple-clang valentina - conan profile update settings.compiler=apple-clang valentina
- conan profile update settings.compiler.libcxx=libc++ valentina - conan profile update settings.compiler.libcxx=libc++ valentina
- conan profile update settings.compiler.version=14 valentina - conan profile update settings.compiler.version=14 valentina
@ -882,7 +872,7 @@ for:
- qbs config defaultProfile qt6 - qbs config defaultProfile qt6
- qbs config profiles.qt6.baseProfile clang - qbs config profiles.qt6.baseProfile clang
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false project.conanProfiles:valentina "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" - qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false project.conanProfiles:valentina "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME"
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false project.conanProfiles:valentina moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" - qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false project.conanProfiles:valentina "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME"
# notarytool supported since XCode 13. First we need to backport it. # notarytool supported since XCode 13. First we need to backport it.
- curl https://bitbucket.org/valentinaproject/valentinaproject.bitbucket.io/downloads/notarytool.tar.xz --output $HOME/notarytool.tar.xz --silent - curl https://bitbucket.org/valentinaproject/valentinaproject.bitbucket.io/downloads/notarytool.tar.xz --output $HOME/notarytool.tar.xz --silent
- tar -xf $HOME/notarytool.tar.xz - tar -xf $HOME/notarytool.tar.xz