Changeset 505

Timestamp:

Feb 3, 2010, 3:18:16 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

emxexpw.cmd: Added ${bldlevel} macro that expands to an extended BLDLEVEL string composed of the version, description and vendor strings.

File:

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

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

@@ -37 +37 @@
 G.!DefaultTemplate =,
     "LIBRARY ${name} INITINSTANCE TERMINSTANCE"G.!eol||,
-    "DESCRIPTION '@#${vendor}:${version}#@ ${desc}'"G.!eol||,
+    "DESCRIPTION '${bldlevel}'"G.!eol||,
     "DATA MULTIPLE NONSHARED"G.!eol||,
     "EXPORTS"
@@ -57 +57 @@
 Opt.!DefFile         = ''
 Opt.!LibName         = ''
-Opt.!LibVersion      = ''
+Opt.!LibVersion      = '0'
 Opt.!LibDesc         = ''
-Opt.!LibVendor       = ''
+Opt.!LibVendor       = 'unknown'
+Opt.!LibBldLevel     = ''
 Opt.!DefTemplate     = ''
 Opt.!DefMap          = ''
@@ -289 +290 @@
     str = Replace(str, '${desc}', Opt.!LibDesc)
     str = Replace(str, '${vendor}', Opt.!LibVendor)
+    str = Replace(str, '${bldlevel}', Opt.!LibBldLevel)
 
     return str
@@ -599 +601 @@
     parse arg options
 
+    printbldlevel = 0
+
     call TokenizeString options, 'G.!opts'
 
@@ -658 +662 @@
                     Opt.!Quiet = 1
                 end
+                when (o == 'printbldlevel') then do
+                    printbldlevel = 1
+                end
                 otherwise
                     call Error "E_InvalidOption", o
@@ -675 +682 @@
     drop G.!opts.0
 
+    /* compose the BLDLEVEL string using the extended syntax */
+
+    parse var Opt.!LibVersion rev1'.'rev2'.'ver3'.'feature
+    if (\datatype(rev1, 'N')) then do
+        feature = Opt.!LibVersion
+        rev1 = 0
+        rev2 = 0
+        ver3 = ''
+    end
+    else if (\datatype(rev2, 'N')) then do
+        feature = substr(Opt.!LibVersion, length(rev1) + 2)
+        rev2 = 0
+        ver3 = ''
+    end
+    else if (\datatype(ver3, 'N')) then do
+        feature = substr(Opt.!LibVersion, length(rev1) + length(rev2) + 3)
+        ver3 = ''
+    end
+
+    timestamp = right(date('N'), 11, ' ') time('N')
+
+    Opt.!LibBldLevel = '@#'Opt.!LibVendor':'rev1'.'rev2'#@##1## '||,
+                       timestamp'    :'feature':::'ver3'::@@'Opt.!LibDesc
+
+    if (printbldlevel) then do
+        /* this is a magic option that causes BldLevel to be printed and exits */
+        say Opt.!LibBldLevel
+        call Done 0
+    end
+
     return
 
@@ -698 +735 @@
     say '   -def <file>             : Output DEF file [required]'
     say '   -name <string>          : Library name [default: DEF file name w/o ext]'
-    say '   -version <string>       : Library version [default: none]'
+    say '   -version <string>       : Library version [default: 0]'
     say '   -desc <string>          : Library description [default: none]'
-    say '   -vendor <string>        : Library vendor [default: none]'
+    say '   -vendor <string>        : Library vendor [default: "unknown"]'
     say '   -template <file>        : DEF file template [default: none]'
     say '   -map <file>             : Input/output map file [default: none]'
@@ -731 +768 @@
     say '-  ${vendor} is replaced with the library vendor string;'
     say '-  ${exports} is replaced with the list of exported entries.'
+    say
+    say 'In addition to the above, there is also the ${bldlevel} macro that is'
+    say 'replaced with a string in the format expected by the BLDLEVEL utility'
+    say 'composed of the values passed with -version, -desc and -vendor options.'
+    say 'This macro is typically used with the DESCRIPTION statement in the .DEF'
+    say 'template. Note that for this macro to work correctly, the version must'
+    say 'be specified in the following format: "X.Y[.Z[.Extra]]" where X, Y and Z'
+    say 'are integer numbers and Extra is an arbitrary string.'
+    say
 
     call Done 0