Changeset 29

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

Files:

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

trunk/qmake/generators/makefile.cpp

@@ -100 +100 @@
         ret += dir;
     ret += " ";
-    if(isWindowsShell())
+    if(isShell())
         ret += "$(MKDIR)";
     else
@@ -125 +125 @@
     }
     bool ret = true;
-#ifdef Q_OS_WIN
+#if
     bool driveExists = true;
     if(!QDir::isRelativePath(path)) {
@@ -1191 +1191 @@
 {
     QString rm_dir_contents("-$(DEL_FILE)");
-    if (!isWindowsShell()) //ick
+    if (!isShell()) //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 (!isShell() && 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 "projectgenerator.h"
 #include "pbuilder_pbx.h"
@@ -447 +448 @@
     } else if(gen == "MINGW") {
         mkfile = new MingwMakefileGenerator;
+
+
     } 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::isShell() const
+{
+#ifdef Q_OS_
     return Option::shellPath.isEmpty();
 #else
-    return Win32MakefileGenerator::isWindowsShell();
+    return Win32MakefileGenerator::isShell();
 #endif
 }
@@ -162 +162 @@
  }
 
+
 void createLdObjectScriptFile(const QString &fileName, const QStringList &objList)
 {
@@ -199 +200 @@
     }
 }
+
 
 void GNUMakefileGenerator::writeGNUParts(QTextStream &t)
@@ -368 +370 @@
             ar_script_file += "." + var("BUILD_NAME");
         }
+
         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");
         }
+
         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 isShell() const;
     void writeGNUParts(QTextStream &);
     void writeIncPart(QTextStream &t);

trunk/qmake/generators/win32/mingw_make.cpp

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

trunk/qmake/generators/win32/mingw_make.h

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

trunk/qmake/main.cpp

@@ -97 +97 @@
     QString reporterPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator()
                            + "qtusagereporter";
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN)
     reporterPath += ".exe";
 #endif
@@ -105 +105 @@
 
     QString oldpwd = qmake_getpwd();
-#ifdef Q_WS_WIN
+#if
     if(!(oldpwd.length() == 3 && oldpwd[0].isLetter() && oldpwd.endsWith(":/")))
 #endif

trunk/qmake/option.cpp

@@ -343 +343 @@
 }
 
-#ifdef Q_OS_WIN
+#if
 static QStringList detectShellPath()
 {
@@ -356 +356 @@
     }
     return paths;
+
+
+
+
+
+
+
+
 }
 #endif
@@ -375 +383 @@
     Option::h_ext << ".h" << ".hpp" << ".hh" << ".hxx";
     Option::c_ext << ".c";
-#ifndef Q_OS_WIN
+#if
     Option::h_ext << ".H";
 #endif
@@ -381 +389 @@
     Option::h_moc_ext = ".cpp";
     Option::cpp_ext << ".cpp" << ".cc" << ".cxx";
-#ifndef Q_OS_WIN
+#if
     Option::cpp_ext << ".C";
 #endif
@@ -387 +395 @@
     Option::yacc_ext = ".y";
     Option::pro_ext = ".pro";
-#ifdef Q_OS_WIN
+#if
     Option::dirlist_sep = ";";
     Option::shellPath = detectShellPath();
@@ -404 +412 @@
             Option::qmake_abslocation = argv0;
         } else if (argv0.contains(QLatin1Char('/'))
-#ifdef Q_OS_WIN
+#if
                    || argv0.contains(QLatin1Char('\\'))
 #endif
@@ -412 +420 @@
             QByteArray pEnv = qgetenv("PATH");
             QDir currentDir = QDir::current();
-#ifdef Q_OS_WIN
+#if
             QStringList paths = QString::fromLocal8Bit(pEnv).split(QLatin1String(";"));
 #else
@@ -421 +429 @@
                     continue;
                 QString candidate = currentDir.absoluteFilePath(*p + QLatin1Char('/') + argv0);
-#ifdef Q_OS_WIN
+#if
                 candidate += ".exe";
 #endif
@@ -625 +633 @@
     Q_ASSERT(!((flags & Option::FixPathToLocalSeparators) && (flags & Option::FixPathToTargetSeparators)));
     if(flags & Option::FixPathToLocalSeparators) {
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN2)
         string = string.replace('/', '\\');
 #else
@@ -719 +727 @@
 #endif
 
+
+
+
+
+
+
 QString qmake_libraryInfoFile()
 {
     QString ret;
-#if defined( Q_OS_WIN )
+#if defined()
     QFileInfo filePath;
     QT_WA({
@@ -733 +747 @@
         filePath = QString::fromLocal8Bit(module_name);
     });
+
+
+
+
+
+
+
+
+
+
     ret = filePath.filePath();
 #else

trunk/qmake/project.cpp

@@ -59 +59 @@
 #elif defined(Q_OS_WIN32)
 #include <Windows.h>
+
+
 #endif
 #include <stdio.h>
@@ -3176 +3178 @@
             }
         }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #elif defined(Q_OS_UNIX)
         struct utsname name;