changeset 1214:c06d30bd8c69

6841728: Make building the Nimbus L 'n' F optional (100054) Summary: Add DISABLE_NIMBUS variable to prevent Nimbus subdirs being built Reviewed-by: mr, ohair
author andrew
date Thu, 21 May 2009 16:29:58 +0100
parents fdbc48164a8b
children 238591c80bc5
files make/common/shared/Sanity.gmk make/javax/swing/plaf/Makefile make/tools/Makefile
diffstat 3 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/shared/Sanity.gmk	Mon May 18 10:36:38 2009 -0700
+++ b/make/common/shared/Sanity.gmk	Thu May 21 16:29:58 2009 +0100
@@ -1502,6 +1502,9 @@
 # JIBX_LIBS_PATH must be valid
 ######################################################
 sane-jibx:
+ifdef DISABLE_NIMBUS	
+	$(call SanityWarning,Disabling Nimbus will remove public API in javax.swing.plaf.nimbus.)
+else
 	@if [ ! -r $(subst \,/,$(JIBX_LIBS_PATH))/jibx-run.jar ]; then \
 	  $(ECHO) "ERROR: You do not have access to valid JIBX library files. \n" \
 	    "      Please check your access to \n" \
@@ -1509,6 +1512,7 @@
 	    "      and/or check your value of ALT_JDK_DEVTOOLS_DIR, ALT_JIBX_LIBS_PATH \n" \
 	    "" >> $(ERROR_FILE) ; \
 	fi
+endif
 
 ######################################################
 # MOZILLA_HEADERS_PATH must be valid
--- a/make/javax/swing/plaf/Makefile	Mon May 18 10:36:38 2009 -0700
+++ b/make/javax/swing/plaf/Makefile	Thu May 21 16:29:58 2009 +0100
@@ -34,7 +34,9 @@
 #
 include FILES.gmk
 AUTO_FILES_JAVA_DIRS = javax/swing/plaf sun/swing com/sun/java/swing/plaf
-SUBDIRS = nimbus
+ifndef DISABLE_NIMBUS
+  SUBDIRS = nimbus
+endif
 
 # Nimbus is handled in its own directory
 AUTO_JAVA_PRUNE = nimbus
--- a/make/tools/Makefile	Mon May 18 10:36:38 2009 -0700
+++ b/make/tools/Makefile	Thu May 21 16:29:58 2009 +0100
@@ -51,9 +51,12 @@
   makeclasslist             \
   strip_properties          \
   spp                       \
-  swing-nimbus              \
   CharsetMapping
 
+ifndef DISABLE_NIMBUS
+  SUBDIRS += swing-nimbus
+endif
+
 all build clean clobber::
 	$(SUBDIRS-loop)