From d5378377c55f96d55def53dda66c5624c5ecc2e4 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com> Date: Tue, 26 Dec 2017 16:16:28 +0100 Subject: [PATCH] Moved copying of qt translations into separate install step --- zeiterfassung.pro => QtZeiterfassung.pro | 3 ++ installs.pri | 14 ++++++ installs_win32.pri | 28 ++++++++++++ {zeiterfassung/win32 => win32}/Qt.conf | 0 zeiterfassung/installs.pri | 20 --------- zeiterfassung/installs_unix.pri | 11 ++--- zeiterfassung/installs_win32.pri | 43 ------------------- .../unix/{start.sh => zeiterfassung.sh} | 0 zeiterfassung/zeiterfassung.pro | 1 - 9 files changed, 48 insertions(+), 72 deletions(-) rename zeiterfassung.pro => QtZeiterfassung.pro (83%) create mode 100644 installs.pri create mode 100644 installs_win32.pri rename {zeiterfassung/win32 => win32}/Qt.conf (100%) delete mode 100644 zeiterfassung/installs_win32.pri rename zeiterfassung/unix/{start.sh => zeiterfassung.sh} (100%) diff --git a/zeiterfassung.pro b/QtZeiterfassung.pro similarity index 83% rename from zeiterfassung.pro rename to QtZeiterfassung.pro index fed8288..17025d9 100644 --- a/zeiterfassung.pro +++ b/QtZeiterfassung.pro @@ -8,3 +8,6 @@ SUBDIRS += plugins \ plugins.depends += zeiterfassungguilib zeiterfassung.depends += zeiterfassungcorelib zeiterfassungguilib zeiterfassungguilib.depends += zeiterfassungcorelib + +include(installs.pri) +win32: include(installs_win32.pri) diff --git a/installs.pri b/installs.pri new file mode 100644 index 0000000..3a7ab5d --- /dev/null +++ b/installs.pri @@ -0,0 +1,14 @@ +qtTranslationsInstalls.path = $${OUT_PWD}/bin/translations +qtTranslationsInstalls.files = $$[QT_INSTALL_TRANSLATIONS]/qt_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtbase_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtmultimedia_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtquick1_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtscript_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_de.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtbase_de.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtmultimedia_de.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtquick1_de.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtscript_de.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm +INSTALLS += qtTranslationsInstalls diff --git a/installs_win32.pri b/installs_win32.pri new file mode 100644 index 0000000..65ce4a7 --- /dev/null +++ b/installs_win32.pri @@ -0,0 +1,28 @@ +CONFIG(debug, release|debug): DEBUG_SIGN = d + +qtLibsInstall.path = $${OUT_PWD}/bin +qtLibsInstall.files = win32/Qt.conf \ + $$[QT_INSTALL_BINS]/Qt5Core$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_BINS]/Qt5Gui$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_BINS]/Qt5Network$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_BINS]/Qt5Widgets$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll \ + $$[QT_INSTALL_BINS]/libstdc++-6.dll \ + $$[QT_INSTALL_BINS]/libwinpthread-1.dll +INSTALLS += qtLibsInstall + +qtImageFormats.path = $${OUT_PWD}/bin/plugins/imageformats +qtImageFormats.files = $$[QT_INSTALL_PLUGINS]/imageformats/qgif$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qicns$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qico$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qsvg$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qtga$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qtiff$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qwbmp$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qwebp$${DEBUG_SIGN}.dll +INSTALLS += qtImageFormats + +qtPlatformsInstall.path = $${OUT_PWD}/bin/plugins/platforms +qtPlatformsInstall.files = $$[QT_INSTALL_PLUGINS]/platforms/qwindows$${DEBUG_SIGN}.dll +INSTALLS += qtPlatformsInstall diff --git a/zeiterfassung/win32/Qt.conf b/win32/Qt.conf similarity index 100% rename from zeiterfassung/win32/Qt.conf rename to win32/Qt.conf diff --git a/zeiterfassung/installs.pri b/zeiterfassung/installs.pri index cf6320d..ec42827 100644 --- a/zeiterfassung/installs.pri +++ b/zeiterfassung/installs.pri @@ -1,23 +1,3 @@ -COMPILED_TRANSLATIONS += $$[QT_INSTALL_TRANSLATIONS]/qt_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtbase_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtmultimedia_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtquick1_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtscript_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtbase_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtmultimedia_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtquick1_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtscript_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm - -copy_compiled_translations.input = COMPILED_TRANSLATIONS -copy_compiled_translations.output = $${DESTDIR}/translations/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} -copy_compiled_translations.commands = $${QMAKE_COPY} ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -copy_compiled_translations.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += copy_compiled_translations -PRE_TARGETDEPS += compiler_copy_compiled_translations_make_all - THEMES += themes/dark_theme.qss copy_themes.input = THEMES diff --git a/zeiterfassung/installs_unix.pri b/zeiterfassung/installs_unix.pri index 6a4db79..26f2133 100644 --- a/zeiterfassung/installs_unix.pri +++ b/zeiterfassung/installs_unix.pri @@ -1,8 +1,3 @@ -SCRIPTS += unix/start.sh - -copy_scripts.input = SCRIPTS -copy_scripts.output = $${DESTDIR}/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} -copy_scripts.commands = $${QMAKE_COPY} ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -copy_scripts.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += copy_scripts -PRE_TARGETDEPS += compiler_copy_scripts_make_all +scriptsInstall.path = $${DESTDIR} +scriptsInstall.files = unix/zeiterfassung.sh +INSTALLS += scriptsInstall diff --git a/zeiterfassung/installs_win32.pri b/zeiterfassung/installs_win32.pri deleted file mode 100644 index 00fd871..0000000 --- a/zeiterfassung/installs_win32.pri +++ /dev/null @@ -1,43 +0,0 @@ -CONFIG(debug, release|debug): DEBUG_SIGN = d - -LIBRARIES += win32/Qt.conf \ - $$[QT_INSTALL_BINS]/Qt5Core$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_BINS]/Qt5Gui$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_BINS]/Qt5Network$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_BINS]/Qt5Widgets$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll \ - $$[QT_INSTALL_BINS]/libstdc++-6.dll \ - $$[QT_INSTALL_BINS]/libwinpthread-1.dll - -copy_libraries.input = LIBRARIES -copy_libraries.output = $${DESTDIR}/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} -copy_libraries.commands = $${QMAKE_COPY} ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -copy_libraries.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += copy_libraries -PRE_TARGETDEPS += compiler_copy_libraries_make_all - -IMAGE_FORMATS += $$[QT_INSTALL_PLUGINS]/imageformats/qgif$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qicns$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qico$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qsvg$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qtga$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qtiff$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qwbmp$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qwebp$${DEBUG_SIGN}.dll - -copy_image_formats.input = IMAGE_FORMATS -copy_image_formats.output = $${DESTDIR}/plugins/imageformats/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} -copy_image_formats.commands = $${QMAKE_COPY} ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -copy_image_formats.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += copy_image_formats -PRE_TARGETDEPS += compiler_copy_image_formats_make_all - -PLATFORMS += $$[QT_INSTALL_PLUGINS]/platforms/qwindows$${DEBUG_SIGN}.dll - -copy_platforms.input = PLATFORMS -copy_platforms.output = $${DESTDIR}/plugins/platforms/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} -copy_platforms.commands = $${QMAKE_COPY} ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -copy_platforms.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += copy_platforms -PRE_TARGETDEPS += compiler_copy_platforms_make_all diff --git a/zeiterfassung/unix/start.sh b/zeiterfassung/unix/zeiterfassung.sh similarity index 100% rename from zeiterfassung/unix/start.sh rename to zeiterfassung/unix/zeiterfassung.sh diff --git a/zeiterfassung/zeiterfassung.pro b/zeiterfassung/zeiterfassung.pro index 1b9a5ae..506e989 100755 --- a/zeiterfassung/zeiterfassung.pro +++ b/zeiterfassung/zeiterfassung.pro @@ -36,4 +36,3 @@ include($${PROJECT_ROOT}/lrelease.pri) include(installs.pri) unix: include(installs_unix.pri) -win32: include(installs_win32.pri)