Mercurial > hg > openjdk > jdk8 > jdk
changeset 6106:84f0439ccaab
8001965: build-infra: Large compare diffs between new and old on mac
Summary: The wrong icon source file was used when building closed
Reviewed-by: ohair, tbell
Contributed-by: erik.joelsson@oracle.com
| author | tbell |
|---|---|
| date | Tue, 13 Nov 2012 13:46:25 -0800 |
| parents | e9e8a5852690 |
| children | 130d3a54d28b ccff3b663797 |
| files | makefiles/GensrcIcons.gmk |
| diffstat | 1 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/makefiles/GensrcIcons.gmk Mon Nov 12 12:35:20 2012 -0800 +++ b/makefiles/GensrcIcons.gmk Tue Nov 13 13:46:25 2012 -0800 @@ -109,13 +109,17 @@ ifeq ($(OPENJDK_TARGET_OS),macosx) - GENSRC_OSX_ICONS = $(GENSRC_OSX_ICONS_DST)/AWTIconData.h - GENSRC_OSX_ICONS_SRC = - GENSRC_OSX_ICONS_TMP = $(JDK_OUTPUTDIR)/gensrc - GENSRC_OSX_ICONS_DST = $(GENSRC_OSX_ICONS_TMP)/sun/osxapp - -$(GENSRC_OSX_ICONS_DST)/AWTIconData.h: \ - $(JDK_TOPDIR)/src/macosx/native/sun/osxapp/resource/icons/JavaApp.icns + GENSRC_OSX_ICONS_TMP := $(JDK_OUTPUTDIR)/gensrc + GENSRC_OSX_ICONS_DST := $(GENSRC_OSX_ICONS_TMP)/sun/osxapp + 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 + else + GENSRC_OSX_ICONS_SRC := $(JDK_TOPDIR)/src/closed/macosx/native/sun/osxapp/resource/icons/JavaApp.icns + endif + +$(GENSRC_OSX_ICONS_DST)/AWTIconData.h: $(GENSRC_OSX_ICONS_SRC) $(RM) $@ $@.tmp $(MKDIR) -p $(dir $@) $(ECHO) "static unsigned char sAWTIconData[] = { " >> $@.tmp