Changeset 28

Timestamp:

Jun 11, 2009, 10:11:16 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Create mkspecs/default.

Location:

trunk

Files:

• configure.cmd (modified) (3 diffs)
• qmake/project.cpp (modified) (1 diff)

trunk/configure.cmd

@@ -652 +652 @@
     /* mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't
      * be set once configured */
-/*
-@todo
-*/
+    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 to determine the original QMAKESPEC */
+    call charout G.RelPath"\mkspecs\default\qmake.conf",,
+        G.EOL"QMAKESPEC_ORIGINAL="G.RelPath"\mkspecs\"G.PLATFORM||G.EOL
+    call charout G.RelPath"\mkspecs\default\qmake.conf"
 
     /* create temporary qconfig.h for compiling qmake, if it doesn't exist
@@ -697 +701 @@
         call Done 2
 
+
     signal Nonsense
     return
@@ -785 +790 @@
 MakeDir: procedure expose (Globals)
     /* @todo teach it to create all non-existing intermediate dirs */
-    parse arg path
-    rc = SysMkDir(path)
+    parse arg 
+    rc = SysMkDir()
     if (rc \= 0) then do
-        call SayErr 'FATAL: Could not create directory '''path'''!'
+        call SayErr 'FATAL: Could not create directory ''''''!'
         call SayErr 'SysMkDir returned 'rc
         call Done 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     end
     return

trunk/qmake/project.cpp

@@ -1668 +1668 @@
                                              : vars["QMAKESPEC_ORIGINAL"]);
         if (!spec_org.isEmpty()) {
-            spec = spec_org.at(0);
-            int lastSlash = spec.lastIndexOf('/');
-            if(lastSlash != -1)
-                spec = spec.mid(lastSlash + 1);
+            spec = QFileInfo(spec_org.at(0)).fileName();
             if((regex && re.exactMatch(spec)) || (!regex && spec == x))
                 return true;