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

Fixed broken copy after link on Windows.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2014-11-13 18:03:34 +02:00
parent 435fd166f6
commit 776d8be8bb
2 changed files with 140 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Valentina.pri
View File

@ -27,6 +27,8 @@ defineTest(copyToDestdir) {
DDIR = $$2 DDIR = $$2
mkpath($$DDIR) mkpath($$DDIR)
message("----------------------------------------------begin------------------------------------------------")
message("Copy to" $$DDIR "after link")
for(FILE, files) { for(FILE, files) {
# Replace slashes in paths with backslashes for Windows # Replace slashes in paths with backslashes for Windows
@ -35,9 +37,11 @@ defineTest(copyToDestdir) {
DDIR ~= s,/,\\,g DDIR ~= s,/,\\,g
} }
QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t) QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)
message("Command:" $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t))
} }
export(QMAKE_POST_LINK) export(QMAKE_POST_LINK)
message("----------------------------------------------end---------------------------------------------------")
} }
# We use precompiled headers for more fast compilation source code. # We use precompiled headers for more fast compilation source code.

21
src/app/app.pro
View File

@ -182,17 +182,9 @@ message(Examples: $$[QT_INSTALL_EXAMPLES])
# Path to recource file. # Path to recource file.
win32:RC_FILE = share/resources/valentina.rc win32:RC_FILE = share/resources/valentina.rc
# Set "make install" command for Unix-like systems.
unix{
isEmpty(PREFIX){
PREFIX = $$DEFAULT_PREFIX
}
# Keep path to all files with standard measurements we support right now # Keep path to all files with standard measurements we support right now
INSTALL_STANDARD_MEASHUREMENTS += share/resources/tables/standard/GOST_man_ru.vst INSTALL_STANDARD_MEASHUREMENTS += share/resources/tables/standard/GOST_man_ru.vst
# Prefix for binary file.
unix:!macx{
# Add to this variable all translation files that you want install with program. # Add to this variable all translation files that you want install with program.
# For generation *.qm file first you need create *.ts. See section TRANSLATIONS. # For generation *.qm file first you need create *.ts. See section TRANSLATIONS.
INSTALL_TRANSLATIONS += \ INSTALL_TRANSLATIONS += \
@ -205,8 +197,14 @@ unix:!macx{
share/translations/valentina_it_IT.qm \ share/translations/valentina_it_IT.qm \
share/translations/valentina_nl_NL.qm share/translations/valentina_nl_NL.qm
# Set "make install" command for Unix-like systems.
unix{
# Prefix for binary file.
isEmpty(PREFIX){
PREFIX = $$DEFAULT_PREFIX
}
unix:!macx{
DATADIR =$$PREFIX/share DATADIR =$$PREFIX/share
DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\" DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
@ -236,7 +234,6 @@ unix:!macx{
translations \ translations \
standard standard
} }
}
macx{ macx{
# Some macx stuff # Some macx stuff
QMAKE_MAC_SDK = macosx QMAKE_MAC_SDK = macosx
@ -328,8 +325,7 @@ macx{
QMAKE_BUNDLE_DATA += \ QMAKE_BUNDLE_DATA += \
standard \ standard \
frameworks frameworks
}
} }
# Run generation *.qm file for available *.ts files each time you run qmake. # Run generation *.qm file for available *.ts files each time you run qmake.
@ -344,6 +340,7 @@ macx{
for(DIR, INSTALL_TRANSLATIONS) { for(DIR, INSTALL_TRANSLATIONS) {
#add these absolute paths to a variable which #add these absolute paths to a variable which
#ends up as 'mkcommands = path1 path2 path3 ...' #ends up as 'mkcommands = path1 path2 path3 ...'
tr_path += $${PWD}/$$DIR tr_path += $${PWD}/$$DIR
} }