Changeset 95

Timestamp:

May 18, 2006, 9:56:56 AM (19 years ago)

Author:

dmik

Message:

configure.cmd: Fixed compiler configuration routines ('could not open file...' because of the greedy evaluation of logical expressions in REXX)

File:

• trunk/configure.cmd (modified) (5 diffs)

trunk/configure.cmd ¶

@@ -791 +791 @@
      */
     
-    if (\FileExists(qmodules_h) |,
-        CompareFileToVar(qmodules_h, ModulesHeader) \= 0) then do
+    create = \FileExists(qmodules_h)
+    if (\create) then create = CompareFileToVar(qmodules_h, ModulesHeader) \= 0
+    if (create) then do
         call DeleteFile qmodules_h
         call charout qmodules_h, ModulesHeader
@@ -798 +799 @@
     end
 
-    if (\FileExists(qconfig_h) |,
-        CompareFileToVar(qconfig_h, ConfigHeader) \= 0) then do
+    create = \FileExists(qconfig_h)
+    if (\create) then create = CompareFileToVar(qconfig_h, ConfigHeader) \= 0
+    if (create) then do
         call DeleteFile qconfig_h
         call charout qconfig_h, ConfigHeader
@@ -805 +807 @@
     end
 
-    if (\FileExists(qconfig_cpp) |,
-        CompareFileToVar(qconfig_cpp, ConfigSource) \= 0) then do
+    create = \FileExists(qconfig_cpp)
+    if (\create) then create = CompareFileToVar(qconfig_cpp, ConfigSource) \= 0
+    if (create) then do
         call DeleteFile qconfig_cpp
         call charout qconfig_cpp, ConfigSource
@@ -812 +815 @@
     end
     
-    call CopyFile QuotePath(G.!QTDirP)'\qmake\"Makefile.os2-g++"',
+    call CopyFile QuotePath(G.!QTDirP)'\qmake\"Makefile.os2-g++"',,
                   G.!QMakeMakefile
 
-    call CopyFile QuotePath(G.!QTDirP)'\"Makefile.os2-g++"',
+    call CopyFile QuotePath(G.!QTDirP)'\"Makefile.os2-g++"',,
                   G.!Makefile
 
@@ -849 +852 @@
     if (FileExists(build_log)) then do
         call DeleteFile build_log'.bak'
-        call CopyFile build_log build_log'.bak'
+        call CopyFile build_log, build_log'.bak'
         call DeleteFile build_log
     end