Changeset 44

Timestamp:

Jun 22, 2009, 12:20:37 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/GNUMAKE: Escape make variables that refer to file names with a special function call to convert DOS-like to Unix-like space char escaping (expected by GNU make in the target and dependencies parts of build rules, #1).

Location:

trunk/qmake/generators/os2

Files:

• gnumake.cpp (modified) (9 diffs)
• gnumake.h (modified) (2 diffs)

trunk/qmake/generators/os2/gnumake.cpp

@@ -80 +80 @@
         if (ret.contains(QRegExp("[ +&;%]")))
             ret = quote + ret + quote;
-        /* @todo exclude $(var) constructs from quoting like this:
-         *     $(OBJECTS_DIR)\my file.obj = > $(OBJECTS_DIR)\"my file.obj"
-         */
     }
     return ret;
 }
 
-QString GNUMakefileGenerator::getLibTarget()
-{
-    return QString("lib" + project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".lib");
+QString GNUMakefileGenerator::escapeDependencyPath(const QString &path) const
+{
+    /* dependency escaping is always done Unix-way since this is a requirement
+     * of GNU make which allows " and ' to be part of the file name */
+    QString ret = path;
+    ret.remove('\"');
+    ret.replace(' ', "\\ ");
+    return ret;
 }
 
@@ -137 +139 @@
 bool GNUMakefileGenerator::writeMakefile(QTextStream &t)
 {
+    /* function to convert from DOS-like to Unix-like space escaping in file
+     * names */
+    t << "q = $(subst %,\\%,$(subst ;,\\;,$(subst &,\\&,"
+         "$(subst +,\\+,$(subst $(space),\\ ,$(subst \",,$(1)))))))" << endl << endl;
+
     writeHeader(t);
+
     if(!project->values("QMAKE_FAILED_REQUIREMENTS").isEmpty()) {
         t << "all clean:" << "\n\t"
@@ -351 +359 @@
 {
     t << "first: all" << endl;
-    t << "all: " << escapeDependencyPath(fileFixify(Option::output.fileName())) << " " << valGlue(escapeDependencyPaths(project->values("ALL_DEPS"))," "," "," ") << " $(DESTDIR_TARGET)" << endl << endl;
-    t << "$(DESTDIR_TARGET): " << var("PRE_TARGETDEPS") << " $(OBJECTS) " << var("POST_TARGETDEPS");
+    t << "all: " << escapeDependencyPath(fileFixify(Option::output.fileName())) << " " << valGlue(escapeDependencyPaths(project->values("ALL_DEPS"))," "," "," ") << escapeFileVars(" $(DESTDIR_TARGET)") << endl << endl;
+    t << escapeFileVars("$(DESTDIR_TARGET): ") << var("PRE_TARGETDEPS") << " $(OBJECTS) " << var("POST_TARGETDEPS");
     if (!project->isEmpty("QMAKE_PRE_LINK"))
         t << "\n\t" <<var("QMAKE_PRE_LINK");
@@ -391 +399 @@
             t << "DEF_FILE      = $(basename $(DESTDIR_TARGET)).def" << endl;
             project->values("QMAKE_CLEAN").append("$(DEF_FILE)");
-            project->values("POST_TARGETDEPS") += "$(DEF_FILE)";
+            project->values("POST_TARGETDEPS") += escapeFileVars("$(DEF_FILE)");
             if (!project->isEmpty("DEF_FILE_TEMPLATE")) {
                 t << "DEF_FILE_TEMPLATE = " << escapeFilePath(var("DEF_FILE_TEMPLATE")) << endl;
-                project->values("QMAKE_GENDEF_DEPS") += "$(DEF_FILE_TEMPLATE)";
+                project->values("QMAKE_GENDEF_DEPS") += escapeFileVars("$(DEF_FILE_TEMPLATE)");
             }
             if (!project->isEmpty("DEF_FILE_MAP")) {
                 t << "DEF_FILE_MAP  = " << escapeFilePath(var("DEF_FILE_MAP")) << endl;
-                project->values("QMAKE_GENDEF_DEPS") += "$(DEF_FILE_MAP)";
+                project->values("QMAKE_GENDEF_DEPS") += escapeFileVars("$(DEF_FILE_MAP)");
             }
         }
@@ -408 +416 @@
         }
         t << "DEF_FILE      = " << escapeFilePath(var("DEF_FILE")) << endl;
-        project->values("POST_TARGETDEPS") += "$(DEF_FILE)";
+        project->values("POST_TARGETDEPS") += escapeFileVars("$(DEF_FILE)");
     }
 }
@@ -416 +424 @@
     if (!project->isEmpty("RC_FILE") && !project->isEmpty("RES_FILE") &&
         !project->isEmpty("QMAKE_RUN_RC2RES")) {
-        t << "$(RES_FILE): $(RC_FILE)\n\t";
+        t << escapeFileVars("$(RES_FILE): $(RC_FILE)\n\t");
         t << var("QMAKE_RUN_RC2RES") << endl;
     }
@@ -422 +430 @@
     if (project->isEmpty("DEF_FILE") && mode == DLL) {
         /* generate a DEF file for the DLL when not supplied */
-        t << "$(DEF_FILE): " << var("QMAKE_GENDEF_DEPS");
+        t << escapeFileVars("$(DEF_FILE): ") << var("QMAKE_GENDEF_DEPS");
         t << valGlue(var("QMAKE_RUN_GENDEF").split(";;"), "\n\t", "\n\t", "") << endl;
     }
@@ -446 +454 @@
 
     if (!project->isEmpty("RES_FILE"))
-        project->values("POST_TARGETDEPS") += "$(RES_FILE)";
+        project->values("POST_TARGETDEPS") += escapeFileVars("$(RES_FILE)");
 }
 
@@ -567 +575 @@
 }
 
+QString GNUMakefileGenerator::escapeFileVars(const QString &vars)
+{
+    /* In DOS environment, we escape spaces and other illegal characters in
+     * filenames with double quotes. However, this is not appropriate for make
+     * rule definitions (targets/dependencies) where Unix escaping is
+     * expected. For this reason, we must convert escaping using the q*
+     * function that we define in writeMakefile() below */
+    if (isDosLikeShell()) {
+        QString ret = vars;
+        ret.replace(QRegExp("\\$\\((.+)\\)"), "$(call q,$(\\1))");
+        return ret;
+    }
+    return vars;
+}
+
 QT_END_NAMESPACE

trunk/qmake/generators/os2/gnumake.h

@@ -56 +56 @@
 protected:
     QString escapeFilePath(const QString &path) const;
-    QString getLibTarget();
+    QString escapeDependencyPath(const QString &path) const;
 private:
     bool isDosLikeShell() const;
@@ -83 +83 @@
     void createLinkerResponseFiles(QTextStream &t);
     void createCompilerResponseFiles(QTextStream &t);
+    QString escapeFileVars(const QString &base);
 
     bool init_flag;