Changeset 9032 for trunk/tools

Timestamp:

Aug 20, 2002, 6:07:11 AM (23 years ago)

Author:

bird

Message:

Implemented make passes.
Corrected bad BUILD_NOCOLORS check.

Location:

trunk/tools/bin

Files:

• DoDirs.cmd (modified) (5 diffs)
• DoMakes.cmd (modified) (5 diffs)
• DoWithDirs.cmd (modified) (8 diffs)

trunk/tools/bin/DoDirs.cmd

@@ -1 @@
-/* $Id: DoDirs.cmd,v 1.4 2001-09-30 00:24:35 bird Exp $
+/* $Id: DoDirs.cmd,v 1.5 2002-08-20 04:07:11 bird Exp $
  *
  * Rexx script which executes a given command in each of the given
@@ -17 +17 @@
  * Color config.
  */
-if (  (value('BUILD_NOCOLOR',,'OS2ENVIRONMENT') = ''),
-    & (value('SLKRUNS',,'OS2ENVIRONMENT') = '')) then
+if ((getenv('BUILD_NOCOLORS') = '') & (getenv('SLKRUNS') = '')) then
 do
     sClrMak = '[35;1m'
@@ -30 +29 @@
     sClrRst = ''
 end
+
+
+/*
+ * Build Pass
+ */
+sPass = getenv('_BUILD_PASS');
+if (sPass <> '') then
+    sPass = 'Pass '||sPass||' - '
 
 
@@ -64 +71 @@
         if (directory(sDir) <> '') then
         do
-            say sClrMak||'[Entering directory:' directory()']'||sClrRst;
+            say sClrMak||'['||sPass||'Entering  Directory:' directory()||']'||sClrRst;
             sCommand
             if (rc <> 0) then
             do
-                say sClrErr||'[Failed rc='rc' directory:' directory()']'||sClrRst;
+                say sClrErr||'['||sPass||'Failed rc='rc' directory:' directory()||']'||sClrRst;
                 exit(rc);
             end
-            say sClrMak||'[Leaving  directory:' directory()']'||sClrRst;
+            say sClrMak||'['||sPass||'Leaving   Directory:' directory()||']'||sClrRst;
         end
         else
         do
-            say sClrErr||'[Failed to change directory to' sDir']'||sClrRst;
+            say sClrErr||'['||sPass||'Failed to change directory to' sDir||']'||sClrRst;
             exit(267);                  /* ERROR_DIRECTORY */
         end
@@ -89 +96 @@
  */
 exit(0);
+
+
+/**
+ * Get environment variable value.
+ * @returns Environment variable value if set.
+ *          '' if not set.
+ * @param   sVar    Variable name.
+ */
+getenv: procedure
+parse arg sVar
+return value(sVar,,'OS2ENVIRONMENT');

trunk/tools/bin/DoMakes.cmd

@@ -1 @@
-/* $Id: DoMakes.cmd,v 1.1 2001-09-30 00:24:35 bird Exp $
+/* $Id: DoMakes.cmd,v 1.2 2002-08-20 04:07:11 bird Exp $
  *
  * Rexx script which executes a given command with each of
@@ -16 +16 @@
  * Color config.
  */
-if (  (value('BUILD_NOCOLOR',,'OS2ENVIRONMENT') = ''),
-    & (value('SLKRUNS',,'OS2ENVIRONMENT') = '')) then
+if ((getenv('BUILD_NOCOLORS') = '') & (getenv('SLKRUNS') = '')) then
 do
     sClrMak = '[35;1m'
@@ -30 +29 @@
 end
 
+
+/*
+ * Build Pass
+ */
+sPass = getenv('_BUILD_PASS');
+if (sPass <> '') then
+    sPass = 'Pass '||sPass||' - '
 
 
@@ -55 +61 @@
         if (sMakefile = ' ' | sMakefile = '') then/* If empty directory name iterate. */
             iterate;
-        say sClrMak||'[Processing Makefile:' sMakefile']'||sClrRst;
+        say sClrMak||'['||sPass||'Processing Makefile:' sMakefile||']'||sClrRst;
         sCommand '-f' sMakefile
         if (rc <> 0) then
         do
-            say sClrErr||'[Failed rc='rc' makefile:' sMakefile']'||sClrRst;
+            say sClrErr||'['||sPass||'Failed rc='rc' makefile:' sMakefile||']'||sClrRst;
             exit(rc);
         end
-        say sClrMak||'[Successfully Processed Makefile:' sMakefile']'||sClrRst;
+        say sClrMak||'['||sPass||'Completed  Makefile:' sMakefile||']'||sClrRst;
     end
     else
@@ -73 +79 @@
  */
 exit(0);
+
+
+/**
+ * Get environment variable value.
+ * @returns Environment variable value if set.
+ *          '' if not set.
+ * @param   sVar    Variable name.
+ */
+getenv: procedure
+parse arg sVar
+return value(sVar,,'OS2ENVIRONMENT');
+

trunk/tools/bin/DoWithDirs.cmd

@@ -1 @@
-/* $Id: DoWithDirs.cmd,v 1.12 2001-09-30 00:24:35 bird Exp $
+/* $Id: DoWithDirs.cmd,v 1.13 2002-08-20 04:07:11 bird Exp $
  *
  * Syntax: dowithdirs.cmd [-e<list of excludes>] [-c] [-i] [-l] [-r] <cmd with args...>
@@ -24 +24 @@
  * Color config.
  */
-if (  (value('BUILD_NOCOLOR',,'OS2ENVIRONMENT') = ''),
-    & (value('SLKRUNS',,'OS2ENVIRONMENT') = '')) then
+if ((getenv('BUILD_NOCOLORS') = '') & (getenv('SLKRUNS') = '')) then
 do
     sClrMak = '[35;1m'
@@ -37 +36 @@
     sClrRst = ''
 end
+
+
+/*
+ * Build Pass
+ */
+sPass = getenv('_BUILD_PASS');
+if (sPass <> '') then
+    sPass = 'Pass '||sPass||' - '
 
 
@@ -169 +176 @@
         do
             /* exectute the command in the directory */
-            say sClrMak||'[Entering directory:' asDirs.i']'||sClrRst;
+            say sClrMak||'['||sPass||'Entering Directory: '||asDirs.i']'||sClrRst;
             /* save old dir and enter the new dir. */
             sOldDir = directory();
@@ -183 +190 @@
                         /* restore old directory and return sucessfully */
                         call directory sOldDir;
-                        say '[ !Lock found, stops processing.]';
+                        say sClrMak||'['||sPass||'!Lock found, stops processing.'||']'||sClrRst;
                         exit(0);
                     end
-                    say sClrMak||'[ !Skipping ' || asDirs.i || ' - directory was locked.]'||sClrRst;
+                    say sClrMak||'['||sPass||'!Skipping '||asDirs.i||' - Directory was locked.'||']'||sClrRst;
                     fOK = 0;
                 end
@@ -207 +214 @@
                     if (\fIgnoreFailure) then
                     do
-                        say sClrErr||'[ - rc = 'ret' ' || asDirs.i || ']'||sClrErr;
+                        say sClrErr||'['||sPass||'rc = 'ret' '||asDirs.i||']'||sClrErr;
                         exit(rc);
                     end
-                    say '[ - rc = 'ret' ' || asDirs.i || ']';
+                    say sClrMak||'['||sPass||'rc = 'ret' '||asDirs.i||']'||sClrRst;
                 end
             end
 
             /* restore old directory */
-            say sClrMak||'[Leaving  directory:' directory()']'||sClrRst;
+            say sClrMak||'['||sPass||'Leaving  Directory:' directory()||']'||sClrRst;
             call directory sOldDir;
         end
@@ -224 +231 @@
             if (rc <> 0) then
             do
-                say '[ - rc = ' || rc']';
+                say sClrErr||'['||sPass||'rc = '||rc||']'||sClrRst;
                 if (\fIgnoreFailure) then
                     exit(rc);
@@ -270 +277 @@
     return 0;
 
+
+/**
+ * Get environment variable value.
+ * @returns Environment variable value if set.
+ *          '' if not set.
+ * @param   sVar    Variable name.
+ */
+getenv: procedure
+parse arg sVar
+return value(sVar,,'OS2ENVIRONMENT');
+