Changeset 2993

Timestamp:

Apr 6, 2007, 8:44:12 PM (18 years ago)

Author:

bird

Message:

applied the remaining patch from Yuri.

File:

• branches/libc-0.6/src/misc/dllar.cmd (modified) (17 diffs)

branches/libc-0.6/src/misc/dllar.cmd ¶

@@ -89 +89 @@
                 i = i + 1;
                 outFile = word(cmdLine, i);
-            end;
+            end
             when abbrev('def', substr(tmp, 2), 3) then
                 useDefFile = GetLongArg();
@@ -126 +126 @@
                 K = inputFiles.0;
                 inputFiles.K = files.J;
-            end;
+            end
             else
                 files.0 = 0;
@@ -133 +133 @@
                 say 'ERROR: No file(s) found: "'tmp'"';
                 exit 8;
-            end;
+            end
             drop files.;
-        end;
-    end; /* iterate cmdline words */
+        end
+    end /* iterate cmdline words */
 
     if (flag_omf = 1) then
@@ -149 +149 @@
         say 'dllar: no input files'
         call PrintHelp;
-    end;
+    end
 
     /*
@@ -166 +166 @@
                 call CleanUp;
                 exit 8;
-            end;
+            end
 
             /* Prefix with '!' to indicate archive */
@@ -172 +172 @@
             call doCommand('cd 'substr(inputFiles.I, 2)' && 'AR' x 'fullname);
             call directory(curDir);
-            rc = SysFileTree(substr(inputFiles.I, 2)'\*.o', 'files', 'FO');
+            rc = SysFileTree(substr(inputFiles.I, 2)'\*.o*', 'files', 'FO');
             if (rc = 0) then
             do
                 inputFiles.0 = inputFiles.0 + 1;
                 K = inputFiles.0;
-                inputFiles.K = substr(inputFiles.I, 2)'/*.o';
+                inputFiles.K = substr(inputFiles.I, 2)'/*.o*';
                 /* Remove all empty files from archive since emxexp will barf */
                 do J = 1 to files.0
                     if (stream(files.J, 'C', 'QUERY SIZE') <= 32) then
                         call SysFileDelete(files.J);
-                end;
+                end
                 drop files.;
             end
             else
                 say 'WARNING: there are no files in archive "'substr(inputFiles.I, 2)'"';
-        end;
-    end;
+        end
+    end
 
     /*
@@ -196 +196 @@
         if (left(inputFiles.I, length(curDirS)) = curDirS) then
             inputFiles.I = substr(inputFiles.I, length(curDirS) + 1);
-    end;
+    end
 
     /*
@@ -206 +206 @@
         do_backup = 1;
         outFile = inputFiles.1;
-    end;
+    end
 
     /* If its an archive, remove the '!' and the '$_' prefixes */
@@ -217 +217 @@
         if ((ext = 'DLL') | (ext = 'O') | (ext = 'A')) then
             outFile = substr(outFile, 1, dotpos - 1);
-    end;
+    end
 
     EXTRA_CFLAGS = substr(EXTRA_CFLAGS, 2);
@@ -227 +227 @@
 
     if (do_backup & stream(arcFile, 'C', 'query exists') \= '') then
+    do
+        '@del 'outFile'_s.a > NUL';
         call doCommand('ren 'arcFile' 'outFile'_s.a');
-
-   if useDefFile = '' then 
-   do
-       /*
-        * Extract public symbols from all the object files.
-        */
-       tmpdefFile = '$_'filespec('NAME', defFile);
-       call SysFileDelete(tmpdefFile);
-       do I = 1 to inputFiles.0
-           if (left(inputFiles.I, 1) \= '!') then
-               call doCommand('emxexp -u' inputFiles.I' >>'tmpdefFile);
-       end;
-   
-       /*
-        * Create the def file.
-        */
-       call SysFileDelete(defFile);
-       call stream defFile, 'c', 'open write';
-       call lineOut defFile, 'LIBRARY 'filespec('NAME', outFile)' 'library_flags;
-       if (length(library_data) > 0) then
-           call lineOut defFile, 'DATA 'library_data;
-       if (length(description) > 0) then
-           call lineOut defFile, 'DESCRIPTION "'description'"';
-       call lineOut defFile, 'EXPORTS';
-   
-       queTmp = RxQueue('Create');
-       queOld = RxQueue('Set', queTmp);
-       call doCommand('cat 'tmpdefFile' | sort.exe | uniq.exe | rxqueue.exe' queTmp);
-   
-       ordinal = 1;
-       do while queued() > 0
-           parse pull line;
-           if (length(line) > 0) & (word(line, 1) \= ';') & (export_ok(line)) then
-           do
-               if (EXPORT_BY_ORDINALS) then
-               do
-                   iPos = pos(';', line);
-                   if (iPos > 1) then
-                       line = strip(substr(line, 1, iPos - 1), 'T');
-                   line = line||' @'||ordinal||' NONAME';
-                   ordinal = ordinal + 1;
-               end;
-               call lineOut defFile, line;
-           end;
-       end;
-       call RxQueue 'Delete', RxQueue('Set', queOld);
-       call stream defFile, 'C', 'CLOSE';
-       call SysFileDelete(tmpdefFile);
-       drop line ordinal tmpdefFile;          /* try prevent running out of memory... */
-   
-   end
-   else 
-   do
-       defFile = useDefFile;
-   end
+    end
+
+    if useDefFile = '' then
+    do
+        /*
+         * Extract public symbols from all the object files.
+         */
+        tmpdefFile = '$_'filespec('NAME', defFile);
+        call SysFileDelete(tmpdefFile);
+        do I = 1 to inputFiles.0
+            if (left(inputFiles.I, 1) \= '!') then
+                call doCommand('emxexp -u' inputFiles.I' >>'tmpdefFile);
+        end
+
+        /*
+         * Create the def file.
+         */
+        call SysFileDelete(defFile);
+        call stream defFile, 'c', 'open write';
+        call lineOut defFile, 'LIBRARY 'filespec('NAME', outFile)' 'library_flags;
+        if (length(library_data) > 0) then
+            call lineOut defFile, 'DATA 'library_data;
+        if (length(description) > 0) then
+            call lineOut defFile, 'DESCRIPTION "'description'"';
+        call lineOut defFile, 'EXPORTS';
+
+        queTmp = RxQueue('Create');
+        queOld = RxQueue('Set', queTmp);
+        call doCommand('cat 'tmpdefFile' | sort.exe | uniq.exe | rxqueue.exe' queTmp);
+
+        ordinal = 1;
+        do while queued() > 0
+            parse pull line;
+            if (length(line) > 0) & (word(line, 1) \= ';') & (export_ok(line)) then
+            do
+                if (EXPORT_BY_ORDINALS) then
+                do
+                    iPos = pos(';', line);
+                    if (iPos > 1) then
+                        line = strip(substr(line, 1, iPos - 1), 'T');
+                    line = line||' @'||ordinal||' NONAME';
+                    ordinal = ordinal + 1;
+                end
+                call lineOut defFile, line;
+            end
+        end
+        call RxQueue 'Delete', RxQueue('Set', queOld);
+        call stream defFile, 'C', 'CLOSE';
+        call SysFileDelete(tmpdefFile);
+        drop line ordinal tmpdefFile;          /* try prevent running out of memory... */
+    end
+    else
+    do
+        defFile = useDefFile;
+    end
 
 
@@ -298 +300 @@
     do I = 1 to inputFiles.0
         if (left(inputFiles.I, 1) \= '!') then
-            call charout sTmpFile, ' 'translate(inputFiles.I, '/', '\');;
-    end;
+            call charout sTmpFile, ' 'translate(inputFiles.I, '/', '\');
+    end
     call lineout sTmpFile, ' 'EXTRA_CFLAGS
     call stream dsTmpFile, 'c', 'close'
@@ -315 +317 @@
         if (left(inputFiles.I, 1) \= '!') then
             gccCmdl = gccCmdl' 'inputFiles.I;
-    end;
+    end
     call doCommand(CC CFLAGS' -Zdll -o 'dllFile defFile||gccCmdl' 'EXTRA_CFLAGS);
 end
@@ -326 +328 @@
         if (EXPORT_BY_ORDINALS) then
             add_flags = '-ynd';
-        call doCommand('lxlite -cs -t: -mrn -mln 'add_flags' 'dllFile);
-    end;
+        call doCommand('lxlite -cs -t: -mrn -ml1 'add_flags' 'dllFile);
+    end
 
     /*
@@ -397 +399 @@
             else
                 _tmp_ = _tmp_' 'word(cmdLine, i);
-        end;
+        end
         if (right(_tmp_, 1) = left(_tmp_, 1)) then
             _tmp_ = substr(_tmp_, 2, length(_tmp_) - 2);
-    end;
+    end
 return _tmp_;
 
@@ -419 +421 @@
         if (pos(noexport, line) > 0) then
             return 0;
-    end;
+    end
 return 1;
 
@@ -453 +455 @@
         call CleanUp;
         exit rcCmd;
-    end;
+    end
     drop _cmd_;                            /* prevent running out of memory... */
 return;
@@ -468 +470 @@
         if (left(inputFiles.I, 1) = '!') then
             Address CMD 'rm -rf' substr(inputFiles.I, 2);
-    end;
+    end
 
     /*