Changeset 391

Timestamp:

Dec 5, 2009, 3:35:12 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: Re-build qmake using the .pro file to include all the fancy things like the version information and properly compress the executable.

File:

• trunk/configure.cmd (modified) (4 diffs)

trunk/configure.cmd

@@ -559 +559 @@
         G.QMAKE_EXEPACK_POST_FLAGS = ""
     end
-    /* export EXEPACK variables for building qmake (used by Makefile.os2-g++) */
-    call SetEnv "QMAKE_EXEPACK", G.QMAKE_EXEPACK
-    call SetEnv "QMAKE_EXEPACK_FLAGS", G.QMAKE_EXEPACK_FLAGS
-    call SetEnv "QMAKE_EXEPACK_POST_FLAGS", G.QMAKE_EXEPACK_POST_FLAGS
 
     /*--------------------------------------------------------------------------
@@ -796 +792 @@
     curdir = directory()
     call directory G.RelPath"\qmake"
+
     address "cmd" G.MAKE
+    make_rc = rc
+
     call directory curdir
-    make_rc = rc
 
     /* put back original qconfig.h */
@@ -1725 +1723 @@
 
     /*--------------------------------------------------------------------------
+     re-build qmake using the .pro file
+    --------------------------------------------------------------------------*/
+
+    call SaySay "Rebuilding qmake. Please wait..."
+
+    /* this is necessary to to get all the fancy things such as embedded
+     * version information */
+
+    curdir = directory()
+    call directory G.RelPath"\qmake"
+
+    /* first, generate a Makefile from .pro */
+    address "cmd" G.OutPath"\bin\qmake.exe"
+    make_rc = rc
+
+    if (make_rc == 0)  then do
+        /* now, run make */
+        address "cmd" G.MAKE "release"
+        make_rc = rc
+    end
+    call SaySay
+
+    call directory curdir
+
+    /*--------------------------------------------------------------------------
      build makefiles based on the configuration
     --------------------------------------------------------------------------*/
@@ -1736 +1759 @@
 
     /* generate the root makefile */
-    address "cmd" G.OutPath"\bin\qmake" G.RelPath"\projects.pro -o" G.OutPath"\Makefile"
+    address "cmd" G.OutPath"\bin\qmake.exe" G.RelPath"\projects.pro -o" G.OutPath"\Makefile"
     make_rc = rc
     /* exit on failure */