Changeset 535 for trunk/qmake/generators/win32/winmakefile.cpp

Timestamp:

Feb 5, 2010, 1:44:09 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Don't prepend install commands with '-' in OS/2 mode to have install errors reported (copy command can silently overwrite the target and doesn't return an error). Add suppressing del command output in uninstall targets.

File:

• trunk/qmake/generators/win32/winmakefile.cpp (modified) (4 diffs)

trunk/qmake/generators/win32/winmakefile.cpp

@@ -795 +795 @@
             QString::null;
 
+    const QString inst_prefix =
+        Option::target_mode == Option::TARG_OS2_MODE ?
+            QString::null: // report errors (copy command overwrites quietly)
+            QString("-");
+
     if(t == "target" && project->first("TEMPLATE") == "lib") {
         if(project->isActiveConfig("create_prl") && !project->isActiveConfig("no_install_prl") &&
@@ -803 +808 @@
                 dst_prl = dst_prl.right(dst_prl.length() - slsh - 1);
             dst_prl = filePrefixRoot(root, targetdir + dst_prl);
-            ret += "-$(INSTALL_FILE) \"" + project->first("QMAKE_INTERNAL_PRL_FILE") + "\" \"" + dst_prl + "\"";
+            ret += inst_prefix + "$(INSTALL_FILE) \"" + project->first("QMAKE_INTERNAL_PRL_FILE") + "\" \"" + dst_prl + "\"";
             if(!uninst.isEmpty())
                 uninst.append("\n\t");
@@ -815 +820 @@
             if(!ret.isEmpty())
                 ret += "\n\t";
-            ret += QString("-$(INSTALL_FILE)") + " \"" + src_targ + "\" \"" + dst_targ + "\"";
+            ret += QString(inst_prefix + "$(INSTALL_FILE)") + " \"" + src_targ + "\" \"" + dst_targ + "\"";
             if(!uninst.isEmpty())
                 uninst.append("\n\t");
@@ -827 +832 @@
         if(!ret.isEmpty())
             ret += "\n\t";
-        ret += QString("-$(INSTALL_FILE)") + " \"" + src_targ + "\" \"" + dst_targ + "\"";
+        ret += QString(inst_prefix + "$(INSTALL_FILE)") + " \"" + src_targ + "\" \"" + dst_targ + "\"";
         if(!uninst.isEmpty())
             uninst.append("\n\t");