Changeset 29 for trunk/qmake/option.cpp

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).

File:

• trunk/qmake/option.cpp (modified) (11 diffs)

trunk/qmake/option.cpp

@@ -343 +343 @@
 }
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN)
 static QStringList detectShellPath()
 {
@@ -356 +356 @@
     }
     return paths;
+}
+#elif defined(Q_OS_OS2)
+static QStringList detectShellPath()
+{
+    /* @todo check if sh is actually the active shell of the process; relying on
+     * the presence of sh.exe in PATH as done for Windows above is obviously not
+     * enough */
+    return QStringList();
 }
 #endif
@@ -375 +383 @@
     Option::h_ext << ".h" << ".hpp" << ".hh" << ".hxx";
     Option::c_ext << ".c";
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
     Option::h_ext << ".H";
 #endif
@@ -381 +389 @@
     Option::h_moc_ext = ".cpp";
     Option::cpp_ext << ".cpp" << ".cc" << ".cxx";
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
     Option::cpp_ext << ".C";
 #endif
@@ -387 +395 @@
     Option::yacc_ext = ".y";
     Option::pro_ext = ".pro";
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
     Option::dirlist_sep = ";";
     Option::shellPath = detectShellPath();
@@ -404 +412 @@
             Option::qmake_abslocation = argv0;
         } else if (argv0.contains(QLatin1Char('/'))
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
                    || argv0.contains(QLatin1Char('\\'))
 #endif
@@ -412 +420 @@
             QByteArray pEnv = qgetenv("PATH");
             QDir currentDir = QDir::current();
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
             QStringList paths = QString::fromLocal8Bit(pEnv).split(QLatin1String(";"));
 #else
@@ -421 +429 @@
                     continue;
                 QString candidate = currentDir.absoluteFilePath(*p + QLatin1Char('/') + argv0);
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
                 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_WIN) || defined(Q_OS_OS2)
         string = string.replace('/', '\\');
 #else
@@ -719 +727 @@
 #endif
 
+#ifdef Q_OS_OS2
+# include <qt_os2.h>
+
+QT_USE_NAMESPACE
+#endif
+
 QString qmake_libraryInfoFile()
 {
     QString ret;
-#if defined( Q_OS_WIN )
+#if defined(Q_OS_WIN)
     QFileInfo filePath;
     QT_WA({
@@ -733 +747 @@
         filePath = QString::fromLocal8Bit(module_name);
     });
+    ret = filePath.filePath();
+#elif defined(Q_OS_OS2)
+    QFileInfo filePath;
+    static char appFileName[CCHMAXPATH] = "\0";
+    if (!appFileName[0]) {
+        PPIB ppib;
+        DosGetInfoBlocks(NULL, &ppib);
+        DosQueryModuleName(ppib->pib_hmte, sizeof(appFileName), appFileName);
+    }
+    filePath = QString::fromLocal8Bit(appFileName);
     ret = filePath.filePath();
 #else