qmake|Windows: Write built binaries directly to "distrib/products"

Now DESTDIR and DLLDESTDIR are used to write all built binaries directly to the distrib folder. This cuts down on the time needed for running the install target. Installing remains necessary, though, as it copies all the supporting files. windeployqt is now run by postbuild, making it unnecessary to manually copy any Qt libraries to the distrib folder.
skyjake · Aug 1, 2014 · 6394864 · 6394864
1 parent 2bf3dea
commit 6394864
Show file tree

Hide file tree

Showing 33 changed files with 88 additions and 129 deletions.
diff --git a/doomsday/build/build.pro b/doomsday/build/build.pro
@@ -24,6 +24,14 @@ QMAKE_STRIP = true
     runPython2InDir($$PWD/scripts/, packres.py --quiet \"$$OUT_PWD/..\")
 }
 
+# Create the output directories on Windows.
+win32 {
+    mkpath($$DENG_WIN_PRODUCTS_DIR)
+    mkpath($$DENG_BIN_DIR)
+    mkpath($$DENG_LIB_DIR)
+    mkpath($$DENG_PLUGIN_LIB_DIR)
+}
+
 # Install the launcher.
 !deng_sdk:deng_snowberry {
     SB_ROOT = ../../snowberry

diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
@@ -850,12 +850,12 @@ macx {
 DENG_PACKAGES += net.dengine.client.pack
 
 deployPackages($$DENG_PACKAGES, $$OUT_PWD/..)
+deployTarget()
 
 !macx {
     # Common (non-Mac) parts of the installation.
-    INSTALLS += target data startupfonts
+    INSTALLS += data startupfonts
 
-    target.path       = $$DENG_BIN_DIR
     data.path         = $$DENG_DATA_DIR
     startupfonts.path = $$DENG_DATA_DIR/fonts
 

diff --git a/doomsday/dep_core.pri b/doomsday/dep_core.pri
@@ -27,7 +27,7 @@ win32: defineReplace(qtLibraryFile) {
 deng_debug: qtver = d$$QT_MAJOR_VERSION
 else:       qtver = $$QT_MAJOR_VERSION
 
-win32 {
+win32:!greaterThan(QT_MAJOR_VERSION, 4) {
     # Install the required Qt DLLs into the products dir.
     INSTALLS *= qtlibs qtplugins
     qtlibs.files += \

diff --git a/doomsday/libappfw/libappfw.pro b/doomsday/libappfw/libappfw.pro
@@ -256,12 +256,5 @@ macx {
     doPostLink("mkdir -p ../client/Doomsday.app/Contents/Frameworks")
     doPostLink("cp -fRp libdeng_appfw*dylib ../client/Doomsday.app/Contents/Frameworks")
 }
-else {
-    INSTALLS += target
-    target.path = $$DENG_LIB_DIR
-}
 
-deng_sdk {
-    INSTALLS *= target
-    target.path = $$DENG_SDK_LIB_DIR
-}
+deployLibrary()
diff --git a/doomsday/libcore/libcore.pro b/doomsday/libcore/libcore.pro
@@ -197,13 +197,9 @@ macx {
     doPostLink("cp -fRp libdeng_core*dylib ../client/Doomsday.app/Contents/Frameworks")
 }
 
-!macx {
-    INSTALLS += target
-    target.path = $$DENG_LIB_DIR
-}
+deployLibrary()
 
 deng_sdk {
-    INSTALLS *= target scripts
-    target.path = $$DENG_SDK_LIB_DIR
+    INSTALLS *= scripts
     scripts.path = $$DENG_SDK_DIR/modules
 }
diff --git a/doomsday/libdoomsday/libdoomsday.pro b/doomsday/libdoomsday/libdoomsday.pro
@@ -150,7 +150,5 @@ macx {
     doPostLink("mkdir -p ../client/Doomsday.app/Contents/Frameworks")
     doPostLink("cp -fRp libdeng_doomsday*dylib ../client/Doomsday.app/Contents/Frameworks")
 }
-else {
-    INSTALLS += target
-    target.path = $$DENG_LIB_DIR
-}
+
+deployLibrary()
diff --git a/doomsday/libgui/libgui.pro b/doomsday/libgui/libgui.pro
@@ -228,13 +228,10 @@ macx {
     doPostLink("install_name_tool -id @rpath/libassimp.3.dylib libassimp.3.dylib")
     linkBinaryToBundledAssimp(libdeng_gui.1.dylib, ..)
 }
-else {
-    INSTALLS += target
-    target.path = $$DENG_LIB_DIR
-}
+
+deployLibrary()
 
 deng_sdk {
-    INSTALLS *= target scripts
-    target.path = $$DENG_SDK_LIB_DIR
+    INSTALLS *= scripts
     scripts.path = $$DENG_SDK_DIR/modules
 }
diff --git a/doomsday/liblegacy/liblegacy.pro b/doomsday/liblegacy/liblegacy.pro
@@ -134,7 +134,5 @@ macx {
     doPostLink("mkdir -p ../client/Doomsday.app/Contents/Frameworks")
     doPostLink("cp -fRp libdeng_legacy*dylib ../client/Doomsday.app/Contents/Frameworks")
 }
-else {
-    INSTALLS += target
-    target.path = $$DENG_LIB_DIR
-}
+
+deployLibrary()
diff --git a/doomsday/libshell/libshell.pro b/doomsday/libshell/libshell.pro
@@ -115,12 +115,5 @@ macx {
     doPostLink("mkdir -p ../client/Doomsday.app/Contents/Frameworks")
     doPostLink("cp -fRp libdeng_shell*dylib ../client/Doomsday.app/Contents/Frameworks")
 }
-else {
-    INSTALLS += target
-    target.path = $$DENG_LIB_DIR
-}
 
-deng_sdk {
-    INSTALLS *= target
-    target.path = $$DENG_SDK_LIB_DIR
-}
+deployLibrary()
diff --git a/doomsday/macros.pri b/doomsday/macros.pri
@@ -70,6 +70,37 @@ defineTest(doPostLink) {
     export(QMAKE_POST_LINK)
 }
 
+defineTest(deployTarget) {
+    unix:!macx {
+        INSTALLS += target
+        target.path = $$DENG_BIN_DIR
+        export(INSTALLS)
+        export(target.path)
+    }
+    else:win32 {
+        DESTDIR = $$DENG_BIN_DIR
+        export(DESTDIR)
+    }
+}
+
+defineTest(deployLibrary) {
+    win32 {
+        DLLDESTDIR = $$DENG_LIB_DIR
+        export(DLLDESTDIR)
+    }
+    unix:!macx {
+        INSTALLS += target
+        target.path = $$DENG_LIB_DIR
+        export(target.path)
+    }
+    deng_sdk {
+        INSTALLS *= target
+        target.path = $$DENG_SDK_LIB_DIR
+        export(target.path)
+    }
+    export(INSTALLS)
+}
+
 macx {
     defineTest(removeQtLibPrefix) {
         doPostLink("install_name_tool -change $$[QT_INSTALL_LIBS]/$$2 $$2 $$1")

diff --git a/doomsday/plugins/config_plugin.pri b/doomsday/plugins/config_plugin.pri
@@ -11,9 +11,16 @@ macx {
     CONFIG += lib_bundle
     QMAKE_BUNDLE_EXTENSION = .bundle
 }
+unix:!macx {
+    INSTALLS += target
+    target.path = $$DENG_PLUGIN_LIB_DIR
+}
 win32 {
     # Keep the version number out of the file name.
     TARGET_EXT = .dll
+
+    # Deploy plugin DLLs to the plugins folder.
+    DLLDESTDIR = $$DENG_PLUGIN_LIB_DIR
 }
 
 INCLUDEPATH += $$DENG_API_DIR

diff --git a/doomsday/plugins/dehread/dehread.pro b/doomsday/plugins/dehread/dehread.pro
@@ -38,11 +38,6 @@ win32 {
     RC_FILE = res/dehread.rc
 }
 
-!macx {
-    INSTALLS += target
-    target.path = $$DENG_PLUGIN_LIB_DIR
-}
-
 macx {
     fixPluginInstallId($$TARGET, 2)
     linkToBundledLibcore    ($$TARGET)

diff --git a/doomsday/plugins/directsound/directsound.pro b/doomsday/plugins/directsound/directsound.pro
@@ -21,6 +21,3 @@ SOURCES += src/driver_directsound.cpp
 RC_FILE = res/directsound.rc
 QMAKE_LFLAGS += /DEF:\"$$PWD/api/dsdirectsound.def\"
 OTHER_FILES += api/dsdirectsound.def
-
-INSTALLS += target
-target.path = $$DENG_PLUGIN_LIB_DIR
diff --git a/doomsday/plugins/doom/doom.pro b/doomsday/plugins/doom/doom.pro
@@ -17,13 +17,10 @@ gamedata.files = $$OUT_PWD/../../libdoom.pk3
 
 macx {
     gamedata.path = Contents/Resources
-
     QMAKE_BUNDLE_DATA += gamedata
 }
 else {
-    INSTALLS += target gamedata
-
-    target.path = $$DENG_PLUGIN_LIB_DIR
+    INSTALLS += gamedata
     gamedata.path = $$DENG_DATA_DIR/jdoom
 }
 

diff --git a/doomsday/plugins/doom64/doom64.pro b/doomsday/plugins/doom64/doom64.pro
@@ -17,13 +17,10 @@ gamedata.files = $$OUT_PWD/../../libdoom64.pk3
 
 macx {
     gamedata.path = Contents/Resources
-
     QMAKE_BUNDLE_DATA += gamedata
 }
 else {
-    INSTALLS += target gamedata
-
-    target.path = $$DENG_PLUGIN_LIB_DIR
+    INSTALLS += gamedata
     gamedata.path = $$DENG_DATA_DIR/jdoom64
 }
 

diff --git a/doomsday/plugins/example/example.pro b/doomsday/plugins/example/example.pro
@@ -28,11 +28,6 @@ win32 {
         $$RC_FILE
 }
 
-!macx {
-    INSTALLS += target
-    target.path = $$DENG_PLUGIN_LIB_DIR
-}
-
 macx {
     fixPluginInstallId($$TARGET, 1)
     linkToBundledLiblegacy($$TARGET)

diff --git a/doomsday/plugins/fluidsynth/fluidsynth.pro b/doomsday/plugins/fluidsynth/fluidsynth.pro
@@ -22,19 +22,12 @@ win32 {
 
     QMAKE_LFLAGS += /DEF:\"$$PWD/api/dsfluidsynth.def\"
     OTHER_FILES += api/dsfluidsynth.def
-
-    INSTALLS += target
-    target.path = $$DENG_PLUGIN_LIB_DIR
 }
 macx {
     fixPluginInstallId($$TARGET, 1)
     linkToBundledLibcore($$TARGET)
     linkToBundledLiblegacy($$TARGET)
 }
-unix:!macx {
-    INSTALLS += target
-    target.path = $$DENG_PLUGIN_LIB_DIR
-}
 
 INCLUDEPATH += include
 

diff --git a/doomsday/plugins/fmod/fmod.pro b/doomsday/plugins/fmod/fmod.pro
@@ -38,18 +38,11 @@ win32 {
 
     QMAKE_LFLAGS += /DEF:\"$$PWD/api/dsfmod.def\"
     OTHER_FILES += api/dsfmod.def
-
-    INSTALLS += target
-    target.path = $$DENG_PLUGIN_LIB_DIR
 }
 else:macx {
     fixPluginInstallId($$TARGET, 1)
     doPostLink("install_name_tool -change ./libfmodex.dylib @rpath/libfmodex.dylib audio_fmod.bundle/audio_fmod")
 }
-else {
-    INSTALLS += target
-    target.path = $$DENG_PLUGIN_LIB_DIR
-}
 
 macx {
     linkToBundledLibcore(audio_fmod)

diff --git a/doomsday/plugins/heretic/heretic.pro b/doomsday/plugins/heretic/heretic.pro
@@ -17,13 +17,10 @@ gamedata.files = $$OUT_PWD/../../libheretic.pk3
 
 macx {
     gamedata.path = Contents/Resources
-
     QMAKE_BUNDLE_DATA += gamedata
 }
 else {
-    INSTALLS += target gamedata
-
-    target.path = $$DENG_PLUGIN_LIB_DIR
+    INSTALLS += gamedata
     gamedata.path = $$DENG_DATA_DIR/jheretic
 }
 

diff --git a/doomsday/plugins/hexen/hexen.pro b/doomsday/plugins/hexen/hexen.pro
@@ -17,13 +17,10 @@ gamedata.files = $$OUT_PWD/../../libhexen.pk3
 
 macx {
     gamedata.path = Contents/Resources
-
     QMAKE_BUNDLE_DATA += gamedata
 }
 else {
-    INSTALLS += target gamedata
-
-    target.path = $$DENG_PLUGIN_LIB_DIR
+    INSTALLS += gamedata
     gamedata.path = $$DENG_DATA_DIR/jhexen
 }
 

diff --git a/doomsday/plugins/idtech1converter/idtech1converter.pro b/doomsday/plugins/idtech1converter/idtech1converter.pro
@@ -34,11 +34,6 @@ win32 {
     OTHER_FILES += api/dpidtech1converter.def
 }
 
-!macx {
-    INSTALLS += target
-    target.path = $$DENG_PLUGIN_LIB_DIR
-}
-
 macx {
     fixPluginInstallId($$TARGET, 1)
     linkToBundledLibcore($$TARGET)

diff --git a/doomsday/plugins/openal/openal.pro b/doomsday/plugins/openal/openal.pro
@@ -24,11 +24,6 @@ win32 {
     OTHER_FILES += api/dsopenal.def
 }
 
-!macx {
-    INSTALLS += target
-    target.path = $$DENG_PLUGIN_LIB_DIR
-}
-
 macx {
     linkToBundledLibcore(audio_openal)
     linkToBundledLiblegacy(audio_openal)

diff --git a/doomsday/plugins/savegameconverter/savegameconverter.pro b/doomsday/plugins/savegameconverter/savegameconverter.pro
@@ -29,11 +29,6 @@ win32 {
     RC_FILE = res/savegameconverter.rc
 }
 
-!macx {
-    INSTALLS += target
-    target.path = $$DENG_PLUGIN_LIB_DIR
-}
-
 macx {
     fixPluginInstallId($$TARGET, 1)
     linkToBundledLibcore($$TARGET)

diff --git a/doomsday/plugins/winmm/winmm.pro b/doomsday/plugins/winmm/winmm.pro
@@ -32,6 +32,3 @@ LIBS += -lwinmm
 deng_msvc:  QMAKE_LFLAGS += /DEF:\"$$PWD/api/dswinmm.def\"
 deng_mingw: QMAKE_LFLAGS += --def \"$$PWD/api/dswinmm.def\"
 OTHER_FILES += api/dswinmm.def
-
-INSTALLS += target
-target.path = $$DENG_PLUGIN_LIB_DIR
diff --git a/doomsday/postbuild/postbuild.pro b/doomsday/postbuild/postbuild.pro
@@ -19,4 +19,11 @@ macx {
         "cd \"$$OUT_PWD/..\" && sh \"$$PWD/bundleapp.sh\" \"$$PWD/..\""
 }
 
+win32 {
+    QMAKE_EXTRA_TARGETS += qtdeploy
+
+    qtdeploy.target = FORCE
+    qtdeploy.commands = "windeployqt \"$$DENG_BIN_DIR\Doomsday.exe\""
+}
+
 OTHER_FILES = bundleapp.sh
diff --git a/doomsday/server/server.pro b/doomsday/server/server.pro
@@ -415,12 +415,12 @@ macx {
 
 # Installation ---------------------------------------------------------------
 
+deployTarget()
+
 !macx {
     # Common (non-Mac) parts of the installation.
-    INSTALLS += target data
-
-    target.path = $$DENG_BIN_DIR
-    data.path   = $$DENG_DATA_DIR
+    INSTALLS += data
+    data.path = $$DENG_DATA_DIR
 
     win32 {
         # Windows-specific installation.

diff --git a/doomsday/tests/config_test.pri b/doomsday/tests/config_test.pri
@@ -28,8 +28,7 @@ else:win32 {
 
     target.path = $$DENG_BIN_DIR
 
-    defineTest(deployTest) {
-        INSTALLS += target
+    defineTest(deployTest) {        
         deployPackages($$DENG_PACKAGES, $$OUT_PWD/../..)
         export(INSTALLS)
         export(dengPacks.files)
@@ -40,10 +39,11 @@ else {
     target.path = $$DENG_BIN_DIR
 
     defineTest(deployTest) {
-        INSTALLS += target
         deployPackages(DENG_PACKAGES, $$OUT_PWD/../..)
         export(INSTALLS)
         export(dengPacks.files)
         export(dengPacks.path)
     }
 }
+
+deployTarget()