mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 15:24:03 +02:00
Compare commits
No commits in common. "2c0035bb2f0811030fbb7ab2877759f4a9fd5e0d" and "1227e6c4e39fd3c6ab3e163b74c6aca3e1360c4f" have entirely different histories.
2c0035bb2f
...
1227e6c4e3
|
@ -205,7 +205,6 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
|||
- security default-keychain -s $HOME/Library/Keychains/build.keychain
|
||||
# Unlock the keychain
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- security set-keychain-settings $HOME/Library/Keychains/build.keychain
|
||||
# Check if System.keychain is not cluttered
|
||||
# good: 60K
|
||||
# bad: 25MB
|
||||
|
@ -257,6 +256,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
|||
- sudo ln -s /Library/Developer/CommandLineTools/usr/bin/python3 /Library/Developer/CommandLineTools/usr/bin/python
|
||||
- whereis python
|
||||
- pwd
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- conan profile new valentina
|
||||
- conan profile update settings.build_type=Release valentina
|
||||
- conan profile update settings.os=Macos valentina
|
||||
|
|
12
appveyor.yml
12
appveyor.yml
|
@ -628,7 +628,6 @@ for:
|
|||
- security default-keychain -s $HOME/Library/Keychains/build.keychain
|
||||
# Unlock the keychain
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- security set-keychain-settings $HOME/Library/Keychains/build.keychain
|
||||
# Check if System.keychain is not cluttered
|
||||
# good: 60K
|
||||
# bad: 25MB
|
||||
|
@ -669,7 +668,7 @@ for:
|
|||
|
||||
sudo ln -s /usr/local /opt/local;
|
||||
|
||||
cache_tag=usr_local_2 # this can be modified to rebuild deps
|
||||
cache_tag=usr_local_1 # this can be modified to rebuild deps
|
||||
|
||||
cdir=$HOME/cache_dir
|
||||
cache_tar=$cdir/$cache_tag.tar
|
||||
|
@ -693,7 +692,7 @@ for:
|
|||
python3 ./scripts/treestate.py scan /usr/local usrlocal.json
|
||||
|
||||
brew update
|
||||
brew install coreutils ccache git openssl@1.1 pkg-config qbs
|
||||
brew install coreutils ccache git openssl@1.1 pkg-config
|
||||
|
||||
# The build environment is now ready for use. We can complete
|
||||
# the rest of the process of creating the Homebrew archive
|
||||
|
@ -725,14 +724,11 @@ for:
|
|||
- qmake --version
|
||||
- which qmake
|
||||
- qbs --version
|
||||
# Patch Qbs. Remove after Qbs 2.1.2+.
|
||||
- curl https://gist.githubusercontent.com/dismine/43a20f66f563232e54e02f2e85732e7a/raw/e80a0c827348da3e99310ba4a648c1860bb3a8a6/BundleModule.qbs --output $HOME/BundleModule.qbs --silent
|
||||
- cp -f $HOME/BundleModule.qbs $(brew --prefix qbs)/share/qbs/modules/bundle/BundleModule.qbs
|
||||
- rm $HOME/BundleModule.qbs
|
||||
- cd ${APPVEYOR_BUILD_FOLDER}
|
||||
|
||||
build_script:
|
||||
- pwd
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=missing
|
||||
- qbs setup-toolchains --detect
|
||||
- qbs config --list profiles
|
||||
|
@ -809,7 +805,6 @@ for:
|
|||
- security default-keychain -s $HOME/Library/Keychains/build.keychain
|
||||
# Unlock the keychain
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- security set-keychain-settings $HOME/Library/Keychains/build.keychain
|
||||
# Check if System.keychain is not cluttered
|
||||
# good: 60K
|
||||
# bad: 25MB
|
||||
|
@ -854,6 +849,7 @@ for:
|
|||
|
||||
build_script:
|
||||
- pwd
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=missing
|
||||
- qbs setup-toolchains --detect
|
||||
- qbs config --list profiles
|
||||
|
|
14
dmg.qbs
14
dmg.qbs
|
@ -1,6 +1,5 @@
|
|||
import qbs.File
|
||||
import qbs.FileInfo
|
||||
import qbs.Utilities
|
||||
|
||||
VAppleApplicationDiskImage {
|
||||
Depends { name: "buildconfig" }
|
||||
|
@ -44,15 +43,10 @@ VAppleApplicationDiskImage {
|
|||
codesign.signingType: "apple-id"
|
||||
}
|
||||
|
||||
files: {
|
||||
var files = ["dist/macx/dmg/dmg.iconset"];
|
||||
|
||||
// Tested on 2.1.1. At least this version doesn't crash even if the feature still doesn't work
|
||||
if (Utilities.versionCompare(qbs.version, "2.1.1") >= 0)
|
||||
files.push("dist/macx/dmg/en_US.lproj/LICENSE");
|
||||
|
||||
return files;
|
||||
}
|
||||
files: [
|
||||
"dist/macx/dmg/dmg.iconset",
|
||||
"dist/macx/dmg/en_US.lproj/LICENSE"
|
||||
]
|
||||
|
||||
Group {
|
||||
name: "Bundles"
|
||||
|
|
|
@ -15,8 +15,6 @@ VToolApp {
|
|||
Depends { name: "VFormatLib"; }
|
||||
Depends { name: "VMiscLib"; }
|
||||
Depends { name: "VGAnalyticsLib" }
|
||||
Depends { name: "Tape"; condition: qbs.targetOS.contains("macos") && buildconfig.enableMultiBundle }
|
||||
Depends { name: "Puzzle"; condition: qbs.targetOS.contains("macos") && buildconfig.enableMultiBundle }
|
||||
|
||||
Depends {
|
||||
name: "Qt.xmlpatterns"
|
||||
|
|
Loading…
Reference in a new issue