Changeset 7839 for trunk/tools

Timestamp:

Feb 8, 2002, 11:54:03 AM (24 years ago)

Author:

bird

Message:

Updated environment to support os2tools and vac40.

File:

• trunk/tools/DailyBuild/odin32env.cmd (modified) (9 diffs)

trunk/tools/DailyBuild/odin32env.cmd

@@ -1 @@
-/* $Id: odin32env.cmd,v 1.21 2001-09-06 03:23:20 bird Exp $
+/* $Id: odin32env.cmd,v 1.22 2002-02-08 10:54:03 bird Exp $
  *
  * Sets the build environment.
@@ -10 +10 @@
 
 parse arg sCompiler
+    sCompiler = translate(sCompiler, 'abcdeghijklmnopqrstuvwxyz', 'ABCDEGHIJKLMNOPQRSTUVWXYZ');
 
     /*
@@ -39 +40 @@
     if (sCompiler = 'watcom') then
     do /* watcom */
+        say 'Watcom';
         call VAC30 1;
         call VAC36 1;
+        call VAC40 1;
         call VAC36 0;
         call Watcom 0;
-    end
-    else if (sCompiler = 'vac36') then
+        call Toolkit40 0;
+    end
+    else if ((sCompiler = 'vac36') | (sCompiler = 'vac365')) then
     do /* vac36 */
+        say 'VAC36(5)';
+        call VAC30 1;
+        call Watcom 1;
+        call NetQOS2 0;
+        call VAC40 1;
+        call VAC36 0;
+        call Toolkit40 0;
+    end
+    else if (sCompiler = 'vac40') then
+    do /* vac40 */
+        say 'VAC40';
         call VAC30 1;
         call Watcom 1;
         call NetQOS2 0;
         call VAC36 0;
+        call Toolkit40 0;
+        call VAC40 0;
     end
     else
     do /* default is vac30 */
+        say 'VAC30';
         call VAC36 1;
         call Watcom 1;
+        call VAC40 1;
         call VAC30 0;
-    end
-    call Toolkit40 0;
+        call Toolkit40 0;
+    end
+
     call EnvVar_Set 0, 'DEBUG',      '1'
+    call EnvVar_Set 0, 'BUILD_MODE', 'DEBUG'
+    call EnvVar_Set 0, 'BUILD_PLATFORM', 'OS2'
 
     exit(0);
@@ -205 +227 @@
      * mySQL Database system main directory.
      */
-    sMySQLMain    = 'd:\knut\apps\MySql';
+    sMySQLMain    = 'd:\knut\apps\MySql-3.23.42-rel3';
     call EnvVar_Set      fRM, 'mysqlmain',      sMySQLMain;
     call EnvVar_AddFront fRM, 'path',           sMySQLMain'\bin;'
@@ -388 +410 @@
     sCPPMain = 'c:\appl\os2\ibmcpp30'
     call EnvVar_Set      fRM, 'CCENV',      'VAC30'
+    call EnvVar_Set      fRM, 'build_env',  'VAC308'
     call EnvVar_Set      fRM, 'CPPMAIN',        sCPPMain
     call EnvVar_AddFront fRM, 'beginlibpath',   sCPPMain'\DLL;'sCPPMain'\SAMPLES\TOOLKIT\DLL;'
@@ -445 +468 @@
 
     call EnvVar_Set      fRM, 'CCENV',      'VAC36'
+    call EnvVar_Set      fRM, 'build_env',  'VAC365'
     call EnvVar_Set      fRM, 'cxxmain', sCxxMain;
     call EnvVar_AddFront fRM, 'beginlibpath', sCxxMain'\dll;'sCxxMain'\runtime;'
@@ -463 +487 @@
  * Visual Age for C++ v4.0 for OS/2.
  */
-VAC36: procedure
+VAC40: procedure
     parse arg fRM
 
@@ -471 +495 @@
     sVACppMain    = 'e:\apps\ibmcpp40';
 
-    call EnvVar_Set      fRM, 'vacppmain', sVACppMain;
+    call EnvVar_Set      fRM, 'vacppmain',  sVACppMain;
+    call EnvVar_Set      fRM, 'build_env',  'VAC365' /* on purpose! */
+    call EnvVar_Set      fRM, 'CCENV',      'VAC36'
 
     call EnvVar_AddFront fRM, 'beginlibpath', sVACppMain'\dll;'sVACppMain'\runtime;'
@@ -502 +528 @@
 
     call EnvVar_Set      fRM, 'CCENV',      'WAT'
+    call EnvVar_Set      fRM, 'build_env',  'WATCOM'
     call EnvVar_Set      fRM, 'watcom', sWatcom;
     call EnvVar_Set      fRM, 'edpath',      sWatcom'\eddat'