Changeset 313

Timestamp:

Nov 10, 2009, 10:54:30 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Added 'exepack' CONFIG option that adds an additional link step to pack generated executables and DLLs. 'exepack' is enabled by default for release builds if lixlite.cmd or lxlite.exe is present in PATH during configure.cmd invocation.

Location:

trunk

Files:

• configure.cmd (modified) (6 diffs)
• mkspecs/features/os2/default_pre.prf (modified) (1 diff)
• mkspecs/features/os2/exepack.prf (added)

trunk/configure.cmd

@@ -316 +316 @@
     G.QT_NAMESPACE = ""
 
+    /* variables that override ones in qmake.conf */
+    G.QMAKE_EXEPACK = ""
+    G.QMAKE_EXEPACK_FLAGS = ""
+    G.QMAKE_EXEPACK_POST_FLAGS = ""
+
     /* flags for SQL drivers */
     G.QT_CFLAGS_PSQL = ""
@@ -518 +523 @@
     if (wordpos("libs", G.CFG_BUILD_PARTS) == 0) then
         G.CFG_BUILD_PARTS = Join(G.CFG_BUILD_PARTS, "libs")
+
+    /* detect the exepack program */
+    if (G.QMAKE_EXEPACK == "") then
+        G.QMAKE_EXEPACK = SysSearchPath('PATH', 'lxlite.cmd')
+    if (G.QMAKE_EXEPACK == "") then
+        G.QMAKE_EXEPACK = SysSearchPath('PATH', 'lxlite.exe')
+    if (G.QMAKE_EXEPACK \== "") then do
+        G.QMAKE_EXEPACK = "lxlite" /* try to be smart and rely on PATH */
+        G.QMAKE_EXEPACK_FLAGS = "/B- /L- /CS"
+        G.QMAKE_EXEPACK_POST_FLAGS = ""
+    end
 
     /*--------------------------------------------------------------------------
@@ -1394 +1410 @@
 
     call charout qconfig_pri_new,,
-'#configuration'G.EOL||,
+'# configuration'G.EOL||,
 'CONFIG += 'G.QTCONFIG_CONFIG||G.EOL||,
 'QT_ARCH = 'G.CFG_ARCH||G.EOL||,
@@ -1400 +1416 @@
 'QT_CONFIG += 'G.QT_CONFIG||G.EOL||,
 ''G.EOL||,
-'#versioning'G.EOL||,
+'# versioning'G.EOL||,
 'QT_VERSION = 'G.QT_VERSION||G.EOL||,
 'QT_MAJOR_VERSION = 'G.QT_MAJOR_VERSION||G.EOL||,
@@ -1406 +1422 @@
 'QT_PATCH_VERSION = 'G.QT_PATCH_VERSION||G.EOL||,
 ''G.EOL||,
-'#namespaces'G.EOL||,
+'# namespaces'G.EOL||,
 'QT_LIBINFIX = 'G.QT_LIBINFIX||G.EOL||,
 'QT_NAMESPACE = 'G.QT_NAMESPACE||G.EOL||,
-''G.EOL
+''G.EOL||,
+'# qmake.conf overrides'G.EOL
+
+    if (G.QMAKE_EXEPACK \== '') then do
+        call charout qconfig_pri_new,,
+'QMAKE_EXEPACK = 'G.QMAKE_EXEPACK||G.EOL||,
+'QMAKE_EXEPACK_FLAGS = 'G.QMAKE_EXEPACK_FLAGS||G.EOL||,
+'QMAKE_EXEPACK_POST_FLAGS = 'G.QMAKE_EXEPACK_POST_FLAGS||G.EOL
+    end
+
+    call charout qconfig_pri_new, G.EOL
 
     /* close the file */
@@ -1632 +1658 @@
     if (G.CFG_PTMALLOC \== "no") then
         call SaySay "Use ptmalloc ........ "G.CFG_PTMALLOC
+
+    if (G.QMAKE_EXEPACK \== "") then
+        call SaySay "Exepack support ..... yes ("G.QMAKE_EXEPACK")"
+    else
+        call SaySay "Exepack support ..... no"
 
     /* complain about not being able to use dynamic plugins if we are using a static build */

trunk/mkspecs/features/os2/default_pre.prf

@@ -1 +1 @@
 load(default_pre)
+
+!isEmpty(QMAKE_EXEPACK):CONFIG *= exepack
 
 #