Changeset 8295 for trunk/tools

Timestamp:

Apr 22, 2002, 4:01:37 AM (23 years ago)

Author:

bird

Message:

echo off! @'s. '-' = start; '*' = same shell. Watcom 11.0c changed BUILD_ENV to WAT11C.

File:

• trunk/tools/bin/buildenv.cmd (modified) (8 diffs)

trunk/tools/bin/buildenv.cmd

@@ -1 @@
-/* $Id: buildenv.cmd,v 1.4 2002-04-16 00:10:12 bird Exp $
+/* $Id: buildenv.cmd,v 1.5 2002-04-22 02:01:37 bird Exp $
  *
  * This is the master environment script. It contains settings for many
@@ -20 +20 @@
  */
 
+    Address CMD '@echo off';
 
     /*
@@ -56 +57 @@
     do i = 1 to sEnv.0
         /* uses dash to mark end of arguments */
-        if (sEnv.i = '-') then
+        if ((sEnv.i = '-') | (sEnv.i = '*')) then
             leave;
 
@@ -77 +78 @@
         rc = 0;
         select
-            when (sEnv.i = 'mode8050') then     Address CMD 'mode 80,50'
-            when (sEnv.i = 'mode12050') then    Address CMD 'mode 120,50'
+            when (sEnv.i = 'mode8050') then     Address CMD '@mode 80,50'
+            when (sEnv.i = 'mode12050') then    Address CMD '@mode 120,50'
             when (sEnv.i = 'cvs') then          rc = CVS(fRM);
             when (sEnv.i = 'db2v52') then       rc = db2v52(fRM);
@@ -145 +146 @@
     /*
      * Check for command to execute.
-     * (I.e. if there are more arguments left. after the dash.)
+     * (I.e. if there are more arguments left. after the dash/star.)
      */
     if (i < sEnv.0) then
     do
+        chType = sEnv.i;
+
         sCmd = '';
         do while (i < sEnv.0)
@@ -154 +157 @@
             sCmd = sCmd ||' '||sEnv.i;
         end
-        Address CMD 'start /F' sCMD;
-        Address CMD 'exit';
+
+        if (chType = '-') then
+        do
+            Address CMD 'start /F' sCMD;
+            Address CMD 'exit';
+        end
+        else
+            Address CMD sCMD;
         exit(rc);
     end
@@ -941 +950 @@
     call EnvVar_Set      fRM, 'PATH_WATCOM', sPathWatcom
     call EnvVar_Set      fRM, 'CCENV',      'WAT'
-    call EnvVar_Set      fRM, 'BUILD_ENV',  'WAT11'
+    call EnvVar_Set      fRM, 'BUILD_ENV',  'WAT11C'
     call EnvVar_Set      fRM, 'BUILD_PLATFORM', 'OS2'
 
@@ -1165 +1174 @@
     /* force environment expansion by setting a lot of variables and freeing them. */
     do i = 1 to 100
-        Address CMD 'set dummyenvvar'||i'=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        Address CMD '@set dummyenvvar'||i'=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
     end
     do i = 1 to 100
-        Address CMD 'set dummyenvvar'||i'=';
+        Address CMD '@set dummyenvvar'||i'=';
     end
 return 0;