Changeset 9112 for trunk/tools

Timestamp:

Aug 24, 2002, 6:37:22 AM (23 years ago)

Author:

bird

Message:

Corrected nmake and nmake32 checks in toolkit451. Added support for if exist removal.

File:

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

trunk/tools/bin/buildenv.cmd

@@ -1 @@
-/* $Id: buildenv.cmd,v 1.15 2002-08-18 13:48:54 bird Exp $
+/* $Id: buildenv.cmd,v 1.16 2002-08-24 04:37:22 bird Exp $
  *
  * This is the master tools environment script. It contains environment
@@ -13 +13 @@
  *       those the original value, for example of no_NO, is not restored.
  *     - Same goes for some other stuff, we have no stack of previous values.
- *             
+ *
  * Copyright (c) 1999-2002 knut st. osmundsen (bird@anduin.net)
  *
@@ -19 +19 @@
  *
  */
-    
+
     Address CMD '@echo off';
 
@@ -28 +28 @@
      */
     sVersion = '1.0.2 [2002-08-18]';
-    
+
     /*
      * Create argument array with lowercase arguments.
@@ -44 +44 @@
      * Syntax
      */
-    if (sEnv.0 = 0) then 
+    if (sEnv.0 = 0) then
     do
         say 'BuildEnv v'||sVersion
@@ -59 +59 @@
         say '   ~   Install tool in environment if it''s configured.'
         say '   -   Remove tool from environment.'
+        say '   õ   Remove tool from environment if it''s configured.'
         say '   *   Configure tool if needed.'
         say '   !   Forced tool configuretion.'
@@ -161 +162 @@
          */
         ch = substr(sEnv.i, length(sEnv.i), 1);
-        if (ch = '-' | ch = '+' | ch = '*' | ch = '!' | ch = '?' | ch = '@' | ch = '~') then
+        if (pos(ch, '+~-õ*!?@') > 0) then
             sEnv.i = substr(sEnv.i, 1, length(sEnv.i) - 1);
         else
             ch = '+';
-        fRM = (ch = '-');
+        fRM = (ch = '-' | ch = 'õ');
+        fOptional = (ch = '~' | ch = 'õ')
         fCfg = (ch = '*');
         fForcedCfg = (ch = '!');
         fVerify = (ch = '@')
         fQuery = (ch = '?')
-        fOptional = (ch = '~')
 
         /*
@@ -338 +339 @@
 NoValueHandler:
     say 'NoValueHandler: line 'SIGL;
-return;
+return 0;
 
 
@@ -2274 +2275 @@
 return rc;
 
- 
+
 
 /*
@@ -2539 +2540 @@
         rc = CheckCmdOutput('ipfc', 0, fQuiet, 'Version 4.00.007 Oct 02 2000');
     if (rc = 0) then
-        rc = CheckCmdOutput('nmake', 2, fQuiet, 'Version 4.00.000 Oct 20 2000');
-    if (rc = 0) then
-        rc = CheckCmdOutput('nmake32', 0, fQuiet, 'Version 5.00.003 Oct 20 2000');
+        rc = CheckCmdOutput('nmake -?', 0, fQuiet, 'Version 4.00.000 Oct 20 2000');
+    if (rc = 0) then
+        rc = CheckCmdOutput('nmake32 -?', 0, fQuiet, 'Version 5.00.003 Oct 20 2000');
 return rc;