changeset 9277:71eeccf19492

8034173: Move JavaApp.icns to proper place in make/data Reviewed-by: ihse, tbell
author erikj
date Wed, 12 Feb 2014 11:02:47 +0100
parents 90c643593ed7
children 2cebba11e857
files make/data/macosxicons/JavaApp.icns make/gensrc/GensrcIcons.gmk make/lib/PlatformLibraries.gmk src/macosx/native/sun/osxapp/resource/icons/JavaApp.icns
diffstat 4 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
Binary file make/data/macosxicons/JavaApp.icns has changed
--- a/make/gensrc/GensrcIcons.gmk	Tue Feb 11 16:43:57 2014 +0000
+++ b/make/gensrc/GensrcIcons.gmk	Wed Feb 12 11:02:47 2014 +0100
@@ -109,17 +109,16 @@
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
 
-  GENSRC_OSX_ICONS_TMP := $(JDK_OUTPUTDIR)/gensrc
-  GENSRC_OSX_ICONS_DST := $(GENSRC_OSX_ICONS_TMP)/sun/osxapp
+  GENSRC_OSX_ICONS_DST := $(JDK_OUTPUTDIR)/gensrc_headers_icons
   GENSRC_OSX_ICONS := $(GENSRC_OSX_ICONS_DST)/AWTIconData.h
 
   ifdef OPENJDK
-    GENSRC_OSX_ICONS_SRC := $(JDK_TOPDIR)/src/macosx/native/sun/osxapp/resource/icons/JavaApp.icns
+    GENSRC_OSX_ICONS_SRC := $(JDK_TOPDIR)/make/data/macosxicons/JavaApp.icns
   else
-    GENSRC_OSX_ICONS_SRC := $(JDK_TOPDIR)/src/closed/macosx/native/sun/osxapp/resource/icons/JavaApp.icns
+    GENSRC_OSX_ICONS_SRC := $(JDK_TOPDIR)/make/closed/data/macosxicons/JavaApp.icns
   endif
 
-  $(GENSRC_OSX_ICONS_DST)/AWTIconData.h: $(GENSRC_OSX_ICONS_SRC)
+  $(GENSRC_OSX_ICONS): $(GENSRC_OSX_ICONS_SRC)
 	$(RM) $@ $@.tmp
 	$(MKDIR) -p $(dir $@)
 	$(ECHO) "static unsigned char sAWTIconData[] = { " >> $@.tmp
--- a/make/lib/PlatformLibraries.gmk	Tue Feb 11 16:43:57 2014 +0000
+++ b/make/lib/PlatformLibraries.gmk	Wed Feb 12 11:02:47 2014 +0100
@@ -63,7 +63,7 @@
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) \
           -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
-          -I$(JDK_OUTPUTDIR)/gensrc/sun/osxapp \
+          -I$(JDK_OUTPUTDIR)/gensrc_headers_icons \
           -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
           -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
Binary file src/macosx/native/sun/osxapp/resource/icons/JavaApp.icns has changed