Changeset 287

Timestamp:

Apr 23, 2011, 12:55:51 AM (14 years ago)

Author:

dmik

Message:

env.cmd: Added -t<target_list> flag to specify which targets to build in more elegant (and b22-compatible) way.

Location:

trunk

Files:

• env.cmd (modified) (3 diffs)
• openjdk/Makefile (modified) (1 diff)

trunk/env.cmd

@@ -37 +37 @@
 
 /*
- * get flags
- */
+ * get options
+ */
+
 aFlags = ''
-if (left(aArgs, 1) == '-') then do
-    parse var aArgs '-'aFlags aArgs
-end
+fTargets = ''
+aNewArgs = ''
+
+do i = 1 to words(aArgs)
+    a = word(aArgs, i)
+    if (left(a, 1) == '-') then do
+        f = substr(a, 2, 1)
+        select
+            when f == 't' then do
+                fTargets = substr(a, 3)
+            end
+            otherwise do
+                aFlags = aFlags || substr(a, 2)
+            end
+        end
+    end
+    else do
+        aNewArgs = aNewArgs' 'a
+    end
+end
+aArgs = strip(aNewArgs)
+drop aNewArgs
 
 if (verify(aFlags, 'Hh?', 'M')) then do
     say 'Flags for 'ScriptFile':'
-    say ' -r    Start commands in release environment'
-    say ' -l    Use debug version of LIBC DLL'
-    say ' -L    Use log check version of LIBC DLL'
-    say ' -j    Enable java launcher debug output'
-    say ' -o    Enable Odin extended logging'
-    say ' -R    Start commands in PRODUCT RELEASE environment'
+    say ' -r        Start commands in release environment'
+    say ' -l        Use debug version of LIBC DLL'
+    say ' -L        Use log check version of LIBC DLL'
+    say ' -j        Enable java launcher debug output'
+    say ' -o        Enable Odin extended logging'
+    say ' -R        Start commands in PRODUCT RELEASE environment'
+    say ' -t<list>  Narrow down the list of targets (possble values are'
+    say '           jdk,hotspot,jaxp,jaxws,corba,langtools)'
 
     if (UnderSE) then call EnvSet 'SE_CMD_ARGS', 'exit'
@@ -64 +86 @@
 fProductRelease = pos('R', aFlags) \= 0
 
+fTargets = translate(fTargets, ' ', ',')
+
 if (fProductRelease) then fRelease = 1
 
@@ -148 +172 @@
 call EnvSetIfEmpty 'ALT_FREETYPE_LIB_PATH', UnixSlashes(ScriptDir'libs\freetype\lib')
 call EnvSetIfEmpty 'ALT_JDK_IMPORT_PATH', UnixSlashes(G.PATH_JDK_IMPORT)
+
+if (fTargets \== '') then do
+    call EnvSet 'SKIP_BUILD_JDK', 'true'
+    call EnvSet 'SKIP_BUILD_HOTSPOT', 'true'
+    call EnvSet 'SKIP_BUILD_JAXP', 'true'
+    call EnvSet 'SKIP_BUILD_JAXWS', 'true'
+    call EnvSet 'SKIP_BUILD_CORBA', 'true'
+    call EnvSet 'SKIP_BUILD_LANGTOOLS', 'true'
+    do i = 1 to words(fTargets)
+        call EnvSet 'SKIP_BUILD_'translate(word(fTargets, i))
+    end
+end
 
 /**

trunk/openjdk/Makefile

@@ -97 +97 @@
 
 ifeq ($(BUILD_LANGTOOLS), true)
+ifneq ($(SKIP_BUILD_LANGTOOLS), true)
   generic_build_repo_series:: langtools
   clobber:: langtools-clobber
 endif
+endif
 
 ifeq ($(BUILD_CORBA), true)
+ifneq ($(SKIP_BUILD_CORBA), true)
   generic_build_repo_series:: corba
   clobber:: corba-clobber
 endif
+endif
 
 ifeq ($(BUILD_JAXP), true)
+ifneq ($(SKIP_BUILD_JAXP), true)
   generic_build_repo_series:: jaxp
   clobber:: jaxp-clobber
 endif
+endif
 
 ifeq ($(BUILD_JAXWS), true)
+ifneq ($(SKIP_BUILD_JAXWS), true)
   generic_build_repo_series:: jaxws
   clobber:: jaxws-clobber
 endif
+endif
 
 ifeq ($(BUILD_HOTSPOT), true)
+ifneq ($(SKIP_BUILD_HOTSPOT), true)
   generic_build_repo_series:: $(HOTSPOT) 
   clobber:: hotspot-clobber
 endif
+endif
 
 ifeq ($(BUILD_JDK), true)
+ifneq ($(SKIP_BUILD_JDK), true)
   generic_build_repo_series:: $(JDK_JAVA_EXE)
   clobber:: jdk-clobber
+endif
 endif