Changeset 273

Timestamp:

Mar 5, 2011, 8:56:24 PM (14 years ago)

Author:

dmik

Message:

env.cmd: Make sure Odin is not added to PATH/LIBPATH when making (access to library files is enough; bootstrap JDK may use another Odin build and would otherwise interfere with the one used as SDK for building).

Location:

trunk

Files:

• LocalEnv.tpl.cmd (modified) (1 diff)
• env.cmd (modified) (1 diff)

trunk/LocalEnv.tpl.cmd

@@ -16 +16 @@
 /**
  * Path to JDK used for bootstrapping. Must be set.
+ *
+ * Note that when using a previous OpenJDK build here, you must make sure
+ * that all it needs (e.g. a corresponding Odin runtime) is on LIBPATH.
  */
 G.PATH_TOOL_BOOT_JDK    = 'D:\Dev\openjdk6'

trunk/env.cmd

@@ -186 +186 @@
  * set up Odin32 runtime
  */
-if (fRelease) then do
-    call EnvAddFront 'PATH', G.PATH_LIB_ODIN32'\bin\Release;'G.PATH_LIB_ODIN32'\bin'
-    call EnvAddFront 'BEGINLIBPATH', G.PATH_LIB_ODIN32'\bin\Release;'G.PATH_LIB_ODIN32'\bin'
-end
-else do
-    call EnvAddFront 'PATH', G.PATH_LIB_ODIN32'\bin\Debug;'G.PATH_LIB_ODIN32'\bin'
-    call EnvAddFront 'BEGINLIBPATH', G.PATH_LIB_ODIN32'\bin\Debug;'G.PATH_LIB_ODIN32'\bin'
-    call EnvSet 'WIN32.DEBUGBREAK', '1'
-end
-
-if (fOdinLog) then call EnvSet 'WIN32LOG_ENABLED', '1'
-else call EnvSet 'WIN32LOG_ENABLED', ''
+if (\fMake) then do
+    if (fRelease) then do
+        call EnvAddFront 'PATH', G.PATH_LIB_ODIN32'\bin\Release;'G.PATH_LIB_ODIN32'\bin'
+        call EnvAddFront 'BEGINLIBPATH', G.PATH_LIB_ODIN32'\bin\Release;'G.PATH_LIB_ODIN32'\bin'
+    end
+    else do
+        call EnvAddFront 'PATH', G.PATH_LIB_ODIN32'\bin\Debug;'G.PATH_LIB_ODIN32'\bin'
+        call EnvAddFront 'BEGINLIBPATH', G.PATH_LIB_ODIN32'\bin\Debug;'G.PATH_LIB_ODIN32'\bin'
+        call EnvSet 'WIN32.DEBUGBREAK', '1'
+    end
+
+    if (fOdinLog) then call EnvSet 'WIN32LOG_ENABLED', '1'
+    else call EnvSet 'WIN32LOG_ENABLED', ''
+end
 
 /*