Changeset 29 for trunk/qmake/generators

Timestamp:

Jun 12, 2009, 1:32:11 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: More OS/2-specific fixes. Enabled GNUMakefileGenerator (turned on by MAKEFILE_GENERATOR=GNUMAKE).

Location:

trunk/qmake/generators

Files:

• makefile.cpp (modified) (4 diffs)
• makefile.h (modified) (1 diff)
• metamakefile.cpp (modified) (2 diffs)
• os2/gnumake.cpp (modified) (5 diffs)
• os2/gnumake.h (modified) (1 diff)
• win32/mingw_make.cpp (modified) (1 diff)
• win32/mingw_make.h (modified) (1 diff)

trunk/qmake/generators/makefile.cpp

@@ -100 +100 @@
         ret += dir;
     ret += " ";
-    if(isWindowsShell())
+    if(isDosLikeShell())
         ret += "$(MKDIR)";
     else
@@ -125 +125 @@
     }
     bool ret = true;
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
     bool driveExists = true;
     if(!QDir::isRelativePath(path)) {
@@ -1191 +1191 @@
 {
     QString rm_dir_contents("-$(DEL_FILE)");
-    if (!isWindowsShell()) //ick
+    if (!isDosLikeShell()) //ick
         rm_dir_contents = "-$(DEL_FILE) -r";
 
@@ -1342 +1342 @@
             for(QStringList::ConstIterator pit = dirs.begin(); pit != dirs.end(); ++pit) {
                 QString tmp_dst = fileFixify((*pit), FileFixifyAbsolute, false);
-                if (!isWindowsShell() && tmp_dst.right(1) != Option::dir_sep)
+                if (!isDosLikeShell() && tmp_dst.right(1) != Option::dir_sep)
                     tmp_dst += Option::dir_sep;
                 t << mkdir_p_asstring(filePrefixRoot(root, tmp_dst)) << "\n\t";

trunk/qmake/generators/makefile.h

@@ -245 +245 @@
     virtual bool mergeBuildProject(MakefileGenerator * /*other*/) { return false; }
     virtual bool openOutput(QFile &, const QString &build) const;
-    virtual bool isWindowsShell() const { return Option::target_mode == Option::TARG_WIN_MODE; }
+    virtual bool isDosLikeShell() const { return Option::target_mode == Option::TARG_WIN_MODE ||
+                                                 Option::target_mode == Option::TARG_OS2_MODE; }
 };
 

trunk/qmake/generators/metamakefile.cpp

@@ -421 +421 @@
 #include "unixmake.h"
 #include "mingw_make.h"
+#include "gnumake.h"
 #include "projectgenerator.h"
 #include "pbuilder_pbx.h"
@@ -447 +448 @@
     } else if(gen == "MINGW") {
         mkfile = new MingwMakefileGenerator;
+    } else if(gen == "GNUMAKE") {
+        mkfile = new GNUMakefileGenerator;
     } else if(gen == "PROJECTBUILDER" || gen == "XCODE") {
         mkfile = new ProjectBuilderMakefileGenerator;

trunk/qmake/generators/os2/gnumake.cpp

@@ -60 +60 @@
 }
 
-bool GNUMakefileGenerator::isWindowsShell() const
-{
-#ifdef Q_OS_WIN
+bool GNUMakefileGenerator::isDosLikeShell() const
+{
+#ifdef Q_OS_OS2
     return Option::shellPath.isEmpty();
 #else
-    return Win32MakefileGenerator::isWindowsShell();
+    return Win32MakefileGenerator::isDosLikeShell();
 #endif
 }
@@ -162 +162 @@
  }
 
+/* @todo remove
 void createLdObjectScriptFile(const QString &fileName, const QStringList &objList)
 {
@@ -199 +200 @@
     }
 }
+*/
 
 void GNUMakefileGenerator::writeGNUParts(QTextStream &t)
@@ -368 +370 @@
             ar_script_file += "." + var("BUILD_NAME");
         }
+/* @todo remove
         createArObjectScriptFile(ar_script_file, var("DEST_TARGET"), project->values("OBJECTS"));
+*/
         objectsLinkLine = "ar -M < " + ar_script_file;
     } else {
@@ -375 +379 @@
             ld_script_file += "." + var("BUILD_NAME");
         }
+/* @todo remove
         createLdObjectScriptFile(ld_script_file, project->values("OBJECTS"));
+*/
         objectsLinkLine = ld_script_file;
     }

trunk/qmake/generators/os2/gnumake.h

@@ -58 +58 @@
     QString getLibTarget();
 private:
-    bool isWindowsShell() const;
+    bool isDosLikeShell() const;
     void writeGNUParts(QTextStream &);
     void writeIncPart(QTextStream &t);

trunk/qmake/generators/win32/mingw_make.cpp

@@ -58 +58 @@
 }
 
-bool MingwMakefileGenerator::isWindowsShell() const
+bool MingwMakefileGenerator::isDosLikeShell() const
 {
 #ifdef Q_OS_WIN
     return Option::shellPath.isEmpty();
 #else
-    return Win32MakefileGenerator::isWindowsShell();
+    return Win32MakefileGenerator::isDosLikeShell();
 #endif
 }

trunk/qmake/generators/win32/mingw_make.h

@@ -56 +56 @@
     QString getLibTarget();
 private:
-    bool isWindowsShell() const;
+    bool isDosLikeShell() const;
     void writeMingwParts(QTextStream &);
     void writeIncPart(QTextStream &t);