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
 
+    /* @todo not everything implemented yet, cry loudly... */
     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 aDir
+    rc = SysMkDir(aDir)
     if (rc \= 0) then do
-        call SayErr 'FATAL: Could not create directory '''path'''!'
+        call SayErr 'FATAL: Could not create directory '''aDir'''!'
         call SayErr 'SysMkDir returned 'rc
         call Done 1
+    end
+    return
+
+CopyDir: procedure expose (Globals)
+    parse arg aDirFrom, aDirTo
+    address 'cmd' 'xcopy',
+        FixDirNoSlash(aDirFrom) FixDirNoSlash(aDirTo)'\ /s /e 1>nul 2>nul'
+    if (rc \== 0) then do
+        call SayErr 'FATAL: Could not copy '''aDirFrom''' to '''aDirTo'''!'
+        call SayErr 'xcopy returned 'rc
+        call Done 1
+    end
+    return
+
+/**
+ * Removes the given directory @aDir and all its contents, recursively. If @a
+ * aMask is not empty, then only files matching this mask are recursively
+ * deleted in the given directory tree, but not the directories themselves.
+ *
+ * @param aDir    Directory to remove.
+ * @param aMask   Mask of files to remove.
+ */
+DeleteDir: procedure expose (Globals)
+    parse arg aDir, aMask
+    call SysFileTree aDir'\*', 'dirs.', 'DO'
+    call SysFileTree aDir'\'aMask, 'files.', 'FO'
+    do i = 1 to files.0
+        rc = SysFileDelete(files.i)
+        if (rc \= 0) then do
+            call SayErr 'FATAL: Could not remove file '''files.i'''!'
+            call SayErr 'SysFileDelete returned 'rc
+            call Done 1
+        end
+    end
+    do i = 1 to dirs.0
+        call RemoveDir dirs.i, aMask
+    end
+    if (aMask == '') then do
+        rc = SysRmDir(aDir)
+        if (rc \= 0 & rc \= 2) then do
+            call SayErr 'FATAL: Could not remove directory '''aDir'''!'
+            call SayErr 'SysRmDir returned 'rc
+            call Done 1
+        end
     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;