Changeset 8 for trunk/qmake/generators

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

Location:

trunk/qmake/generators

Files:

• makefile.cpp (modified) (8 diffs)
• os2 (added)
• os2/gnumake.cpp (added)
• os2/gnumake.h (added)
• unix/unixmake.cpp (modified) (1 diff)
• win32/msvc_nmake.cpp (modified) (1 diff)

trunk/qmake/generators/makefile.cpp

@@ -61 +61 @@
 QString mkdir_p_asstring(const QString &dir)
 {
+    //@@TODO (dmik): OS/2 cannot create multiple subdirs in mkdir.
+    //@@TODO (dmik): fix it here? (mkdir a\b\c = mkdir a;a\b;a\b\c)
     QString ret =  "@$(CHK_DIR_EXISTS) \"" + dir + "\" ";
-    if(Option::target_mode == Option::TARG_WIN_MODE)
+    if(Option::target_mode == Option::TARG_WIN_MODE ||
+        Option::target_mode == Option::TARG_OS2_MODE
+    )
         ret += "$(MKDIR)";
     else
@@ -447 +451 @@
             } else {
                 if((Option::target_mode == Option::TARG_MAC9_MODE && inc.find(':')) ||
-                   (Option::target_mode == Option::TARG_WIN_MODE && inc[1] != ':') ||
+                   ((Option::target_mode == Option::TARG_WIN_MODE ||
+                     Option::target_mode == Option::TARG_OS2_MODE) && inc[1] != ':') ||
                    ((Option::target_mode == Option::TARG_UNIX_MODE ||
                      Option::target_mode == Option::TARG_QNX6_MODE ||
@@ -667 +672 @@
                     path = path.right(path.length() - 1);
                 }
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
                 bool driveExists = TRUE;
                 if ( !QDir::isRelativePath( path ) ) {
@@ -694 +699 @@
                         }
                     }
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
                 }
 #endif
@@ -1884 +1889 @@
                         uninst.append("\n\t");
                     uninst.append(
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
                     QString("-$(DEL_FILE)")
 #else
@@ -1901 +1906 @@
                         uninst.append("\n\t");
                     uninst.append(
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
                         QString("-$(DEL_FILE)")
 #else
@@ -2449 +2454 @@
 #include "borland_bmake.h"
 #include "mingw_make.h"
+#include "gnumake.h"
 #include "msvc_dsp.h"
 #include "msvc_vcproj.h"
@@ -2484 +2490 @@
     } else if(gen == "MINGW") {
         mkfile = new MingwMakefileGenerator(proj);
+    } else if(gen == "GNUMAKE") {
+        mkfile = new GNUMakefileGenerator(proj);
     } else if(gen == "METROWERKS") {
         mkfile = new MetrowerksMakefileGenerator(proj);

trunk/qmake/generators/unix/unixmake.cpp

@@ -857 +857 @@
             for(QStringList::Iterator it = links.begin(); it != links.end(); it++) {
                 if(Option::target_mode == Option::TARG_WIN_MODE ||
+                   Option::target_mode == Option::TARG_OS2_MODE ||
                    Option::target_mode == Option::TARG_MAC9_MODE) {
                 } else if(Option::target_mode == Option::TARG_UNIX_MODE ||

trunk/qmake/generators/win32/msvc_nmake.cpp

@@ -81 +81 @@
 {
     QStringList &aList = MakefileGenerator::findDependencies(file);
-    // Note: The QMAKE_IMAGE_COLLECTION file have all images
-    // as dependency, so don't add precompiled header then
-    if (file == project->first("QMAKE_IMAGE_COLLECTION"))
-        return aList;
-    for(QStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {
-        if(file.endsWith(*it)) {
-            if(!aList.contains(precompH))
-                aList += precompH;
-            break;
-        }
+    // [dmik] this method can be called from MakefileGenerator::init() before
+    // precompH is set in NmakeMakefileGenerator::init(), so we check it
+    // to avoid appending of NULL string to the list of dependencies
+    if (!precompH.isNull()) {
+        // Note: The QMAKE_IMAGE_COLLECTION file have all images
+        // as dependency, so don't add precompiled header then
+        if (file == project->first("QMAKE_IMAGE_COLLECTION"))
+            return aList;
+        for(QStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {
+            if(file.endsWith(*it)) {
+                if(!aList.contains(precompH))
+                    aList += precompH;
+                break;
+            }
+        }
     }
     return aList;