Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bundle qtbase translations with macOS and AppImage releases

Browse Source
This commit is contained in:
Janek Bevendorff 2017-12-21 19:12:51 +01:00
parent c579736158
commit a4cf32dce0
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -40,6 +40,7 @@ RUN set -x \
qt${QT5_VERSION}base \ qt${QT5_VERSION}base \
qt${QT5_VERSION}tools \ qt${QT5_VERSION}tools \
qt${QT5_VERSION}x11extras \ qt${QT5_VERSION}x11extras \
qt${QT5_VERSION}translations \
zlib1g-dev \ zlib1g-dev \
libxi-dev \ libxi-dev \
libxtst-dev \ libxtst-dev \

3
release-tool
View File

@ -678,7 +678,8 @@ build() {
"$DOCKER_IMAGE" \ "$DOCKER_IMAGE" \
bash -c "cd /keepassxc/out/build-release && \ bash -c "cd /keepassxc/out/build-release && \
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \ cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \
-DCMAKE_INSTALL_PREFIX=\"${INSTALL_PREFIX}\" /keepassxc/src && \ -DCMAKE_INSTALL_PREFIX=\"${INSTALL_PREFIX}\" \
-DKEEPASSXC_DIST_TYPE=AppImage /keepassxc/src && \
make $MAKE_OPTIONS && make DESTDIR=/keepassxc/out/bin-release install/strip && \ make $MAKE_OPTIONS && make DESTDIR=/keepassxc/out/bin-release install/strip && \
/keepassxc/src/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME"" /keepassxc/src/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME""

5
share/translations/CMakeLists.txt
View File

@ -24,6 +24,11 @@ qt5_add_translation(QM_FILES ${TRANSLATION_FILES})
if(MINGW) if(MINGW)
file(GLOB QTBASE_TRANSLATIONS ${Qt5_DIR}/../../../share/qt5/translations/qtbase_*.qm) file(GLOB QTBASE_TRANSLATIONS ${Qt5_DIR}/../../../share/qt5/translations/qtbase_*.qm)
elseif(APPLE OR KEEPASSXC_DIST_APPIMAGE)
file(GLOB QTBASE_TRANSLATIONS
/usr/share/qt/translations/qtbase_*.qm
/usr/share/qt5/translations/qtbase_*.qm
${Qt5_DIR}/../../../translations/qtbase_*.qm)
endif() endif()
set(QM_FILES ${QM_FILES} ${QTBASE_TRANSLATIONS}) set(QM_FILES ${QM_FILES} ${QTBASE_TRANSLATIONS})