Changeset 78

Timestamp:

May 1, 2003, 4:23:49 PM (22 years ago)

Author:

bird

Message:

Added 'cc' flag.

File:

• trunk/src/misc/dllar.cmd (modified) (11 diffs, 1 prop)

trunk/src/misc/dllar.cmd

@@ -65 +65 @@
     inputFiles.0 = 0;
     description = '';
-    CCFLAGS = '-s -Zcrtdll';
-    EXTRA_CCFLAGS = '';
+    CC = 'gcc.exe';
+    CFLAGS = '-s -Zcrtdll';
+    EXTRA_CFLAGS = '';
     EXPORT_BY_ORDINALS = 0;
     exclude_symbols = '';
@@ -88 +89 @@
                 description = GetLongArg();
             when abbrev('flags', substr(tmp, 2), 1) then
-                CCFLAGS = GetLongArg();
+                CFLAGS = GetLongArg();
+            when abbrev('cc', substr(tmp, 2), 1) then
+                CC = GetLongArg();
             when abbrev('help', substr(tmp, 2), 1) then
                 call PrintHelp;
@@ -98 +101 @@
                 library_flags = library_flags||GetLongArg()' ';
             when abbrev('nocrtdll', substr(tmp, 2), 5) then
-                CCFLAGS = '-s';
+                CFLAGS = '-s';
             otherwise
-                EXTRA_CCFLAGS = EXTRA_CCFLAGS' 'tmp;
+                EXTRA_CFLAGS = EXTRA_CFLAGS' 'tmp;
             end /*select*/
         end
@@ -198 +201 @@
     end;
 
-    EXTRA_CCFLAGS = substr(EXTRA_CCFLAGS, 2);
+    EXTRA_CFLAGS = substr(EXTRA_CFLAGS, 2);
 
     defFile = outFile'.def';
@@ -219 +222 @@
     /*
      * Create the def file.
-     */                                                                         
+     */
     call SysFileDelete(defFile);
     call stream defFile, 'c', 'open write';
@@ -238 +241 @@
             if (EXPORT_BY_ORDINALS) then
             do
-                line = line||copies('   ',(71-length(line))%8)'@'ordinal' NONAME';
+                line = line||copies('    ',(71-length(line))%8)'@'ordinal' NONAME';
                 ordinal = ordinal + 1;
             end;
@@ -256 +259 @@
      *  We just apply long cmdline hack here to save us trouble with slashes and such.
      *  The hack is to make a shell script for we execute using sh.exe. (.exe is of vital importance!)
-     *  OLD: call doCommand('gcc 'CCFLAGS' -Zdll -o 'dllFile defFile||gccCmdl' 'EXTRA_CCFLAGS);
+     *  OLD: call doCommand('gcc 'CFLAGS' -Zdll -o 'dllFile defFile||gccCmdl' 'EXTRA_CFLAGS);
      */
     sTmpFile = SysTempFileName('.\dllar-??.???');
     call lineout sTmpFile, '#!/bin/sh'
-    call charout sTmpFile, 'gcc 'CCFLAGS' -Zdll -o 'translate(dllFile defFile, '/', '\');
+    call charout sTmpFile, CC CFLAGS' -Zdll -o 'translate(dllFile defFile, '/', '\');
     do I = 1 to inputFiles.0
         if (left(inputFiles.I, 1) \= '!') then
             call charout sTmpFile, ' 'translate(inputFiles.I, '/', '\');;
     end;
-    call lineout sTmpFile, ' 'EXTRA_CCFLAGS
+    call lineout sTmpFile, ' 'EXTRA_CFLAGS
     call stream dsTmpFile, 'c', 'close'
     call doCommand 'sh.exe 'sTmpFile;
@@ -281 +284 @@
             gccCmdl = gccCmdl' 'inputFiles.I;
     end;
-    call doCommand('gcc 'CCFLAGS' -Zdll -o 'dllFile defFile||gccCmdl' 'EXTRA_CCFLAGS);
+    call doCommand(CC CFLAGS' -Zdll -o 'dllFile defFile||gccCmdl' 'EXTRA_CFLAGS);
 end
 
@@ -304 +307 @@
 PrintHelp:
  say 'Usage: dllar [-o[utput] output_file] [-d[escription] "dll descrption"]'
- say '       [-f[lags] "CCFLAGS"] [-ord[inals]] -ex[clude] "symbol(s)"'
+ say '       [-cc "CC"] [-f[lags] "CFLAGS"] [-ord[inals]] -ex[clude] "symbol(s)"'
  say '       [-libf[lags] "{INIT|TERM}{GLOBAL|INSTANCE}"] [-nocrt[dll]]'
  say '       [*.o] [*.a]'
- say '*> "output_file" should have no extension'
- say '   If it has the .o, .a or .dll extension, it is automatically removed'
- say '   The import library name is derived from this and is set to "name".a'
- say '*> "flags" should be any set of valid GCC flags (default: -s -Zcrtdll)'
- say '   These flags will be put at the start of GCC command line'
+ say '*> "output_file" should have no extension.'
+ say '   If it has the .o, .a or .dll extension, it is automatically removed.'
+ say '   The import library name is derived from this and is set to "name".a.'
+ say '*> "cc" is used to use another GCC executable.   (default: gcc.exe)'
+ say '*> "flags" should be any set of valid GCC flags. (default: -s -Zcrtdll)'
+ say '   These flags will be put at the start of GCC command line.'
  say '*> -ord[inals] tells dllar to export entries by ordinals. Be careful.'
  say '*> -ex[clude] defines symbols which will not be exported. You can define'
- say '   multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*"'
+ say '   multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*".'
  say '   If the last character of a symbol is "*", all symbols beginning'
- say '   with the prefix before "*" will be exclude, (see _GLOBAL* above)'
+ say '   with the prefix before "*" will be exclude, (see _GLOBAL* above).'
  say '*> -libf[lags] can be used to add INITGLOBAL/INITINSTANCE and/or'
- say '   TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library'
+ say '   TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library.'
  say '*> -nocrtdll switch will disable linking the library against emx''s'
- say '   C runtime DLLs'
+ say '   C runtime DLLs.'
  say '*> All other switches (for example -L./ or -lmylib) will be passed'
- say '   unchanged to GCC at the end of command line'
+ say '   unchanged to GCC at the end of command line.'
  say '*> If you create a DLL from a library and you do not specify -o,'
  say '   the basename for DLL and import library will be set to library name,'
  say '   the initial library will be renamed to 'name'_s.a (_s for static)'
  say '   i.e. "dllar gcc.a" will create gcc.dll and gcc.a, and the initial'
- say '   library will be renamed into gcc_s.a'
+ say '   library will be renamed into gcc_s.a.'
  say '--------'
  say 'Example:'
@@ -386 +390 @@
     parse arg _cmd_;
     say _cmd_;
-        if (length(_cmd_) > 1023) then
-        do
+    if (length(_cmd_) > 1023) then
+    do
         /* Trick: use a different shell to launch the command since CMD.EXE has a
          *  1024 byte limit on the length of the command line ...
@@ -398 +402 @@
         call value '__TMP__','','OS2ENVIRONMENT';
     end
-        else
-    do
-            Address CMD '@'_cmd_;
+    else
+    do
+        Address CMD '@'_cmd_;
         rcCmd = rc;
     end
 
-        if (rcCmd \= 0) then
-    do
-            say 'command failed, exit code='rcCmd;
-            call CleanUp;
-            exit rcCmd;
-        end;
-        drop _cmd_;                            /* prevent running out of memory... */
+    if (rcCmd \= 0) then
+    do
+        say 'command failed, exit code='rcCmd;
+        call CleanUp;
+        exit rcCmd;
+    end;
+    drop _cmd_;                            /* prevent running out of memory... */
 return;