Yasumasa, I think it's better to have a complete fix rather than yet another workaround.
Could you move gif files to correct location and remove custom makefile logic? I'll sponsor the push then. -Dmitry On 2016-02-27 06:44, Yasumasa Suenaga wrote: > Hi Erik, > > Thanks! > I've uploaded new webrev. Could you review it? > http://cr.openjdk.java.net/~ysuenaga/JDK-8150723/webrev.01/ > >> However, the real fix is to move the gifs out of the images dir so that >> they have the correct subdir relative to the classes dir in both the >> source and the output. Then we can remove this whole SetupCopyFiles >> construct and just add .gif to jdk.hotspot.agent_COPY. > > Comments in CompileJavaModules.gmk are as below: > ------------ > ### Copy gif files > # Special handling to copy gif files in images/toolbarButtonGraphics \ > # -> classes/toolbarButtonGraphics. > # These can't be handled by COPY to SetupJavaCompilation since they chop off > # one directory level. > ------------ > > According to them, I guess that our fix makes expected behavior. > If we should fix as you say, I think that we work for it in another issue. > > > Thanks, > > Yasumasa > > > On 2016/02/27 1:59, Erik Joelsson wrote: >> Hello, >> >> Actually you only need this: >> >> erik at pilot:/localhome/hg/jdk9-dev$ hg diff >> diff -r c7be2a78c31b make/CompileJavaModules.gmk >> --- a/make/CompileJavaModules.gmk >> +++ b/make/CompileJavaModules.gmk >> @@ -381,7 +381,7 @@ >> DEST := $(JDK_OUTPUTDIR)/modules/$(MODULE), \ >> FILES := $(wildcard >> $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent/share/classes/images/*/*/*.gif), \ >> )) >> - jdk.hotspot.agent: $(COPY_SA_IMAGES) >> + jdk.hotspot.agent_COPY_EXTRA += $(COPY_SA_IMAGES) >> endif >> >> >> ################################################################################ >> >> However, the real fix is to move the gifs out of the images dir so that >> they have the correct subdir relative to the classes dir in both the >> source and the output. Then we can remove this whole SetupCopyFiles >> construct and just add .gif to jdk.hotspot.agent_COPY. >> >> /Erik >> >> On 2016-02-26 04:28, Yasumasa Suenaga wrote: >>> Hi all, >>> >>> HSDB toolbar icons >>> (hotspot/src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics) >>> are missing in appmodules.jimage . >>> They should be contained to appmodules.jimage . >>> >>> I've uploaded a webrev: >>> http://cr.openjdk.java.net/~ysuenaga/JDK-8150723/webrev.00/ >>> >>> Could you review it? >>> >>> >>> Thanks, >>> >>> Yasumasa >> >> -- Dmitry Samersoff Oracle Java development team, Saint Petersburg, Russia * I would love to change the world, but they won't give me the sources.
