jdk/make/Tools.gmk
changeset 22967 bfcfd51c9e5c
parent 22650 4d27550a5a27
child 23236 7c5997f59e20
equal deleted inserted replaced
22966:b76a460d4246 22967:bfcfd51c9e5c
    24 #
    24 #
    25 
    25 
    26 # Cache all finds needed for this file. Only used on windows.
    26 # Cache all finds needed for this file. Only used on windows.
    27 $(eval $(call FillCacheFind, $(JDK_TOPDIR)/make/src/classes))
    27 $(eval $(call FillCacheFind, $(JDK_TOPDIR)/make/src/classes))
    28 
    28 
    29 TOOLS_SRC := $(JDK_TOPDIR)/make/src/classes
       
    30 
       
    31 ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
       
    32   TOOLS_SRC += $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator
       
    33 endif
       
    34 
       
    35 # The exception handling of swing beaninfo which have the own tool directory
    29 # The exception handling of swing beaninfo which have the own tool directory
    36 ifeq (, $(BUILD_TOOLS))
    30 ifeq (, $(BUILD_TOOLS))
    37   $(eval $(call SetupJavaCompilation,BUILD_TOOLS, \
    31   $(eval $(call SetupJavaCompilation,BUILD_TOOLS, \
    38       SETUP := GENERATE_OLDBYTECODE, \
    32       SETUP := GENERATE_OLDBYTECODE, \
    39       SRC := $(TOOLS_SRC), \
    33       SRC := $(JDK_TOPDIR)/make/src/classes, \
    40       BIN := $(JDK_OUTPUTDIR)/btclasses))
    34       BIN := $(JDK_OUTPUTDIR)/btclasses))
    41 endif
    35 endif
    42 
    36 
    43 $(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/%.template: \
    37 $(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/%.template: \
    44     $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/%.template
    38     $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/%.template
   109 # Nimbus is used somewhere in the swing build.
   103 # Nimbus is used somewhere in the swing build.
   110 TOOL_GENERATENIMBUS = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
   104 TOOL_GENERATENIMBUS = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
   111     build.tools.generatenimbus.Generator
   105     build.tools.generatenimbus.Generator
   112 
   106 
   113 TOOL_WRAPPERGENERATOR = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
   107 TOOL_WRAPPERGENERATOR = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
   114     WrapperGenerator
   108     build.tools.x11wrappergen.WrapperGenerator
   115 
   109 
   116 TOOL_AWT_TOBIN = $(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
   110 TOOL_AWT_TOBIN = $(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
   117     build.tools.icondata.awt.ToBin
   111     build.tools.icondata.awt.ToBin
   118 
   112 
   119 TOOL_OSX_TOBIN = $(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
   113 TOOL_OSX_TOBIN = $(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \