Changeset 9925 for trunk/tools

Timestamp:

Mar 19, 2003, 9:51:51 PM (23 years ago)

Author:

bird

Message:

Added gcc v3.2.1 beta.

File:

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

trunk/tools/bin/buildenv.cmd

@@ -1 @@
-/* $Id: buildenv.cmd,v 1.46 2003-02-24 14:51:46 bird Exp $
+/* $Id: buildenv.cmd,v 1.47 2003-03-19 20:51:51 bird Exp $
  *
  * This is the master tools environment script. It contains environment
@@ -27 +27 @@
      * Version
      */
-    sVersion = '1.0.17 [2003-02-24]';
+    sVersion = '1.0.18 [2003-03-19]';
 
     /*
@@ -114 +114 @@
     aCfg.i.sId = 'emxpgcc';         aCfg.i.sGrp = 'comp32';     aCfg.i.sSet = 'EMXPGCC';                aCfg.i.sDesc = 'Pentium Optimized GCC/EMX v1.1.1 r2 with binutils 2.9.1'; i = i + 1;
     aCfg.i.sId = 'freetypeemx';     aCfg.i.sGrp = 'misc';       aCfg.i.sSet = 'FreeTypeEMX';            aCfg.i.sDesc = 'FreeType v1.3.1 for EMX.'; i = i + 1;
-    aCfg.i.sId = 'gcc302';          aCfg.i.sGrp = 'comp32';     aCfg.i.sSet = 'GCC30x,''gcc302''';      aCfg.i.sDesc = 'GCC/EMX v3.0.2beta with binutils 2.11.2'; i = i + 1;
-    aCfg.i.sId = 'gcc303';          aCfg.i.sGrp = 'comp32';     aCfg.i.sSet = 'GCC30x,''gcc303''';      aCfg.i.sDesc = 'GCC/EMX v3.0.3beta with binutils 2.11.2'; i = i + 1;
+    aCfg.i.sId = 'gcc302';          aCfg.i.sGrp = 'comp32';     aCfg.i.sSet = 'GCC3xx,''gcc302''';      aCfg.i.sDesc = 'GCC/EMX v3.0.2beta with binutils 2.11.2'; i = i + 1;
+    aCfg.i.sId = 'gcc303';          aCfg.i.sGrp = 'comp32';     aCfg.i.sSet = 'GCC3xx,''gcc303''';      aCfg.i.sDesc = 'GCC/EMX v3.0.3beta with binutils 2.11.2'; i = i + 1;
+    aCfg.i.sId = 'gcc321';          aCfg.i.sGrp = 'comp32';     aCfg.i.sSet = 'GCC3xx,''gcc321''';      aCfg.i.sDesc = 'GCC/EMX v3.2.1beta with binutils 2.11.2'; i = i + 1;
     aCfg.i.sId = 'icatgam';         aCfg.i.sGrp = 'debugger';   aCfg.i.sSet = 'ICATGam';                aCfg.i.sDesc = 'ICAT for OS/2 latest';      i = i + 1;
     aCfg.i.sId = 'icatgam406rc1';   aCfg.i.sGrp = 'debugger';   aCfg.i.sSet = 'ICATGam406RC1';          aCfg.i.sDesc = 'ICAT for OS/2 v4.0.6 release candidate 1'; i = i + 1;
@@ -840 +841 @@
         aPath.i.sPId = 'gcc302';                    aPath.i.sPath = 'f:\gcc302beta';                i = i + 1;
         aPath.i.sPId = 'gcc303';                    aPath.i.sPath = 'f:\gcc\v3.0.3beta\emx';        i = i + 1;
+        aPath.i.sPId = 'gcc321';                    aPath.i.sPath = 'f:\gcc\v3.2.1beta\emx';        i = i + 1;
         aPath.i.sPId = 'icatgam';                   aPath.i.sPath = 'f:\icatos2';                   i = i + 1;
         aPath.i.sPId = 'icatgam406rc1';             aPath.i.sPath = 'f:\icatos2.4.0.6.rc1';         i = i + 1;
@@ -867 +869 @@
         aPath.i.sPId = 'unixroot';                  aPath.i.sPath = 'e:\unix';                      i = i + 1;
         aPath.i.sPId = 'xfree86';                   aPath.i.sPath = 'e:\xfree86';                   i = i + 1;
-        aPath.i.sPId = 'vac308';                    aPath.i.sPath = 'f:\vacpp\v308';                    i = i + 1;
-        aPath.i.sPId = 'vac365';                    aPath.i.sPath = 'f:\ibmcxxo';                   i = i + 1;
+        aPath.i.sPId = 'vac308';                    aPath.i.sPath = 'f:\vacpp\v308';                i = i + 1;
+        aPath.i.sPId = 'vac365';                    aPath.i.sPath = 'f:\vacpp\v365';                i = i + 1;
         aPath.i.sPId = 'vac40';                     aPath.i.sPath = 'f:\ibmcpp40';                  i = i + 1;
         aPath.i.sPId = 'warpin';                    aPath.i.sPath = 'f:\warpin';                    i = i + 1;
@@ -893 +895 @@
         aPath.i.sPId = 'emxpgcc';                   aPath.i.sPath = 'e:\dev\emxpgcc\v2.95.2';       i = i + 1;
         aPath.i.sPId = 'gcc303';                    aPath.i.sPath = 'e:\dev\gcc\v3.0.3\emx';        i = i + 1;
+        aPath.i.sPId = 'gcc321';                    aPath.i.sPath = 'e:\dev\gcc\v3.2.1\emx';        i = i + 1;
       /*aPath.i.sPId = 'db2v52';                    aPath.i.sPath = 'e:\sqllib52';                  i = i + 1;
         aPath.i.sPId = 'icatgam';                   aPath.i.sPath = 'e:\icatos2';                   i = i + 1;
@@ -943 +946 @@
         aPath.i.sPId = 'emxpgcc';                   aPath.i.sPath = 'd:\dev\emxpgcc\v2.95.2';       i = i + 1;
         aPath.i.sPId = 'gcc303';                    aPath.i.sPath = 'd:\dev\gcc\v3.0.3\emx';        i = i + 1;
+        aPath.i.sPId = 'gcc321';                    aPath.i.sPath = 'd:\dev\gcc\v3.2.1\emx';        i = i + 1;
       /*aPath.i.sPId = 'db2v52';                    aPath.i.sPath = 'e:\sqllib52';                  i = i + 1;
         aPath.i.sPId = 'icatgam';                   aPath.i.sPath = 'e:\icatos2';                   i = i + 1;
@@ -1974 +1978 @@
 
 /*
- * EMX/GCC 3.0.x - this environment must be used 'on' the ordinary EMX.
+ * EMX/GCC 3.x.x - this environment must be used 'on' the ordinary EMX.
  * Note! bin.new has been renamed to bin!
  * Note! make .lib of every .a! in 4OS2: for /R %i in (*.a) do if not exist %@NAME[%i].lib emxomf %i
  */
-GCC30x: procedure expose aCfg. aPath. sPathFile
+GCC3xx: procedure expose aCfg. aPath. sPathFile
     parse arg sToolId,sOperation,fRM,fQuiet,sPathId
 
@@ -2015 +2019 @@
      * Verify.
      */
-    ch = right(sToolId, 1);
+    chMajor = '3';
+    chMinor = left(right(sToolId, 2), 1);
+    chRel   = right(sToolId, 1);
+    sVer = chMajor'.'chMinor'.'chRel
     if (pos('verify', sOperation) <= 0) then
         return 0;
@@ -2032 +2039 @@
         |   \CfgVerifyFile(sGCCBack'\lib\opcodes_s.a', fQuiet),
         |   \CfgVerifyFile(sGCCBack'\lib\opcodes_s.lib', fQuiet),
-        |   \CfgVerifyFile(sGCCBack'\lib\gcc-lib\i386-pc-os2_emx\3.0.'ch'\st\gcc_dll.lib', fQuiet),
-        |   \CfgVerifyFile(sGCCBack'\lib\gcc-lib\i386-pc-os2_emx\3.0.'ch'\st\stdcxx.lib', fQuiet),
         ) then
         return 2;
 
-    rc = CheckCmdOutput('gcc --version', 0, fQuiet, '3.0.'||right(sPathId,1));
-    if (rc = 0) then
-        rc = CheckCmdOutput('g++ --version', 0, fQuiet, '3.0.'||right(sPathId,1));
-    if (rc = 0) then
-        rc = CheckCmdOutput('as --version', 0, fQuiet, 'GNU assembler 2.11.2');
+    if (chMinor > 0) then
+    do
+        if (    \CfgVerifyFile(sGCCBack'\lib\gcc-lib\i386-pc-os2-emx\'sVer'\st\'sToolId'.lib', fQuiet),
+            |   \CfgVerifyFile(sGCCBack'\lib\gcc-lib\i386-pc-os2-emx\'sVer'\st\stdcxx.lib', fQuiet),
+            |   \CfgVerifyFile(sGCCBack'\lib\gcc-lib\i386-pc-os2-emx\'sVer'\st\stdcxx.a', fQuiet),
+            ) then
+            return 2;
+    end
+    else
+    do
+        if (    \CfgVerifyFile(sGCCBack'\lib\gcc-lib\i386-pc-os2_emx\'sVer'\st\gcc_dll.lib', fQuiet),
+            |   \CfgVerifyFile(sGCCBack'\lib\gcc-lib\i386-pc-os2_emx\'sVer'\st\stdcxx.lib', fQuiet),
+            |   \CfgVerifyFile(sGCCBack'\lib\gcc-lib\i386-pc-os2_emx\'sVer'\st\stdcxx.a', fQuiet),
+            ) then
+            return 2;
+    end
+
+
+    rc = CheckCmdOutput('gcc --version', 0, fQuiet, sVer);
+    if (rc = 0) then
+        rc = CheckCmdOutput('g++ --version', 0, fQuiet, sVer);
+    if (rc = 0) then
+    do
+        sVerAS = '2.11.2';
+        rc = CheckCmdOutput('as --version', 0, fQuiet, 'GNU assembler 'sVerAS);
+    end
 return rc;