Compare commits
11 Commits
187fbd0208
...
91720c4b7c
Author | SHA1 | Date |
---|---|---|
Roman Telezhynskyi | 91720c4b7c | |
Roman Telezhynskyi | 55640d6257 | |
Roman Telezhynskyi | 8b443c6e61 | |
Roman Telezhynskyi | b80106c18b | |
Roman Telezhynskyi | 4dff6f303f | |
Roman Telezhynskyi | 276aeb8c73 | |
Roman Telezhynskyi | b30e48f728 | |
Roman Telezhynskyi | 7a319922ed | |
Roman Telezhynskyi | 797d90bdb9 | |
Roman Telezhynskyi | 7c50a13ac6 | |
Roman Telezhynskyi | dd2b4605e0 |
|
@ -355,15 +355,14 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
|||
# This won't display anything secret.
|
||||
- security find-identity -v -p codesigning
|
||||
- brew update > /dev/null
|
||||
- brew install qt6 coreutils ccache qbs cmake ninja git openssl@1.1 pkg-config poppler xerces-c pipx
|
||||
- brew install qt6 coreutils ccache qbs cmake ninja git openssl@1.1 pkg-config poppler xerces-c
|
||||
- brew outdated
|
||||
- brew upgrade qt6
|
||||
- pipx ensurepath
|
||||
- echo $PATH
|
||||
- export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
|
||||
- echo $PATH
|
||||
- python3 --version
|
||||
- pipx install pip dropbox py7zr 'urllib3<2.0' conan==1.63.0 requests
|
||||
- pip3 install --break-system-packages --user --upgrade pip dropbox py7zr 'urllib3<2.0' conan==1.63.0 requests
|
||||
- ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE"
|
||||
- qmake --version
|
||||
- which qmake
|
||||
|
@ -373,6 +372,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
|||
- export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
|
||||
- echo $PATH
|
||||
- whereis python3
|
||||
- sudo mkdir /usr/local/bin
|
||||
- sudo ln -s -f /usr/bin/python3 /usr/local/bin/python
|
||||
- sudo ln -s /Library/Developer/CommandLineTools/usr/bin/python3 /Library/Developer/CommandLineTools/usr/bin/python
|
||||
- whereis python
|
||||
|
@ -384,7 +384,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
|||
- conan profile new valentina
|
||||
- conan profile update settings.build_type=Release valentina
|
||||
- conan profile update settings.os=Macos valentina
|
||||
- conan profile update settings.os.Macos.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
|
||||
- conan profile update settings.os.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
|
||||
- conan profile update settings.compiler=clang valentina
|
||||
- conan profile update settings.compiler.cppstd=17 valentina
|
||||
- conan profile update settings.compiler.libcxx=libstdc++11 valentina
|
||||
|
|
|
@ -683,13 +683,13 @@ for:
|
|||
- conan profile new valentina
|
||||
- conan profile update settings.build_type=Release valentina
|
||||
- conan profile update settings.os=Macos valentina
|
||||
- conan profile update settings.os.Macos.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
|
||||
- conan profile update settings.os.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
|
||||
- conan profile update settings.os.os_build=Macos valentina
|
||||
- conan profile update settings.os.arch=x86_64 valentina
|
||||
- conan profile update settings.os.arch_build=x86_64 valentina
|
||||
- conan profile update settings.compiler=apple-clang valentina
|
||||
- conan profile update settings.compiler.cppstd=17 valentina
|
||||
- conan profile update settings.compiler.libcxx=libstdc++11 valentina
|
||||
- conan profile update settings.compiler.libcxx=libc++ valentina
|
||||
- conan profile update settings.compiler.version=15 valentina
|
||||
- qbs setup-toolchains --detect
|
||||
- qbs config --list profiles
|
||||
|
@ -882,13 +882,13 @@ for:
|
|||
- conan profile new valentina
|
||||
- conan profile update settings.build_type=Release valentina
|
||||
- conan profile update settings.os=Macos valentina
|
||||
- conan profile update settings.os.Macos.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
|
||||
- conan profile update settings.os.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
|
||||
- conan profile update settings.os_build=Macos valentina
|
||||
- conan profile update settings.os.arch=x86_64 valentina
|
||||
- conan profile update settings.os.arch_build=x86_64 valentina
|
||||
- conan profile update settings.compiler=apple-clang valentina
|
||||
- conan profile update settings.compiler.cppstd=17 valentina
|
||||
- conan profile update settings.compiler.libcxx=libstdc++11 valentina
|
||||
- conan profile update settings.compiler.libcxx=libc++ valentina
|
||||
- conan profile update settings.compiler.version=14 valentina
|
||||
- qbs setup-toolchains --detect
|
||||
- qbs config --list profiles
|
||||
|
|
|
@ -24,9 +24,7 @@ class Recipe(ConanFile):
|
|||
|
||||
def requirements(self):
|
||||
if not self.options.with_xerces:
|
||||
if "xerces-c" in self.requires:
|
||||
del self.requires["xerces-c"]
|
||||
del self.requires["xerces-c"]
|
||||
|
||||
if not self.options.with_crash_reporting:
|
||||
if "sentry-crashpad/0.6.5" in self.requires:
|
||||
del self.requires["sentry-crashpad/0.6.5"]
|
||||
del self.requires["sentry-crashpad"]
|
||||
|
|
|
@ -37,7 +37,7 @@ VLib {
|
|||
windeployqt.languages: i18nconfig.qtTranslationLocales.join(',')
|
||||
}
|
||||
|
||||
installDebugInformation: qbs.buildVariant !== "release"
|
||||
installDebugInformation: qbs.buildVariant !== "release" || buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled
|
||||
|
||||
Properties {
|
||||
condition: !qbs.targetOS.contains("macos") || (qbs.targetOS.contains("macos") && !buildconfig.enableMultiBundle)
|
||||
|
|
|
@ -12,7 +12,7 @@ VApp {
|
|||
version: buildconfig.projectVersion
|
||||
install: true
|
||||
installDir: buildconfig.installBinaryPath
|
||||
installDebugInformation: qbs.buildVariant !== "release"
|
||||
installDebugInformation: qbs.buildVariant !== "release" || buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled
|
||||
consoleApplication: false
|
||||
|
||||
property bool primaryApp: false
|
||||
|
|
|
@ -36,6 +36,9 @@ def generate_sym_files(install_root):
|
|||
|
||||
debug_files = glob.glob(os.path.join(install_root, "**", "*" + debug_ext), recursive=True)
|
||||
|
||||
if not debug_files:
|
||||
print("No debug files found.")
|
||||
|
||||
for debug_file in debug_files:
|
||||
print(f"Generating symbols for: {os.path.basename(debug_file)}")
|
||||
|
||||
|
@ -83,6 +86,11 @@ def upload_symbols(install_root, val_version, commit_hash, qt_version, clean=Fal
|
|||
# Platform-specific commands for generating and uploading symbol files
|
||||
platform = sys.platform
|
||||
sym_files = generate_sym_files(install_root)
|
||||
|
||||
if not sym_files:
|
||||
print("No symbol files found. Exiting upload process.")
|
||||
return
|
||||
|
||||
app_version = generate_version_string(val_version, commit_hash, qt_version)
|
||||
print(f"Uploading symbols for version {app_version}")
|
||||
|
||||
|
|
|
@ -82,8 +82,8 @@ auto VCrashPaths::GetPlatformString(const QString &string) -> base::FilePath::St
|
|||
#if defined(Q_OS_UNIX)
|
||||
return string.toStdString();
|
||||
#elif defined(Q_OS_WINDOWS)
|
||||
#else
|
||||
return string.toStdWString();
|
||||
#else
|
||||
#error GetPlatformString not implemented on this platform
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -275,6 +275,7 @@ auto VAbstractApplication::QtTranslationsPath(const QString &locale) -> QString
|
|||
#endif // QBS_BUILD
|
||||
|
||||
#if defined(APPIMAGE)
|
||||
Q_UNUSED(locale)
|
||||
/* Fix path to translations when run inside AppImage. */
|
||||
return AppImageRoot() + APPIMAGE_QT_TRANSLATIONS;
|
||||
#else
|
||||
|
|
Loading…
Reference in New Issue