aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No need anymore run qmake twice.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-10-25 18:09:24 +02:00
parent c3aba113a2
commit c6e18b8565
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/make_install.bat
View File

@ -25,12 +25,6 @@ IF ERRORLEVEL 0 GOTO MAKE
:MAKE :MAKE
mingw32-make -j%NUMBER_OF_PROCESSORS% mingw32-make -j%NUMBER_OF_PROCESSORS%
IF ERRORLEVEL 1 GOTO ERRORMAKE 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 IF ERRORLEVEL 0 GOTO MAKEINSTALL
:MAKEINSTALL :MAKEINSTALL

17
src/app/valentina/valentina.pro
View File

@ -1919,14 +1919,15 @@ win32:*-g++ {
$$PWD/../../../dist/win/curl.exe $$PWD/../../../dist/win/curl.exe
} }
package.CONFIG = no_check_exist
INSTALLS += package INSTALLS += package
package_tables.path = $${OUT_PWD}/../../../package/valentina/tables/standard 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 INSTALLS += package_tables
package_templates.path = $${OUT_PWD}/../../../package/valentina/tables/templates 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 INSTALLS += package_templates
package_translations.path = $${OUT_PWD}/../../../package/valentina/translations package_translations.path = $${OUT_PWD}/../../../package/valentina/translations
@ -1947,6 +1948,7 @@ win32:*-g++ {
$$[QT_INSTALL_TRANSLATIONS]/qt_da.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_da.qm \
$$[QT_INSTALL_TRANSLATIONS]/qt_de.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_de.qm \
$$[QT_INSTALL_TRANSLATIONS]/qt_es.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_es.qm \
$$[QT_INSTALL_TRANSLATIONS]/qt_en.qm \
$$[QT_INSTALL_TRANSLATIONS]/qt_fa.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_fa.qm \
$$[QT_INSTALL_TRANSLATIONS]/qt_fi.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_fi.qm \
$$[QT_INSTALL_TRANSLATIONS]/qt_fr.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_fr.qm \
@ -1957,15 +1959,8 @@ win32:*-g++ {
$$[QT_INSTALL_TRANSLATIONS]/qt_ja.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_ja.qm \
$$[QT_INSTALL_TRANSLATIONS]/qt_ko.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_ko.qm \
$$[QT_INSTALL_TRANSLATIONS]/qt_lt.qm \ $$[QT_INSTALL_TRANSLATIONS]/qt_lt.qm \
$$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_uk.qm \ $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_*.qm \
$$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_ca.qm \ $$[QT_INSTALL_TRANSLATIONS]/qtbase_*.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
INSTALLS += package_translations INSTALLS += package_translations
package_bearer.path = $${OUT_PWD}/../../../package/valentina/bearer package_bearer.path = $${OUT_PWD}/../../../package/valentina/bearer