jdk/make/Tools.gmk
changeset 28658 344426303820
parent 27565 729f9700483a
child 28866 7ce02228e8f2
equal deleted inserted replaced
28657:e968ff5c0998 28658:344426303820
    32 include MakeBase.gmk
    32 include MakeBase.gmk
    33 include JavaCompilation.gmk
    33 include JavaCompilation.gmk
    34 include NativeCompilation.gmk
    34 include NativeCompilation.gmk
    35 include SetupJavaCompilers.gmk
    35 include SetupJavaCompilers.gmk
    36 
    36 
    37 # The exception handling of swing beaninfo which have the own tool directory
    37 ################################################################################
    38 ifeq (, $(BUILD_TOOLS_JDK))
       
    39   $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \
       
    40       SETUP := GENERATE_OLDBYTECODE, \
       
    41       ADD_JAVAC_FLAGS := "-Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes", \
       
    42       SRC := $(JDK_TOPDIR)/make/src/classes, \
       
    43       BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
       
    44       COPY := boot.modules ext.modules))
       
    45 endif
       
    46 
    38 
    47 $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/generatenimbus/resources/%.template: \
    39 $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \
    48     $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/%.template
    40     SETUP := GENERATE_OLDBYTECODE, \
    49 	$(call install-file)
    41     ADD_JAVAC_FLAGS := "-Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes", \
       
    42     SRC := $(JDK_TOPDIR)/make/src/classes, \
       
    43     BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
       
    44     COPY := boot.modules ext.modules))
    50 
    45 
    51 BUILD_TOOLS_JDK += $(foreach i, $(wildcard $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template), $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/generatenimbus/resources/$(notdir $i))
    46 $(eval $(call SetupCopyFiles,COPY_NIMBUS_TEMPLATES, \
       
    47     SRC := $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus, \
       
    48     DEST := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/generatenimbus/resources, \
       
    49     FILES := $(wildcard $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template)))
    52 
    50 
    53 # Resource used by CheckDeps tool
    51 BUILD_TOOLS_JDK += $(COPY_NIMBUS_TEMPLATES)
    54 $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/deps/refs.allowed: \
       
    55     $(JDK_TOPDIR)/make/data/checkdeps/refs.allowed
       
    56 	$(call install-file)
       
    57 
    52 
    58 BUILD_TOOLS_JDK += $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/deps/refs.allowed
    53 ################################################################################
    59 
    54 
    60 # Add a checksum ("jsum") to the end of a text file. Prevents trivial tampering with class lists.
    55 # Add a checksum ("jsum") to the end of a text file. Prevents trivial tampering with class lists.
    61 TOOL_ADDJSUM = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
    56 TOOL_ADDJSUM = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
    62     build.tools.addjsum.AddJsum
    57     build.tools.addjsum.AddJsum
    63 
    58 
   128     build.tools.icondata.osxapp.ToBin
   123     build.tools.icondata.osxapp.ToBin
   129 
   124 
   130 TOOL_CLDRCONVERTER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
   125 TOOL_CLDRCONVERTER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
   131     build.tools.cldrconverter.CLDRConverter
   126     build.tools.cldrconverter.CLDRConverter
   132 
   127 
   133 TOOL_CHECKDEPS = $(JAVA_SMALL) -Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR) \
       
   134     -cp "$(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes$(PATH_SEP)$(JDK_OUTPUTDIR)" \
       
   135     build.tools.deps.CheckDeps
       
   136 
       
   137 TOOL_GENMODULESXML = $(JAVA_SMALL) -Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR) \
   128 TOOL_GENMODULESXML = $(JAVA_SMALL) -Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR) \
   138     -cp "$(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes$(PATH_SEP)$(JDK_OUTPUTDIR)" \
   129     -cp "$(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes$(PATH_SEP)$(JDK_OUTPUTDIR)" \
   139     build.tools.module.GenJdepsModulesXml
   130     build.tools.module.GenJdepsModulesXml
   140 
   131 
   141 TOOL_IMAGEBUILDER = $(JAVA_SMALL) -Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes \
   132 TOOL_IMAGEBUILDER = $(JAVA_SMALL) -Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes \
   159 ##########################################################################################
   150 ##########################################################################################
   160 
   151 
   161 # Tools needed on solaris because OBJCOPY is broken.
   152 # Tools needed on solaris because OBJCOPY is broken.
   162 
   153 
   163 ifeq ($(OPENJDK_TARGET_OS), solaris)
   154 ifeq ($(OPENJDK_TARGET_OS), solaris)
   164 $(eval $(call SetupNativeCompilation,ADD_GNU_DEBUGLINK, \
   155   $(eval $(call SetupNativeCompilation,ADD_GNU_DEBUGLINK, \
   165     SRC := $(JDK_TOPDIR)/make/src/native/add_gnu_debuglink, \
   156       SRC := $(JDK_TOPDIR)/make/src/native/add_gnu_debuglink, \
   166     LANG := C, \
   157       LANG := C, \
   167     CC := $(BUILD_CC), \
   158       CC := $(BUILD_CC), \
   168     LDEXE := $(BUILD_LD), \
   159       LDEXE := $(BUILD_LD), \
   169     LDFLAGS := -lelf, \
   160       LDFLAGS := -lelf, \
   170     OBJECT_DIR := $(BUILDTOOLS_OUTPUTDIR)/objs/add_gnu_debuglink, \
   161       OBJECT_DIR := $(BUILDTOOLS_OUTPUTDIR)/objs/add_gnu_debuglink, \
   171     OUTPUT_DIR := $(BUILDTOOLS_OUTPUTDIR)/bin, \
   162       OUTPUT_DIR := $(BUILDTOOLS_OUTPUTDIR)/bin, \
   172     PROGRAM := add_gnu_debuglink))
   163       PROGRAM := add_gnu_debuglink))
   173 
   164 
   174 $(eval $(call SetupNativeCompilation,FIX_EMPTY_SEC_HDR_FLAGS, \
   165   $(eval $(call SetupNativeCompilation,FIX_EMPTY_SEC_HDR_FLAGS, \
   175     SRC := $(JDK_TOPDIR)/make/src/native/fix_empty_sec_hdr_flags, \
   166       SRC := $(JDK_TOPDIR)/make/src/native/fix_empty_sec_hdr_flags, \
   176     LANG := C, \
   167       LANG := C, \
   177     CC := $(BUILD_CC), \
   168       CC := $(BUILD_CC), \
   178     LDEXE := $(BUILD_LD), \
   169       LDEXE := $(BUILD_LD), \
   179     LDFLAGS := -lelf, \
   170       LDFLAGS := -lelf, \
   180     OBJECT_DIR := $(BUILDTOOLS_OUTPUTDIR)/objs/fix_empty_sec_hdr_flags, \
   171       OBJECT_DIR := $(BUILDTOOLS_OUTPUTDIR)/objs/fix_empty_sec_hdr_flags, \
   181     OUTPUT_DIR := $(BUILDTOOLS_OUTPUTDIR)/bin, \
   172       OUTPUT_DIR := $(BUILDTOOLS_OUTPUTDIR)/bin, \
   182     PROGRAM := fix_empty_sec_hdr_flags))
   173       PROGRAM := fix_empty_sec_hdr_flags))
   183 endif
   174 endif
   184 
   175 
   185 $(BUILD_TOOLS_JDK): $(BUILD_INTERIM_JIMAGE)
   176 $(BUILD_TOOLS_JDK): $(BUILD_INTERIM_JIMAGE)
   186 
   177 
   187 java-tools: $(BUILD_TOOLS_JDK)
   178 java-tools: $(BUILD_TOOLS_JDK)