Changeset 381 for trunk/mkspecs

Timestamp:

Dec 5, 2009, 12:23:42 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

emxexpw.cmd: Added -desc and -vendor options to make it possible to customize the respective fields of the DESCRIPTION statement.

File:

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

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

@@ -35 +35 @@
 G.!eol          = '0D0A'x
 
-G.!DefaultTemplate.1 =,
-    'LIBRARY ' /* <-- ${name} goes here */
-G.!DefaultTemplate.2 =,
-    ' INITINSTANCE TERMINSTANCE' G.!eol||,
-    'DATA MULTIPLE NONSHARED' G.!eol||,
-    'EXPORTS'
+G.!DefaultTemplate =,
+    "LIBRARY ${name} INITINSTANCE TERMINSTANCE"G.!eol||,
+    "DESCRIPTION '@#${vendor}:${version}#@ ${desc}'"G.!eol||,
+    "DATA MULTIPLE NONSHARED"G.!eol||,
+    "EXPORTS"
     /* <-- ${exports} go here */
 
@@ -59 +58 @@
 Opt.!LibName         = ''
 Opt.!LibVersion      = ''
+Opt.!LibDesc         = ''
+Opt.!LibVendor       = ''
 Opt.!DefTemplate     = ''
 Opt.!DefMap          = ''
@@ -157 +158 @@
         /* write stuff before ${exports} */
         if (Opt.!DefTemplate = '') then do
-            call lineout Opt.!DefFile,,
-                G.!DefaultTemplate.1||Opt.!LibName||G.!DefaultTemplate.2
+            call lineout Opt.!DefFile, ReplaceMacros(G.!DefaultTemplate)
             have_exports_macro = 1
         end
@@ -252 +252 @@
         /* write stuff before ${exports} */
         if (Opt.!DefTemplate == '') then do
-            call lineout Opt.!DefFile,,
-                G.!DefaultTemplate.1||Opt.!LibName||G.!DefaultTemplate.2
+            call lineout Opt.!DefFile, ReplaceMacros(G.!DefaultTemplate)
             have_exports_macro = 1
         end
@@ -278 +277 @@
 
     return
+
+/**
+ *  Replaces all known ${} macros in the given string and returns it.
+ */
+ReplaceMacros: procedure expose (Globals)
+
+    parse arg str
+
+    str = Replace(str, '${name}', Opt.!LibName)
+    str = Replace(str, '${version}', Opt.!LibVersion)
+    str = Replace(str, '${desc}', Opt.!LibDesc)
+    str = Replace(str, '${vendor}', Opt.!LibVendor)
+
+    return str
 
 /**
@@ -312 +325 @@
             epos = pos('${exports}', str)
             if (epos == 0) then do
-                str = Replace(str, '${name}', Opt.!LibName)
-                str = Replace(str, '${version}', Opt.!LibVersion)
+                str = ReplaceMacros(str)
                 call lineout Opt.!DefFile, str
             end
@@ -330 +342 @@
     do while lines(Opt.!DefTemplate)
         str = linein(Opt.!DefTemplate)
-        str = Replace(str, '${name}', Opt.!LibName)
-        str = Replace(str, '${version}', Opt.!LibVersion)
+        str = ReplaceMacros(str)
         call lineout Opt.!DefFile, str
     end
@@ -628 +639 @@
                     Opt.!LibVersion = G.!opts.i
                 end
+                when (o == 'desc') then do
+                    i = i + 1
+                    Opt.!LibDesc = G.!opts.i
+                end
+                when (o == 'vendor') then do
+                    i = i + 1
+                    Opt.!LibVendor = G.!opts.i
+                end
                 when (o == 'template') then do
                     i = i + 1
@@ -678 +697 @@
     say
     say '   -def <file>             : Output DEF file [required]'
-    say '   -name <string>          : Library name [default: DEF file w/o extension]'
+    say '   -name <string>          : Library name [default: DEF file name w/o ext]'
     say '   -version <string>       : Library version [default: none]'
+    say '   -desc <string>          : Library description [default: none]'
+    say '   -vendor <string>        : Library vendor [default: none]'
     say '   -template <file>        : DEF file template [default: none]'
     say '   -map <file>             : Input/output map file [default: none]'
@@ -706 +727 @@
     say
     say '-  ${name} is replaced with the library name;'
-    say '-  ${version} is replaced with the library version;'
+    say '-  ${version} is replaced with the library version string;'
+    say '-  ${desc} is replaced with the library description string;'
+    say '-  ${vendor} is replaced with the library vendor string;'
     say '-  ${exports} is replaced with the list of exported entries.'