Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .craft.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ OpenCloudVersion = 1.0
# this version must match the target in the blueprint

# update MacDeploymentTarget when updating Qt
#QtVersion = 6.8.0
CachePatchLvl = 0
QtVersion = 6.11.0
CachePatchLvl = 1

# set WORKSPACE to cwd, override on ci
# with legacy fallback APPVEYOR_BUILD_FOLDER
Expand All @@ -34,6 +34,7 @@ Paths/DownloadDir = ${Variables:Root}/downloads
Blueprints/BlueprintRoot = ${Variables:Root}/blueprints
CraftDebug/LogDir = ${Variables:Root}/logs
ShortPath/JunctionDir = /_/
ShortPath/DriveLetter = Z:/
Packager/CacheDir = ${Variables:WORKSPACE}/cache
Packager/UseCache = ${Variables:UseCache}
Packager/CreateCache = ${Variables:CreateCache}
Expand All @@ -54,12 +55,12 @@ CodeSigning/MacKeychainPath = sign-${Env:DRONE_BUILD_NUMBER}.keychain

[BlueprintSettings]
# skip msys in normal builds its only needed for the cache
dev-utils/msys-base.ignored = True
dev-utils/msys.ignored = True
dev-utils/msys-base.ignored = False
dev-utils/msys.ignored = False
# in the current cache that pulls in the uncached lxml which takes ages to build
dev-utils/gtk-doc.ignored = True

#libs/qt6.version = ${Variables:QtVersion}
libs/qt6.version = ${Variables:QtVersion}

[windows-cl-msvc2022-x86_64]
General/ABI = windows-cl-msvc2022-x86_64
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ jobs:
# actions/upload-artifact doesn't need contents: write
contents: read
strategy:
fail-fast: true
fail-fast: false
matrix:
include:
- target: windows-cl-msvc2022-x86_64
os: windows-latest
os: windows-2022
container:
- target: macos-clang-arm64
os: macos-latest
Expand All @@ -56,8 +56,7 @@ jobs:
env:
CRAFT_TARGET: ${{ matrix.target }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CRAFT_PACKAGE_SYMBOLS: ${{ github.event_name != 'pull_request' }}

CRAFT_PACKAGE_SYMBOLS: false
container: ${{ matrix.container }}

steps:
Expand Down
21 changes: 20 additions & 1 deletion src/resources/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,29 @@ generate_export_header(OpenCloudResources
# Handle Translations, pick all desktop_*.ts files from translations directory.
file(GLOB desktop_translations ${CMAKE_SOURCE_DIR}/translations/desktop_*.ts)
qt_add_lrelease(OpenCloudResources TS_FILES ${desktop_translations} QM_FILES_OUTPUT_VARIABLE desktop_compiled_translations)
get_target_property(_oc_qmake Qt6::qmake IMPORTED_LOCATION)
execute_process(
COMMAND "${_oc_qmake}" -query QT_INSTALL_TRANSLATIONS
OUTPUT_VARIABLE _oc_qt_translations_dir
OUTPUT_STRIP_TRAILING_WHITESPACE
)

set(qt_bundled_translations "")
foreach(_ts ${desktop_translations})
get_filename_component(_ts_name "${_ts}" NAME_WE)
string(REPLACE "desktop_" "" _lang "${_ts_name}")
foreach(_catalog qtbase qt)
set(_qm "${_oc_qt_translations_dir}/${_catalog}_${_lang}.qm")
if(EXISTS "${_qm}")
list(APPEND qt_bundled_translations "${_qm}")
endif()
endforeach()
endforeach()

add_resources_to_target(
TARGET OpenCloudResources
PREFIX translations
FILES "${desktop_compiled_translations}"
FILES ${desktop_compiled_translations} ${qt_bundled_translations}
)

ecm_add_qml_module(OpenCloudResources
Expand Down