changeset 23347:acb1d044a217

8037281: Improve CacheFind and enable on all platforms Reviewed-by: tbell, ihse
author erikj
date Fri, 14 Mar 2014 12:31:28 +0100
parents c1437bb64131
children c6aac3e0bc8f
files jdk/make/CompileLaunchers.gmk jdk/make/CompileNativeLibraries.gmk jdk/make/CreateJars.gmk jdk/make/Images.gmk jdk/make/Tools.gmk jdk/make/gensrc/GensrcProperties.gmk
diffstat 6 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/make/CompileLaunchers.gmk	Fri Mar 14 09:29:16 2014 +0800
+++ b/jdk/make/CompileLaunchers.gmk	Fri Mar 14 12:31:28 2014 +0100
@@ -32,7 +32,7 @@
 # Setup the java compilers for the JDK build.
 include Setup.gmk
 
-# Prepare the find cache. Only used on windows.
+# Prepare the find cache.
 $(eval $(call FillCacheFind, $(JDK_TOPDIR)/src/share/bin))
 
 # Build tools
--- a/jdk/make/CompileNativeLibraries.gmk	Fri Mar 14 09:29:16 2014 +0800
+++ b/jdk/make/CompileNativeLibraries.gmk	Fri Mar 14 12:31:28 2014 +0100
@@ -35,7 +35,7 @@
 # Copy files (can now depend on $(COPY_FILES))
 include CopyFiles.gmk
 
-# Prepare the find cache. Only used if running on windows.
+# Prepare the find cache.
 $(eval $(call FillCacheFind, $(JDK_TOPDIR)/src))
 
 # Build tools
--- a/jdk/make/CreateJars.gmk	Fri Mar 14 09:29:16 2014 +0800
+++ b/jdk/make/CreateJars.gmk	Fri Mar 14 12:31:28 2014 +0100
@@ -30,9 +30,6 @@
 
 default: all
 
-# Prepare the find cache. Only used if running on windows.
-$(eval $(call FillCacheFind, $(JDK_OUTPUTDIR)/classes))
-
 include Tools.gmk
 
 include Profiles.gmk
--- a/jdk/make/Images.gmk	Fri Mar 14 09:29:16 2014 +0800
+++ b/jdk/make/Images.gmk	Fri Mar 14 12:31:28 2014 +0100
@@ -30,7 +30,7 @@
 
 default: images
 
-# Prepare the find cache. Only used if running on windows.
+# Prepare the find cache.
 $(eval $(call FillCacheFind, \
     $(wildcard $(JDK_OUTPUTDIR)/bin \
         $(JDK_OUTPUTDIR)/lib \
--- a/jdk/make/Tools.gmk	Fri Mar 14 09:29:16 2014 +0800
+++ b/jdk/make/Tools.gmk	Fri Mar 14 12:31:28 2014 +0100
@@ -23,7 +23,7 @@
 # questions.
 #
 
-# Cache all finds needed for this file. Only used on windows.
+# Cache all finds needed for this file.
 $(eval $(call FillCacheFind, $(JDK_TOPDIR)/make/src/classes))
 
 # The exception handling of swing beaninfo which have the own tool directory
--- a/jdk/make/gensrc/GensrcProperties.gmk	Fri Mar 14 09:29:16 2014 +0800
+++ b/jdk/make/gensrc/GensrcProperties.gmk	Fri Mar 14 12:31:28 2014 +0100
@@ -23,8 +23,10 @@
 # questions.
 #
 
-# Prepare the find cache. This is only used on windows.
-$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/windows/classes))
+# Prepare the find cache.
+$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src/share/classes \
+    $(JDK_TOPDIR)/src/windows/classes \
+    $(JDK_TOPDIR)/src/macosx/classes))
 
 # All .properties files to be compiled are appended to this variable.
 ALL_COMPILED_PROPSOURCES :=