Changeset 2940

Timestamp:

Jan 7, 2007, 4:18:23 AM (19 years ago)

Author:

bird

Message:

messing it up...

File:

• trunk/env.cmd (modified) (9 diffs)

trunk/env.cmd

@@ +1 @@
+/*
+echo this is a rexx script!
+cancel & quit & exit
+*/
 /* $Id: $ */
 /** @file
@@ -27 +31 @@
      * Constants.
      */
-    asBuildTypes.0 = 3;
+    asBuildTypes.0 = 2;
     asBuildTypes.1 = 'debug';
-    asBuildTypes.2 = 'profile';
-    asBuildTypes.3 = 'release';
+    asBuildTypes.2 = 'release';
     asStages.0 = 2
     asStages.1 = 'stage1'
@@ -46 +49 @@
     fRm = 0;
     fUseStagedGcc = 1;
+    fUseBuildEnv = 1;
     sBuildType = 'debug';
     sBuildTarget = 'os2';
+    sBuildArch = 'x86';
     do i = 1 to words(sArgs)
         /* extract word */
@@ -108 +113 @@
      * (kBuild actually decides this)
      */
-    sPathOut  = sPathRoot'\out\'sBuildTarget'\'sBuildType
-    sPathOutF = sPathRootF'/out/'sBuildTarget'/'sBuildType
+    sPathOut  = sPathRoot'\out\'sBuildTarget'.'sBuildArch'\'sBuildType
+    sPathOutF = sPathRootF'/out/'sBuildTarget'.'sBuildArch'/'sBuildType
 
     /*
@@ -132 +137 @@
     do i = 1 to asBuildTypes.0
         sMode = asBuildTypes.i;
-        call EnvAddFront 1, 'PATH',                 sPathRoot'\out\'sBuildTarget'\'sMode'\dist\bin;'
-        call EnvAddFront 1, 'PATH',                 sPathRoot'\out\'sBuildTarget'\'sMode'\dist\usr\omfhackbin;'
-        call EnvAddFront 1, 'PATH',                 sPathRoot'\out\'sBuildTarget'\'sMode'\dist\usr\bin;'
-        call EnvAddFront 1, 'PATH',                 sPathRootF'/out/'sBuildTarget'/'sMode'/dist/bin;'
-        call EnvAddFront 1, 'PATH',                 sPathRootF'/out/'sBuildTarget'/'sMode'/dist/usr/bin;'
-        call EnvAddFront 1, 'C_INCLUDE_PATH',       sPathRootF'/out/'sBuildTarget'/'sMode'/dist/usr/include;'
-        call EnvAddFront 1, 'CPLUS_INCLUDE_PATH',   sPathRootF'/out/'sBuildTarget'/'sMode'/dist/usr/include;'
-        call EnvAddFront 1, 'COBJ_INCLUDE_PATH',    sPathRootF'/out/'sBuildTarget'/'sMode'/dist/usr/include;'
-        call EnvAddFront 1, 'LIBRARY_PATH',         sPathRootF'/out/'sBuildTarget'/'sMode'/dist/lib;'
-        call EnvAddFront 1, 'LIBRARY_PATH',         sPathRootF'/out/'sBuildTarget'/'sMode'/dist/usr/lib;'
-        call EnvAddFront 1, 'LIBRARY_PATH',         sPathRootF'/out/'sBuildTarget'/'sMode'/dist/usr/lib/gcc-lib/i386-pc-os2-emx/3.3.5;'
+        call EnvAddFront 1, 'PATH',                 sPathRoot'\out\'sBuildTarget'.'sBuildArch'\'sMode'\dist\bin;'
+        call EnvAddFront 1, 'PATH',                 sPathRoot'\out\'sBuildTarget'.'sBuildArch'\'sMode'\dist\usr\omfhackbin;'
+        call EnvAddFront 1, 'PATH',                 sPathRoot'\out\'sBuildTarget'.'sBuildArch'\'sMode'\dist\usr\bin;'
+        call EnvAddFront 1, 'PATH',                 sPathRootF'/out/'sBuildTarget'.'sBuildArch'/'sMode'/dist/bin;'
+        call EnvAddFront 1, 'PATH',                 sPathRootF'/out/'sBuildTarget'.'sBuildArch'/'sMode'/dist/usr/bin;'
+        call EnvAddFront 1, 'C_INCLUDE_PATH',       sPathRootF'/out/'sBuildTarget'.'sBuildArch'/'sMode'/dist/usr/include;'
+        call EnvAddFront 1, 'CPLUS_INCLUDE_PATH',   sPathRootF'/out/'sBuildTarget'.'sBuildArch'/'sMode'/dist/usr/include;'
+        call EnvAddFront 1, 'COBJ_INCLUDE_PATH',    sPathRootF'/out/'sBuildTarget'.'sBuildArch'/'sMode'/dist/usr/include;'
+        call EnvAddFront 1, 'LIBRARY_PATH',         sPathRootF'/out/'sBuildTarget'.'sBuildArch'/'sMode'/dist/lib;'
+        call EnvAddFront 1, 'LIBRARY_PATH',         sPathRootF'/out/'sBuildTarget'.'sBuildArch'/'sMode'/dist/usr/lib;'
+        call EnvAddFront 1, 'LIBRARY_PATH',         sPathRootF'/out/'sBuildTarget'.'sBuildArch'/'sMode'/dist/usr/lib/gcc-lib/i386-pc-os2-emx/3.3.5;'
         do j = 1 to asStages.0
-            call EnvAddFront 1,'BEGINLIBPATH',      sPathRoot'\out\'sBuildTarget'\'sMode'\obj\gcc\gcc\'asStages.j';'
+            call EnvAddFront 1,'BEGINLIBPATH',      sPathRoot'\out\'sBuildTarget'.'sBuildArch'\'sMode'\obj\gcc\gcc\'asStages.j';'
         end
-        call EnvAddFront 1,  'BEGINLIBPATH',        sPathRoot'\out\'sBuildTarget'\'sMode'\dist\lib;'
-        call EnvAddFront 1,  'BEGINLIBPATH',        sPathRoot'\out\'sBuildTarget'\'sMode'\dist\usr\lib;'
-    end
-
-    /* setup */
-    'call BuildEnv.cmd unixõ vac365õ vac308õ toolkit452õ toolkit40õ emxõ emxpgccõ gcc302õ gcc303õ gcc321õ gcc322õ gcc335õ'
-    if (\fRm) then
-        'call BuildEnv.cmd cvs~ emx~ svn~'
+        call EnvAddFront 1,  'BEGINLIBPATH',        sPathRoot'\out\'sBuildTarget'.'sBuildArch'\'sMode'\dist\lib;'
+        call EnvAddFront 1,  'BEGINLIBPATH',        sPathRoot'\out\'sBuildTarget'.'sBuildArch'\'sMode'\dist\usr\lib;'
+    end
+    if (fUseBuildEnv) then
+        'call BuildEnv.cmd unixõ vac365õ vac308õ toolkit452õ toolkit40õ emxõ emxpgccõ gcc302õ gcc303õ gcc321õ gcc322õ gcc335õ'
+
+    /* Basics */
+    if (fUseBuildEnv & \fRm) then
+        'call BuildEnv.cmd cvs~ emx~ ';/*svn~'*/
+
     /* We do not want any influence from the emx, that's only runtime stuff. */
-    if (1) then
-    do
-        call EnvSet 0, 'LIBRARY_PATH'
-        call EnvSet 0, 'C_INCLUDE_PATH'
-        call EnvSet 0, 'CPLUS_INCLUDE_PATH'
-        call EnvSet 0, 'COBJ_INCLUDE_PATH'
-    end
-
+    call EnvSet 0, 'LDPATH'
+    call EnvSet 0, 'LIBRARY_PATH'
+    call EnvSet 0, 'C_INCLUDE_PATH'
+    call EnvSet 0, 'CPLUS_INCLUDE_PATH'
+    call EnvSet 0, 'COBJ_INCLUDE_PATH'
+
+    /* GCC */
     if (fUseStagedGcc | fRm) then
         call GCC3xx 'gcc335', 'install', fRm, 1, 'gcc335'
@@ -212 +218 @@
     /* kBuild. */
     call EnvSet      fRm, 'PATH_KBUILD',        sPathkBuildF
-    call EnvAddFront fRm, 'PATH',               sPathkBuild'\bin\x86.os2;'
-    call EnvAddFront fRm, 'BEGINLIBPATH',       sPathkBuild'\bin\x86.os2;'
+    call EnvAddFront fRm, 'PATH',               sPathkBuild'\bin\os2.x86;'
+    call EnvAddFront fRm, 'BEGINLIBPATH',       sPathkBuild'\bin\os2.x86;'
     call EnvSet      fRm, 'BUILD_TYPE',         sBuildType
     call EnvSet      fRm, 'BUILD_TARGET',       sBuildTarget
@@ -224 +230 @@
     /* unixroot - todo: check for this and don't override existing unixroot! */
     call EnvSet      fRm, 'UNIXROOT',           sPathToolsF
-    call EnvAddFront fRm, 'PATH',               '.;' /* the sucker gets removed by 'buildenv toolkit40õ' */
+    call EnvAddFront 1,   'PATH',               '.;' /* the sucker gets removed by 'buildenv toolkit40õ' */
     call EnvAddFront fRm, 'PATH',               sPathToolsF'/usr/bin;'
     call EnvAddFront fRm, 'PATH',               sPathTools'\usr\bin;'
@@ -267 +273 @@
     call EnvSet      1,   'EMXSHELL'
     call EnvSet      fRm, 'SHELL',              sPathToolsF'/bin/sh.exe'
-    call EnvSet      fRm, 'MAKE',               sPathkBuildF'/bin/x86.os2/kmk.exe'
+    /*call EnvSet      fRm, 'MAKE',               sPathkBuildF'/bin/os2.x86/kmk.exe'*/
     call EnvSet      fRM, 'PERLLIB_PREFIX',     'L:/Perl/lib;'sPathToolsF'/usr/lib/perl5'
     call EnvSet      fRM, 'PERL_SH_DIR',        sPathToolsF'/bin'
@@ -650 +656 @@
  */
 FixCMDEnv: procedure
-/* do this anyway
-    /* check for 4OS2 first */
-    Address CMD 'set 4os2test_env=%@eval[2 + 2]';
-    if (value('4os2test_env',, 'OS2ENVIRONMENT') = '4') then
-        return 0;
-*/
-
     /* force environment expansion by setting a lot of variables and freeing them.
      * ~6600 (bytes) */