Changeset 10247 for trunk/tools

Timestamp:

Sep 14, 2003, 8:50:59 PM (22 years ago)

Author:

bird

Message:

GCC versioning.
Global config in ETC. Optional special config possible for legacy support.

File:

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

trunk/tools/bin/buildenv.cmd

@@ -1 @@
-/* $Id: buildenv.cmd,v 1.50 2003-06-12 00:45:33 bird Exp $
+/* $Id: buildenv.cmd,v 1.51 2003-09-14 18:50:59 bird Exp $
  *
  * This is the master tools environment script. It contains environment
@@ -27 +27 @@
      * Version
      */
-    sVersion = '1.0.21 [2003-06-11]';
+    sVersion = '1.1.0 [2003-09-14]';
 
     /*
@@ -99 +99 @@
      * Configuration - sorted please!
      */
-    parse source . . sPathFile .
-    sPathFile = sPathFile||'.paths';
     aPath.0 = 0;
 
@@ -229 +227 @@
                 do j = 1 to aCfg.0
                     say left(aCfg.j.sId, 15) '-' left(aCfg.j.sGrp, 8) '-' aCfg.j.sDesc
+                    sPath = PathQuery(aCfg.j.sId, aCfg.j.sId, 'quietisconfig');
+                    if (sPath <> '') then
+                        say '    'sPath;
                 end
             end
@@ -234 +235 @@
                 do j = 1 to aCfg.0
                     if (CfgIsConfigured(j)) then
+                    do
                         say left(aCfg.j.sId, 15) '-' left(aCfg.j.sGrp, 8) '-' aCfg.j.sDesc
+                        sPath = PathQuery(aCfg.j.sId, aCfg.j.sId, 'quietisconfig');
+                        if (sPath <> '') then
+                            say '    'sPath;
+                    end
                 end
             end
@@ -360 +366 @@
  * @param   sToolId      Tool id.
  */
-CfgDesc: procedure expose aCfg. aPath. sPathFile
+CfgDesc: procedure expose aCfg. aPath.
     parse arg sToolId
     do i = 1 to aCfg.0
@@ -375 +381 @@
  * @param   sToolId      Tool id.
  */
-CfgLookup: procedure expose aCfg. aPath. sPathFile
+CfgLookup: procedure expose aCfg. aPath.
     parse arg sToolId
     iTool = 1;
@@ -392 +398 @@
  * @param   fRM     If set we'll uninstall the tool from the environment.
  */
-CfgInstallUninstall: procedure expose aCfg. aPath. sPathFile
+CfgInstallUninstall: procedure expose aCfg. aPath.
     parse arg iTool, fRM
 
@@ -447 +453 @@
  * @param   fForced     If set, we'll force a reconfiguration of the tool.
  */
-CfgConfigure: procedure expose aCfg. aPath. sPathFile
+CfgConfigure: procedure expose aCfg. aPath.
     parse arg iTool, fForced
 
@@ -515 +521 @@
  * @param   fCleanup    If set we'll clean properly.
  */
-CfgVerify: procedure expose aCfg. aPath. sPathFile
+CfgVerify: procedure expose aCfg. aPath.
     parse arg iTool, fQuiet, fCleanup
 
@@ -571 +577 @@
  * @param   fQuiet  If set we'll to a quiet verify.
  */
-CfgIsConfigured: procedure expose aCfg. aPath. sPathFile
+CfgIsConfigured: procedure expose aCfg. aPath.
     parse arg iTool
 
@@ -593 +599 @@
  *          FALSE if file doesn't exists.
  */
-CfgVerifyFile: procedure expose aCfg. aPath. sPathFile
+CfgVerifyFile: procedure expose aCfg. aPath.
     parse arg sFile, fQuiet, fOptional
     if (fOptional = '') then fOptional = 0;
@@ -614 +620 @@
  *          FALSE if file doesn't exists.
  */
-CfgVerifyDir: procedure expose aCfg. aPath. sPathFile
+CfgVerifyDir: procedure expose aCfg. aPath.
     parse arg sDir, fQuiet
     rc = SysFileTree(sDir, 'sDirs', 'DO');
@@ -633 +639 @@
  * @param   sPathId     Program identifier. (lowercase!)
  */
-PathQuery: procedure expose aCfg. aPath. sPathFile
+PathQuery: procedure expose aCfg. aPath.
     parse arg sPathId, sToolId, sOperation, fOptional
 
@@ -698 +704 @@
 
 /**
+ * Determins the full name of the path file to use.
+ * @returns Path to the pathfile to use. The file may not exist.
+ */
+PathGetFile: procedure
+
+    /*
+     * Project Specific?
+     */
+    parse source . . sPathFile .
+    sPathFile = sPathFile||'.paths';
+    if (FileExists(sPathFile)) then
+        return sPathFile;
+
+    /*
+     * ETC?
+     */
+    sEtc = EnvGet('ETC');
+    if (sEtc <> '') then
+        return sEtc||'\BuildEnv.cfg';
+return sPathFile;
+
+
+/**
  * Reads the path file into the 'aPath.' stem.
  */
-PathRead: procedure expose aCfg. aPath. sPathFile
+PathRead: procedure expose aCfg. aPath.
 
     i = 1;                              /* Path index */
     iLine = 0;                          /* Line # in file */
+
+
+    sPathFile = PathGetFile();
 
     /*
@@ -745 +777 @@
  * Writes the path file from what's in the 'aPath.' stem.
  */
-PathWrite: procedure expose aCfg. aPath. sPathFile
+PathWrite: procedure expose aCfg. aPath.
+
+    sPathFile = PathGetFile();
     call SysFileDelete(sPathFile);
     do i = 1 to aPath.0
@@ -765 +799 @@
  * @param   sPathId     The id of the path to remove.
  */
-PathRemove: procedure expose aCfg. aPath. sPathFile
+PathRemove: procedure expose aCfg. aPath.
     parse arg sPathId
 
@@ -800 +834 @@
  * @param   sNewPath    Path.
  */
-PathSet: procedure expose aCfg. aPath. sPathFile
+PathSet: procedure expose aCfg. aPath.
 parse arg sPathId, sNewPath
 
@@ -828 +862 @@
  * Fills 'aPath.' with default settings overwriting anything in the table.
  */
-PathSetDefault: procedure expose aCfg. aPath. sPathFile
+PathSetDefault: procedure expose aCfg. aPath.
     i = 1;
 
@@ -849 +883 @@
         aPath.i.sPId = 'gcc303';                    aPath.i.sPath = 'f:\GCC\v3.0.3beta_os2\emx';    i = i + 1;
         aPath.i.sPId = 'gcc321';                    aPath.i.sPath = 'f:\GCC\v3.2.1beta_os2\emx';    i = i + 1;
-        aPath.i.sPId = 'gcc322';                    aPath.i.sPath = 'f:\GCC\v3.2.2alpha1_os2\usr';  i = i + 1;
+        aPath.i.sPId = 'gcc322';                    aPath.i.sPath = 'f:\GCC\v3.2.2beta2_os2\usr';   i = i + 1;
         aPath.i.sPId = 'home';                      aPath.i.sPath = 'e:\user\kso';                  i = i + 1;
         aPath.i.sPId = 'icatgam';                   aPath.i.sPath = 'f:\Icat\v4.0.6rc1_os2';        i = i + 1;
@@ -1007 +1041 @@
  * @param   sToolId     The tool Id.
  */
-PathConfig: procedure expose aCfg. aPath. sPathFile
+PathConfig: procedure expose aCfg. aPath.
     parse arg sOperation, sPathId, sToolId
 
@@ -1524 +1558 @@
  * Concurrent Versions System (CVS)
  */
-CVS: procedure expose aCfg. aPath. sPathFile
+CVS: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -1572 +1606 @@
  * EMX
  */
-EMX: procedure expose aCfg. aPath. sPathFile
+EMX: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -1650 +1684 @@
  * EMX PGCC - must be installed on to the ordinar EMX.
  */
-EMXPGCC: procedure expose aCfg. aPath. sPathFile
+EMXPGCC: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -1716 +1750 @@
  * FreeType v1.3.1 EMX release.
  */
-FreeTypeEMX: procedure expose aCfg. aPath. sPathFile
+FreeTypeEMX: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
     sPathFreeType = PathQuery('freetypeemx', sToolId, sOperation);
@@ -1748 +1782 @@
  * IBM DB2 v5.2
  */
-db2v52: procedure expose aCfg. aPath. sPathFile
+db2v52: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
     sPathDB2   = PathQuery('db2v52', sToolId, sOperation);
@@ -1796 +1830 @@
  *  Device Driver Kit (DDK) base.
  */
-DDK: procedure expose aCfg. aPath. sPathFile
+DDK: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -1827 +1861 @@
  *  Device Driver Kit (DDK) base.
  */
-DDKBase: procedure expose aCfg. aPath. sPathFile
+DDKBase: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -1893 +1927 @@
  *  Device Driver Kit (DDK) Video.
  */
-DDKVideo: procedure expose aCfg. aPath. sPathFile
+DDKVideo: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -1956 +1990 @@
  * Doxygen v1.2.11.1 for OS/2.
  */
-DoxyGen: procedure expose aCfg. aPath. sPathFile
+DoxyGen: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -1989 +2023 @@
  * Note! make .lib of every .a! in 4OS2: for /R %i in (*.a) do if not exist %@NAME[%i].lib emxomf %i
  */
-GCC3xx: procedure expose aCfg. aPath. sPathFile
+GCC3xx: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet,sPathId
 
@@ -2082 +2116 @@
  * Note! make .lib of every .a! in 4OS2: for /R %i in (*.a) do if not exist %@NAME[%i].lib emxomf %i
  */
-GCC322plus: procedure expose aCfg. aPath. sPathFile
+GCC322plus: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet,sPathId
 
@@ -2119 +2153 @@
     call EnvAddFront fRM, 'C_INCLUDE_PATH',     sGCCForw'/include;'
     call EnvAddFront fRM, 'C_INCLUDE_PATH',     sGCCForw'/lib/gcc-lib/'sTrgt'/'sVer'/include;'
+    call EnvAddFront fRM, 'C_INCLUDE_PATH',     sGCCForw'/lib/gcc-lib/'sTrgt'/'sVer'/include;'
     call EnvAddFront fRM, 'CPLUS_INCLUDE_PATH', sGCCForw'/include;'
-    call EnvAddFront fRM, 'C_INCLUDE_PATH',     sGCCForw'/lib/gcc-lib/'sTrgt'/'sVer'/include;'
     call EnvAddFront fRM, 'CPLUS_INCLUDE_PATH', sGCCForw'/include/c++/'sVer'/backward;'
     call EnvAddFront fRM, 'CPLUS_INCLUDE_PATH', sGCCForw'/include/c++/'sVer'/'sTrgt';'
@@ -2129 +2163 @@
     /* is this used? */
     call EnvSet      fRM, 'PROTODIR',           sGCCForw'/include/c++/gen'
-    call EnvSet      fRM, 'EMXOMFLD_LINKER',    'ILINK -nofree -STUB:'sGCCBack'\bin\os2stub.bin '
 
     /*
@@ -2176 +2209 @@
  * ICAT Debugger
  */
-ICATGam: procedure expose aCfg. aPath. sPathFile
+ICATGam: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
     sPathICAT   = PathQuery('icatgam', sToolId, sOperation);
@@ -2211 +2244 @@
  * ICAT Debugger
  */
-ICATGam406RC1: procedure expose aCfg. aPath. sPathFile
+ICATGam406RC1: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
     sPathICAT   = PathQuery('icatgam406rc1', sToolId, sOperation);
@@ -2247 +2280 @@
  * ICAT Debugger for PE images.
  */
-ICATPe: procedure expose aCfg. aPath. sPathFile
+ICATPe: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
     sPathICAT   = PathQuery('icatgam', sToolId, sOperation);
@@ -2291 +2324 @@
  * Interactive Disassembler (IDA) v3.80a
  */
-IDA38: procedure expose aCfg. aPath. sPathFile
+IDA38: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
     /*
@@ -2327 +2360 @@
  * Interactive Disassembler (IDA) v4.01
  */
-IDA40: procedure expose aCfg. aPath. sPathFile
+IDA40: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
     /*
@@ -2363 +2396 @@
  * Interactive Disassembler (IDA) v4.14
  */
-IDA414: procedure expose aCfg. aPath. sPathFile
+IDA414: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
     /*
@@ -2399 +2432 @@
  * Interactive Disassembler (IDA) Plugin SDK (v5.0?)
  */
-IDASDK: procedure expose aCfg. aPath. sPathFile
+IDASDK: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
     /*
@@ -2442 +2475 @@
  * Interactive Disassembler (IDA) Plugin SDK (v5.0?)
  */
-IDASDK: procedure expose aCfg. aPath. sPathFile
+IDASDK: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
     /*
@@ -2485 +2518 @@
  * JAVA v1.3.1 (latest)
  */
-Java131: procedure expose aCfg. aPath. sPathFile
+Java131: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
     /*
@@ -2540 +2573 @@
  * (lib) JPEG v6b port.
  */
-JPEG: procedure expose aCfg. aPath. sPathFile
+JPEG: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
     sPathJPEG = PathQuery('jpeg', sToolId, sOperation);
@@ -2576 +2609 @@
  * Mode commandline.
  */
-Mode: procedure expose aCfg. aPath. sPathFile
+Mode: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet,cols,rows
 
@@ -2598 +2631 @@
  * Microsoft C v6.0a 16-bit
  */
-MSCV6_16: procedure expose aCfg. aPath. sPathFile
+MSCV6_16: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -2648 +2681 @@
  * Microsoft C v6.0a 32-bit
  */
-MSCV6_32: procedure expose aCfg. aPath. sPathFile
+MSCV6_32: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -2692 +2725 @@
  * Microsoft C v7.0 16-bit with OS/2 support.
  */
-MSCV7_16: procedure expose aCfg. aPath. sPathFile
+MSCV7_16: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -2748 +2781 @@
  * mySQL Database system
  */
-mySQL: procedure expose aCfg. aPath. sPathFile
+mySQL: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -2793 +2826 @@
  * NASM - NetWide Assembler (all versions)
  */
-NASM: procedure expose aCfg. aPath. sPathFile
+NASM: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet,sPathId
 
@@ -2835 +2868 @@
  * NetQOS2 - help subsystem++ for VAC 3.6.5 and VAC 4.0
  */
-NetQOS2: procedure expose aCfg. aPath. sPathFile
+NetQOS2: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
     sPathNetQOS2 = PathQuery('netqos2', sToolId, sOperation);
@@ -2877 +2910 @@
  * Odin32 testcase setup.
  */
-Odin32Testcase: procedure expose aCfg. aPath. sPathFile
+Odin32Testcase: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
     if (  PathQuery('testcase_drive_unused', sToolId, sOperation) = '',
@@ -2910 +2943 @@
  * PERL 5005_53 or 5.004_55
  */
-Perl50xxx: procedure expose aCfg. aPath. sPathFile
+Perl50xxx: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -2962 +2995 @@
  * PERL v5.8.0
  */
-Perl580: procedure expose aCfg. aPath. sPathFile
+Perl580: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -3007 +3040 @@
  * Python/2 v1.5.2
  */
-Python: procedure expose aCfg. aPath. sPathFile
+Python: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -3046 +3079 @@
  * OS/2 Programmers Toolkit v4.0 (CSD1/4)
  */
-Toolkit40: procedure expose aCfg. aPath. sPathFile
+Toolkit40: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -3144 +3177 @@
  * OS/2 Programmers Toolkit v4.5
  */
-Toolkit45: procedure expose aCfg. aPath. sPathFile
+Toolkit45: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -3232 +3265 @@
  * OS/2 Programmers Toolkit v4.5.1
  */
-Toolkit451: procedure expose aCfg. aPath. sPathFile
+Toolkit451: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -3329 +3362 @@
  * OS/2 Programmers Toolkit v4.5.2
  */
-Toolkit452: procedure expose aCfg. aPath. sPathFile
+Toolkit452: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -3430 +3463 @@
  * This will envolve into an full UNIX like environment some day perhaps...
  */
-Unix: procedure expose aCfg. aPath. sPathFile
+Unix: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -3488 +3521 @@
  * IBM Visual Age for C++ v3.08 for OS/2
  */
-VAC308: procedure expose aCfg. aPath. sPathFile
+VAC308: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -3607 +3640 @@
  * Visual Age / C and C++ tools v3.6.5 for OS/2
  */
-VAC365: procedure expose aCfg. aPath. sPathFile
+VAC365: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -3683 +3716 @@
  * Visual Age for C++ v4.0 for OS/2
  */
-VAC40: procedure expose aCfg. aPath. sPathFile
+VAC40: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -3759 +3792 @@
  * WarpIn
  */
-WarpIn: procedure expose aCfg. aPath. sPathFile
+WarpIn: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet
 
@@ -3798 +3831 @@
  * WatCom C/C++ v11.0
  */
-WatComC11: procedure expose aCfg. aPath. sPathFile
+WatComC11: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet, iBits
 
@@ -3867 +3900 @@
  * WatCom C/C++ v11.0c
  */
-WatComC11c: procedure expose aCfg. aPath. sPathFile
+WatComC11c: procedure expose aCfg. aPath.
     parse arg sToolId,sOperation,fRM,fQuiet, iBits