Changeset 672

Timestamp:

Mar 11, 2010, 2:57:32 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

emxexpw.cmd: Added -exe option to generate a .DEF for an executable.

File:

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

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

@@ -35 +35 @@
 G.!eol          = '0D0A'x
 
-G.!DefaultTemplate =,
+G.!DefaultDllTemplate =,
     "LIBRARY ${name} INITINSTANCE TERMINSTANCE"G.!eol||,
     "DESCRIPTION '${bldlevel}'"G.!eol||,
-    "DATA MULTIPLE NONSHARED"G.!eol||,
-    "EXPORTS"
-    /* <-- ${exports} go here */
+    "DATA MULTIPLE NONSHARED"
+    /* <-- EXPORTS + ${exports} go here */
+
+G.!DefaultExeTemplate =,
+    "NAME ${name} ${exetype}"G.!eol||,
+    "DESCRIPTION '${bldlevel}'"
+    /* <-- EXPORTS + ${exports} go here */
 
 G.!StatsTemplate =,
@@ -63 +67 @@
 Opt.!DefTemplate     = ''
 Opt.!DefMap          = ''
+Opt.!ExeType         = ''
 Opt.!Quiet           = 0
 Opt.!Objects.0       = 0
@@ -95 +100 @@
 /* check options */
 if (Opt.!DefFile == '') then call Error "E_NoDefFile"
+if (Opt.!ExeType \== '' & Opt.!DefMap \== '') then
+    call Error "E_UnexpectedOption", "-map "Opt.!DefMap
 if (Opt.!DefMap \== '') then
     if (Opt.!Objects.0 == 0) then call Error "E_NoObjectFiles"
@@ -102 +109 @@
     parse value filespec('N', Opt.!DefFile) with Opt.!LibName '.' .
 end
+if (Opt.!ExeType \== '') then
+    G.!DefaultTemplate = G.!DefaultExeTemplate
+else
+    G.!DefaultTemplate = G.!DefaultDllTemplate
 
 /* check emxexp.exe existence */
@@ -160 +171 @@
         exports_tail = ''
 
-        /* write stuff before ${exports} */
-        if (Opt.!DefTemplate = '') then do
-            call lineout Opt.!DefFile, ReplaceMacros(G.!DefaultTemplate)
-            have_exports_macro = 1
-        end
-        else do
-            parse value WriteTemplatedDEF('B') with have_exports_macro' 'exports_tail
-        end
-
-        call lineout Opt.!DefFile
-        
         /* if there are no object files, jsut leave the EXPORTS section empty */
         if (Opt.!Objects.0 == 0) then
                 have_exports_macro = 0
+
+        /* write stuff before ${exports} */
+        if (Opt.!DefTemplate == '') then do
+            call lineout Opt.!DefFile, ReplaceMacros(G.!DefaultTemplate)
+            if (have_exports_macro) then
+                call lineout Opt.!DefFile, 'EXPORTS'
+        end
+        else do
+            parse value WriteTemplatedDEF('B') with have_exports_macro' 'exports_tail
+        end
+
+        call lineout Opt.!DefFile
 
         if (have_exports_macro) then do
@@ -261 +273 @@
         if (Opt.!DefTemplate == '') then do
             call lineout Opt.!DefFile, ReplaceMacros(G.!DefaultTemplate)
+            call lineout Opt.!DefFile, 'EXPORTS'
             have_exports_macro = 1
         end
@@ -298 +311 @@
     str = Replace(str, '${vendor}', Opt.!LibVendor)
     str = Replace(str, '${bldlevel}', Opt.!LibBldLevel)
+    str = Replace(str, '${exetype}', Opt.!ExeType)
 
     return str
@@ -666 +680 @@
                     Opt.!DefMap = G.!opts.i
                 end
+                when (o == 'exe') then do
+                    i = i + 1
+                    Opt.!ExeType = G.!opts.i
+                end
                 when (o == 'q') then do
                     Opt.!Quiet = 1
@@ -747 +765 @@
     say '   -template <file>        : DEF file template [default: none]'
     say '   -map <file>             : Input/output map file [default: none]'
+    say '   -exe <string>           : Executable type [default: none]'
 /*     say '   -q                      : Be quiet [default: be loud]' */
     say
     say '<input_file> is one or more object files to process (wildcards'
-    say 'are NOT supported).'
+    say 'are NOT supported). This argument may be omitted in -exe mode (see below)'
+    say 'or if it is only necessary to attach the description to the DLL. If'
+    say '-map is specified, this argument may not be omitted.'
     say
     say '<response_file> contains options and input files delimited with'
@@ -767 +788 @@
     say 'make these assignments persistent from build to build.'
     say
-    say 'If -template option is not empty, the given file is used as a template'
+    say 'If the -exe option is given, the script generates a .DEF file for the'
+    say 'executable rather than for the DLL, which is useful for specifying the'
+    say 'executable type (passed as an option value, either WINDOWCOMPAT or WINDOWAPI)'
+    say 'and for embedding the application description into the executable. The -map'
+    say 'option is not allowed in -exe mode.'
+    say
+    say 'If the -template option is not empty, the given file is used as a template'
     say 'to generate the resulting DEF file.  The following macros are recognized:'
     say
@@ -775 +802 @@
     say '-  ${vendor} is replaced with the library vendor string;'
     say '-  ${exports} is replaced with the list of exported entries.'
+    say
+    say 'In -exe mode, the following macro is additionally recognized:'
+    say
+    say '-  ${exetype} is replaced with the specified EXE type.'
     say
     say 'In addition to the above, there is also the ${bldlevel} macro that is'
@@ -938 +969 @@
     e.E_CantDeleteFile   = 'Cannot delete file ''%1'' (RC = %2).'
     e.E_InvalidOption    = 'Invalid option: ''%1''.'
+    e.E_UnexpectedOption = 'Unexpected option: ''%1''.'
     e.E_FileNotFound     = 'File not found: ''%1''.'
     e.E_NoDefFile        = 'No output DEF file.'