Changeset 87 for trunk

Timestamp:

Apr 15, 2006, 6:58:32 PM (19 years ago)

Author:

dmik

Message:

• Fixed EXPRESSION HAS NO VALUE when too few oject files were supplied on the command line.
• Added the '-version' command line switch that defines a string to replace all occurences of the new '${version}' macro found in a DEF template.

File:

• trunk/mkspecs/os2-g++/emxexpw.cmd (modified) (9 diffs)

trunk/mkspecs/os2-g++/emxexpw.cmd

@@ -58 +58 @@
 Opt.!DefFile         = ''
 Opt.!LibName         = ''
+Opt.!LibVersion      = ''
 Opt.!DefTemplate     = ''
 Opt.!DefMap          = ''
@@ -142 +143 @@
         call lineout G.!ObjectListFile
     end
+    else
+        G.!ObjectListFile = ''
 
     if (Opt.!DefMap == '') then do
@@ -177 +180 @@
             call lineout Opt.!DefFile
 
-            call SysFileDelete G.!ObjectListFile
-            G.!ObjectListFile = ''
+            if (G.!ObjectListFile \= '') then do
+                call SysFileDelete G.!ObjectListFile
+                G.!ObjectListFile = ''
+            end
 
             if (rc \== 0) then
@@ -209 +214 @@
         if (rc \== 0) then call Error E_EMXEXPFailed, rc
 
-        call SysFileDelete G.!ObjectListFile
-        G.!ObjectListFile = ''
+        if (G.!ObjectListFile \= '') then do
+            call SysFileDelete G.!ObjectListFile
+            G.!ObjectListFile = ''
+        end
 
         /* parse the temporary DEF file and combine with G.!Exports */
@@ -306 +313 @@
             if (epos == 0) then do
                 str = Replace(str, '${name}', Opt.!LibName)
+                str = Replace(str, '${version}', Opt.!LibVersion)
                 call lineout Opt.!DefFile, str
             end
@@ -323 +331 @@
         str = linein(Opt.!DefTemplate)
         str = Replace(str, '${name}', Opt.!LibName)
+        str = Replace(str, '${version}', Opt.!LibVersion)
         call lineout Opt.!DefFile, str
     end
@@ -615 +624 @@
                     Opt.!LibName = G.!opts.i
                 end
+                when (o == 'version') then do
+                    i = i + 1
+                    Opt.!LibVersion = G.!opts.i
+                end
                 when (o == 'template') then do
                     i = i + 1
@@ -666 +679 @@
     say '   -def <file>             : Output DEF file [required]'
     say '   -name <string>          : Library name [default: DEF file w/o extension]'
+    say '   -version <string>       : Library version [default: none]'
     say '   -template <file>        : DEF file template [default: none]'
     say '   -map <file>             : Input/output map file [default: none]'
@@ -692 +706 @@
     say
     say '-  ${name} is replaced with the library name;'
+    say '-  ${version} is replaced with the library version;'
     say '-  ${exports} is replaced with the list of exported entries.'