From c6e18b856531a600651e5c83b14095eceda2b622 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 25 Oct 2015 18:09:24 +0200 Subject: [PATCH] No need anymore run qmake twice. --HG-- branch : develop --- scripts/make_install.bat | 6 ------ src/app/valentina/valentina.pro | 17 ++++++----------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/scripts/make_install.bat b/scripts/make_install.bat index bf41da6cc..cd0b1cc79 100644 --- a/scripts/make_install.bat +++ b/scripts/make_install.bat @@ -25,12 +25,6 @@ IF ERRORLEVEL 0 GOTO MAKE :MAKE mingw32-make -j%NUMBER_OF_PROCESSORS% IF ERRORLEVEL 1 GOTO ERRORMAKE -IF ERRORLEVEL 0 GOTO QMAKE2 - -:QMAKE2 -rem Run second time because first time qmake didn't find all files. They will be available only after build. -qmake -r ..\Valentina.pro -IF ERRORLEVEL 1 GOTO ERRORQMAKE2 IF ERRORLEVEL 0 GOTO MAKEINSTALL :MAKEINSTALL diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 1a2c031f7..cb90801e7 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -1919,14 +1919,15 @@ win32:*-g++ { $$PWD/../../../dist/win/curl.exe } + package.CONFIG = no_check_exist INSTALLS += package package_tables.path = $${OUT_PWD}/../../../package/valentina/tables/standard - package_tables.files += $${OUT_PWD}/$${DESTDIR}/tables/standard/GOST_man_ru.vst + package_tables.files += $$INSTALL_STANDARD_MEASHUREMENTS INSTALLS += package_tables package_templates.path = $${OUT_PWD}/../../../package/valentina/tables/templates - package_templates.files += $${OUT_PWD}/../tape/$${DESTDIR}/tables/templates/template_all_measurements.vit + package_templates.files += $$INSTALL_STANDARD_TEMPLATES INSTALLS += package_templates package_translations.path = $${OUT_PWD}/../../../package/valentina/translations @@ -1947,6 +1948,7 @@ win32:*-g++ { $$[QT_INSTALL_TRANSLATIONS]/qt_da.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_de.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_es.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_en.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_fa.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_fi.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_fr.qm \ @@ -1957,15 +1959,8 @@ win32:*-g++ { $$[QT_INSTALL_TRANSLATIONS]/qt_ja.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_ko.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_lt.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_uk.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_ca.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_cs.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_hu.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_it.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_ja.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_ru.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_sk.qm + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_*.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtbase_*.qm INSTALLS += package_translations package_bearer.path = $${OUT_PWD}/../../../package/valentina/bearer