Changeset 189 for trunk/qmake/generators/makefile.cpp

Timestamp:

Sep 22, 2009, 2:10:57 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Obey OS/2 CMD.EXE cmd.line length restriction in $(DEL_FILE) statements (r37 contd).

File:

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

trunk/qmake/generators/makefile.cpp

@@ -1799 +1799 @@
             if(tmp_clean.isEmpty())
                 tmp_clean = tmp_out;
+
+
+
+
+
+
+
             if(tmp_clean.indexOf("${QMAKE_") == -1) {
-                t << "\n\t" << "-$(DEL_FILE) " << tmp_clean;
+                t << "\n\t" << ;
                 wrote_clean = true;
             }
             if(!wrote_clean_cmds || !wrote_clean) {
                 QStringList cleans;
-                const QString del_statement("-$(DEL_FILE)");
                 if(!wrote_clean) {
                     if(project->isActiveConfig("no_delete_multiple_files")) {
@@ -1813 +1819 @@
                     } else {
                         QString files, file;
-                        const int commandlineLimit = 2047; // NT limit, expanded
+                        const int commandlineLimit =
+                            Option::target_mode == Option::TARG_OS2_MODE ?
+                                1000: // OS/2 CMD.EXE limit (1024 - suffix - reserve)
+                                2047; // NT limit, expanded
                         for(int input = 0; input < tmp_inputs.size(); ++input) {
                             file = " " + replaceExtraCompilerVariables(tmp_clean, tmp_inputs.at(input),
@@ -1829 +1838 @@
                 }
                 if(!cleans.isEmpty())
-                    t << valGlue(cleans, "\n\t" + del_statement, "\n\t" + del_statement, "");
+                    t << valGlue(cleans, "\n\t" + del_statement, );
                 if(!wrote_clean_cmds) {
                     for(QStringList::ConstIterator input = tmp_inputs.begin(); input != tmp_inputs.end(); ++input) {
@@ -2493 +2502 @@
             t <<  " FORCE";
         t << endl;
+
+
+
+
         if(suffix == "clean") {
-            t << varGlue("QMAKE_CLEAN","\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ", "\n");
+            t << varGlue("QMAKE_CLEAN","\t-$(DEL_FILE) ",);
         } else if(suffix == "distclean") {
             QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.fileName()));
             if(!ofile.isEmpty())
-                t << "\t-$(DEL_FILE) " << ofile << endl;
+                t << "\t-$(DEL_FILE) " << ofile << endl;
         } else if(project->isActiveConfig("no_empty_targets")) {
             t << "\t" << "@cd ." << endl;