Changeset 967

Timestamp:

Aug 11, 2011, 9:05:41 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Added replace functions fixpath_target and fixpath_local.

They match to Option::fixPathToTargetOS() and Option::fixPathToTargetOS()
respectively. These operations are frequently used to fix paths when generating
makefiles and having them in .pro allows to do many things that would otherwise
require patching qmake itself. See the next changeset for a real life example.

File:

• trunk/qmake/project.cpp (modified) (3 diffs)

trunk/qmake/project.cpp ¶

@@ -84 +84 @@
                   E_FIND, E_SYSTEM, E_UNIQUE, E_QUOTE, E_ESCAPE_EXPAND,
                   E_UPPER, E_LOWER, E_FILES, E_PROMPT, E_RE_ESCAPE, E_REPLACE,
-                  E_SIZE, E_GENERATE_UID };
+                  E_SIZE, E_GENERATE_UID, E_FIXPATH_TARGET, E_FIXPATH_LOCAL };
 QMap<QString, ExpandFunc> qmake_expandFunctions()
 {
@@ -117 +117 @@
         qmake_expand_functions->insert("size", E_SIZE);
         qmake_expand_functions->insert("generate_uid", E_GENERATE_UID);
+        qmake_expand_functions->insert("fixpath_target", E_FIXPATH_TARGET);
+        qmake_expand_functions->insert("fixpath_local", E_FIXPATH_LOCAL);
     }
     return *qmake_expand_functions;
@@ -2250 +2252 @@
         }
         break;
+    case E_FIXPATH_TARGET:
+    case E_FIXPATH_LOCAL:
+        if (args.count() < 1 || args.count() > 3) {
+            fprintf(stderr, "%s:%d: fixpath_%s(str) requires one argument.\n",
+                    parser.file.toLatin1().constData(), parser.line_no,
+                    func_t == E_FIXPATH_TARGET ? "target" : "local");
+        } else {
+            bool fix_env = true;
+            if(args.count() > 1)
+                fix_env = (args[1].toLower() == "true" || args[1].toInt());
+            bool canonical = true;
+            if(args.count() > 2)
+                canonical = (args[2].toLower() == "true" || args[1].toInt());
+            if(func_t == E_FIXPATH_TARGET)
+                ret += Option::fixPathToTargetOS(args[0], fix_env, canonical);
+            else
+                ret += Option::fixPathToLocalOS(args[0], fix_env, canonical);
+        }
+        break;
     default: {
         fprintf(stderr, "%s:%d: Unknown replace function: %s\n",