Changeset 1073 for trunk/qmake

Timestamp:

Sep 10, 2011, 12:57:26 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: qmake: Let INSTALL_ROOT override the dirve letter too.

This allows to redirect make install to another drive.

Location:

trunk/qmake/generators

Files:

• makefile.h (modified) (1 diff)
• os2/gnumake.cpp (modified) (1 diff)
• os2/gnumake.h (modified) (1 diff)

trunk/qmake/generators/makefile.h

@@ -216 +216 @@
     QString valList(const QStringList &varList);
 
-    QString filePrefixRoot(const QString &, const QString &);
+    virtual QString filePrefixRoot(const QString &, const QString &);
 
     //file fixification to unify all file names into a single pattern

trunk/qmake/generators/os2/gnumake.cpp

@@ -719 +719 @@
 }
 
+QString GNUMakefileGenerator::filePrefixRoot(const QString &root, const QString &path)
+{
+    QString ret;
+    if(path.length() > 2 && path[1] == ':') { //c:\foo
+        if (root == "$(INSTALL_ROOT)")
+            ret = QString("$(if %1,%1,%2)").arg(root, path.left(2)) + path.mid(2);
+        else
+            ret = QString(path.left(2) + root + path.mid(2));
+    } else {
+        ret = root + path;
+    }
+    while(ret.endsWith("\\"))
+        ret = ret.left(ret.length()-1);
+    return ret;
+}
+
 QStringList &GNUMakefileGenerator::findDependencies(const QString &file)
 {

trunk/qmake/generators/os2/gnumake.h

@@ -76 +76 @@
     QString getPdbTarget();
 
+    QString filePrefixRoot(const QString &root, const QString &path);
     QStringList &findDependencies(const QString &file);