Changeset 975

Timestamp:

Aug 12, 2011, 4:57:25 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: configure.cmd: Simplify mkspecs/default creation.

After r974, it's actually enough to keep only a dummy qmake.conf
file there that includes the original one. All other will be taken from
the original dir thanks to QMAKESPEC_ORIGINAL.

File:

• trunk/configure.cmd (modified) (1 diff)

trunk/configure.cmd

@@ -927 +927 @@
     /* mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't
      * be set once configured */
-    call DeleteDir G.RelPath"\mkspecs\default"
-    call CopyDir G.RelPath"\mkspecs\"G.PLATFORM, G.RelPath"\mkspecs\default"
-    /* fix qmake.conf by appending the location of the original to it; this is
-     * used by qmake/project.cpp (as well as by Qt Creator) to determine the
-     * original QMAKESPEC */
-    call charout G.RelPath"\mkspecs\default\qmake.conf",,
-        G.EOL"QMAKESPEC_ORIGINAL="||CPPPath("..\")||G.PLATFORM||G.EOL
-    call charout G.RelPath"\mkspecs\default\qmake.conf"
+    call DeleteDir G.OutPath"\mkspecs\default"
+    call MakeDir G.OutPath"\mkspecs\default"
+    /* create a dummy qmake.spec file that will include the original one and
+     * set QMAKESPEC_ORIGINAL so that qmake & make know where to find stuff */
+    call charout G.OutPath"\mkspecs\default\qmake.conf",,
+        "include("""||CPPPath("..\")||G.PLATFORM"\\qmake.conf"")"||G.EOL||G.EOL||,
+        "QMAKESPEC_ORIGINAL="||CPPPath("..\")||G.PLATFORM||G.EOL
+    call charout G.OutPath"\mkspecs\default\qmake.conf"
 
     /* create temporary qconfig.h for compiling qmake, if it doesn't exist