OpenJDK / amber / amber
changeset 22067:3623b46a325d
8029513: SwingApplet demo files still found in JDK 8 on Solaris
Reviewed-by: tbell
| author | ksrini |
|---|---|
| date | Wed, 18 Dec 2013 11:34:34 -0800 |
| parents | f2133b498789 |
| children | 95a7a3cd72a0 |
| files | jdk/make/CompileDemos.gmk |
| diffstat | 1 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/CompileDemos.gmk Wed Dec 18 10:36:34 2013 -0800 +++ b/jdk/make/CompileDemos.gmk Wed Dec 18 11:34:34 2013 -0800 @@ -195,9 +195,6 @@ $(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/closed/share/demo/nbproject/% $(call install-file) $(CHMOD) -f ug+w $@ - ifeq ($(OPENJDK_TARGET_OS), solaris) - $(RM) -r $(JDK_OUTPUTDIR)/demo/nbproject/jfc/SwingApplet - endif endif ################################################################################################## @@ -365,9 +362,16 @@ ################################################################################################## # The netbeans project files are copied into the demo directory. -BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%, \ +ifeq ($(OPENJDK_TARGET_OS), solaris) + BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%, \ + $(JDK_OUTPUTDIR)/demo/nbproject/%, \ + $(filter-out $(JDK_TOPDIR)/src/share/demo/nbproject/jfc/SwingApplet%, \ + $(call CacheFind, $(JDK_TOPDIR)/src/share/demo/nbproject))) +else + BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%, \ $(JDK_OUTPUTDIR)/demo/nbproject/%, \ $(call CacheFind, $(JDK_TOPDIR)/src/share/demo/nbproject)) +endif $(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/share/demo/nbproject/% $(call install-file)