Mercurial Mercurial > jdk-sandbox / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
jdk/make/Tools.gmk
changeset 27565 729f9700483a
parent 26227 aa7ada31eb77
child 28658 344426303820
equal deleted inserted replaced
27564:eaaa79b68cd5 27565:729f9700483a 
    36 
    36 
    37 # The exception handling of swing beaninfo which have the own tool directory
 
    37 # The exception handling of swing beaninfo which have the own tool directory
 
    38 ifeq (, $(BUILD_TOOLS_JDK))
 
    38 ifeq (, $(BUILD_TOOLS_JDK))
 
    39   $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \
 
    39   $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \
 
    40       SETUP := GENERATE_OLDBYTECODE, \
 
    40       SETUP := GENERATE_OLDBYTECODE, \
 
       
    41       ADD_JAVAC_FLAGS := "-Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes", \
 
    41       SRC := $(JDK_TOPDIR)/make/src/classes, \
 
    42       SRC := $(JDK_TOPDIR)/make/src/classes, \
 
    42       BIN := $(JDK_OUTPUTDIR)/btclasses))
 
    43       BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
 
       
    44       COPY := boot.modules ext.modules))
 
    43 endif
 
    45 endif
 
    44 
    46 
    45 $(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/%.template: \
 
    47 $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/generatenimbus/resources/%.template: \
 
    46     $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/%.template
 
    48     $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/%.template
 
    47 	$(call install-file)
 
    49 	$(call install-file)
 
    48 
    50 
    49 BUILD_TOOLS_JDK += $(foreach i, $(wildcard $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template), $(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/$(notdir $i))
 
    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))
 
    50 
    52 
    51 # Resource used by CheckDeps tool
 
    53 # Resource used by CheckDeps tool
 
    52 $(JDK_OUTPUTDIR)/btclasses/build/tools/deps/refs.allowed: \
 
    54 $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/deps/refs.allowed: \
 
    53     $(JDK_TOPDIR)/make/data/checkdeps/refs.allowed
 
    55     $(JDK_TOPDIR)/make/data/checkdeps/refs.allowed
 
    54 	$(call install-file)
 
    56 	$(call install-file)
 
    55 
    57 
    56 BUILD_TOOLS_JDK += $(JDK_OUTPUTDIR)/btclasses/build/tools/deps/refs.allowed
 
    58 BUILD_TOOLS_JDK += $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/deps/refs.allowed
 
    57 
    59 
    58 # Add a checksum ("jsum") to the end of a text file. Prevents trivial tampering with class lists.
 
    60 # Add a checksum ("jsum") to the end of a text file. Prevents trivial tampering with class lists.
 
    59 TOOL_ADDJSUM = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
    61 TOOL_ADDJSUM = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
    60     build.tools.addjsum.AddJsum
 
    62     build.tools.addjsum.AddJsum
 
    61 
    63 
    62 # The buildmetaindex tool creates a meta-index to make core class loaders lazier.
 
    64 # The buildmetaindex tool creates a meta-index to make core class loaders lazier.
 
    63 TOOL_BUILDMETAINDEX = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
    65 TOOL_BUILDMETAINDEX = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
    64     build.tools.buildmetaindex.BuildMetaIndex
 
    66     build.tools.buildmetaindex.BuildMetaIndex
 
    65 
    67 
    66 TOOL_COMPILEFONTCONFIG = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
    68 TOOL_COMPILEFONTCONFIG = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
    67     build.tools.compilefontconfig.CompileFontConfig
 
    69     build.tools.compilefontconfig.CompileFontConfig
 
    68 
    70 
    69 TOOL_COMPILEPROPERTIES = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
    71 TOOL_COMPILEPROPERTIES = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
    70     build.tools.compileproperties.CompileProperties
 
    72     build.tools.compileproperties.CompileProperties
 
    71 
    73 
    72 TOOL_JARREORDER = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
    74 TOOL_JARREORDER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
    73     build.tools.jarreorder.JarReorder
 
    75     build.tools.jarreorder.JarReorder
 
    74 
    76 
    75 TOOL_GENERATECHARACTER = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
    77 TOOL_GENERATECHARACTER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
    76     build.tools.generatecharacter.GenerateCharacter
 
    78     build.tools.generatecharacter.GenerateCharacter
 
    77 
    79 
    78 TOOL_CHARACTERNAME = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
    80 TOOL_CHARACTERNAME = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
    79     build.tools.generatecharacter.CharacterName
 
    81     build.tools.generatecharacter.CharacterName
 
    80 
    82 
    81 TOOL_DTDBUILDER = $(JAVA_SMALL) -Ddtd_home=$(JDK_TOPDIR)/make/data/dtdbuilder \
 
    83 TOOL_DTDBUILDER = $(JAVA_SMALL) -Ddtd_home=$(JDK_TOPDIR)/make/data/dtdbuilder \
 
    82     -Djava.awt.headless=true \
 
    84     -Djava.awt.headless=true \
 
    83     -cp $(JDK_OUTPUTDIR)/btclasses build.tools.dtdbuilder.DTDBuilder
 
    85     -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.dtdbuilder.DTDBuilder
 
    84 
    86 
    85 TOOL_GENERATEBREAKITERATORDATA = $(JAVA_SMALL) \
 
    87 TOOL_GENERATEBREAKITERATORDATA = $(JAVA_SMALL) \
 
    86     -cp $(JDK_OUTPUTDIR)/btclasses \
 
    88     -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
    87     build.tools.generatebreakiteratordata.GenerateBreakIteratorData
 
    89     build.tools.generatebreakiteratordata.GenerateBreakIteratorData
 
    88 
    90 
    89 TOOL_GENERATECURRENCYDATA = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
    91 TOOL_GENERATECURRENCYDATA = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
    90     build.tools.generatecurrencydata.GenerateCurrencyData
 
    92     build.tools.generatecurrencydata.GenerateCurrencyData
 
    91 
    93 
    92 TOOL_HASHER = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
    94 TOOL_HASHER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
    93     build.tools.hasher.Hasher
 
    95     build.tools.hasher.Hasher
 
    94 
    96 
    95 TOOL_TZDB = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
    97 TOOL_TZDB = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
    96     build.tools.tzdb.TzdbZoneRulesCompiler
 
    98     build.tools.tzdb.TzdbZoneRulesCompiler
 
    97 
    99 
    98 TOOL_BLACKLISTED_CERTS = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
   100 TOOL_BLACKLISTED_CERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
    99     build.tools.blacklistedcertsconverter.BlacklistedCertsConverter
 
   101     build.tools.blacklistedcertsconverter.BlacklistedCertsConverter
 
   100 
   102 
   101 TOOL_MAKEJAVASECURITY = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
   103 TOOL_MAKEJAVASECURITY = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
   102     build.tools.makejavasecurity.MakeJavaSecurity
 
   104     build.tools.makejavasecurity.MakeJavaSecurity
 
   103 
   105 
   104 
   106 
   105 # TODO: There are references to the jdwpgen.jar in jdk/make/netbeans/jdwpgen/build.xml
 
   107 # TODO: There are references to the jdwpgen.jar in jdk/make/netbeans/jdwpgen/build.xml
 
   106 # and nbproject/project.properties in the same dir. Needs to be looked at.
 
   108 # and nbproject/project.properties in the same dir. Needs to be looked at.
 
   107 TOOL_JDWPGEN = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses build.tools.jdwpgen.Main
 
   109 TOOL_JDWPGEN = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.jdwpgen.Main
 
   108 
   110 
   109 # TODO: Lots of files in jdk/make/tools/CharsetMapping dir
 
   111 # TODO: Lots of files in jdk/make/tools/CharsetMapping dir
 
   110 TOOL_CHARSETMAPPING = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
   112 TOOL_CHARSETMAPPING = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
   111     build.tools.charsetmapping.Main $(LOG_INFO)
 
   113     build.tools.charsetmapping.Main $(LOG_INFO)
 
   112 
   114 
   113 TOOL_SPP = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses build.tools.spp.Spp
 
   115 TOOL_SPP = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.spp.Spp
 
   114 
   116 
   115 # Nimbus is used somewhere in the swing build.
 
   117 # Nimbus is used somewhere in the swing build.
 
   116 TOOL_GENERATENIMBUS = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
   118 TOOL_GENERATENIMBUS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
   117     build.tools.generatenimbus.Generator
 
   119     build.tools.generatenimbus.Generator
 
   118 
   120 
   119 TOOL_WRAPPERGENERATOR = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
   121 TOOL_WRAPPERGENERATOR = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
   120     build.tools.x11wrappergen.WrapperGenerator
 
   122     build.tools.x11wrappergen.WrapperGenerator
 
   121 
   123 
   122 TOOL_AWT_TOBIN = $(JAVA_SMALL) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
 
   124 TOOL_AWT_TOBIN = $(JAVA_SMALL) -Djava.awt.headless=true -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
   123     build.tools.icondata.awt.ToBin
 
   125     build.tools.icondata.awt.ToBin
 
   124 
   126 
   125 TOOL_OSX_TOBIN = $(JAVA_SMALL) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
 
   127 TOOL_OSX_TOBIN = $(JAVA_SMALL) -Djava.awt.headless=true -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
   126     build.tools.icondata.osxapp.ToBin
 
   128     build.tools.icondata.osxapp.ToBin
 
   127 
   129 
   128 TOOL_CLDRCONVERTER = $(JAVA_SMALL) -cp $(JDK_OUTPUTDIR)/btclasses \
 
   130 TOOL_CLDRCONVERTER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
 
   129     build.tools.cldrconverter.CLDRConverter
 
   131     build.tools.cldrconverter.CLDRConverter
 
   130 
   132 
   131 TOOL_CHECKDEPS = $(JAVA_SMALL) -Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR) \
 
   133 TOOL_CHECKDEPS = $(JAVA_SMALL) -Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR) \
 
   132     -cp "$(JDK_OUTPUTDIR)/btclasses$(PATH_SEP)$(JDK_OUTPUTDIR)" \
 
   134     -cp "$(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes$(PATH_SEP)$(JDK_OUTPUTDIR)" \
 
   133     build.tools.deps.CheckDeps
 
   135     build.tools.deps.CheckDeps
 
   134 
   136 
   135 TOOL_GENMODULESXML = $(JAVA_SMALL) -Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR) \
 
   137 TOOL_GENMODULESXML = $(JAVA_SMALL) -Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR) \
 
   136     -cp "$(JDK_OUTPUTDIR)/btclasses$(PATH_SEP)$(JDK_OUTPUTDIR)" \
 
   138     -cp "$(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes$(PATH_SEP)$(JDK_OUTPUTDIR)" \
 
   137     build.tools.module.GenJdepsModulesXml
 
   139     build.tools.module.GenJdepsModulesXml
 
       
   140 
       
   141 TOOL_IMAGEBUILDER = $(JAVA_SMALL) -Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes \
 
       
   142     -cp "$(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes$(PATH_SEP)$(JDK_OUTPUTDIR)" \
 
       
   143     build.tools.module.ImageBuilder
 
       
   144 
       
   145 ##########################################################################################
 
       
   146 
       
   147 JIMAGE_PKGS := \
 
       
   148     jdk/internal/jimage \
 
       
   149     jdk/internal/jrtfs \
 
       
   150     #
 
       
   151 
       
   152 $(eval $(call SetupJavaCompilation,BUILD_INTERIM_JIMAGE, \
 
       
   153     SETUP := GENERATE_OLDBYTECODE, \
 
       
   154     SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
 
       
   155     INCLUDES := $(JIMAGE_PKGS), \
 
       
   156     EXCLUDES := jdk/internal/jimage/concurrent, \
 
       
   157     BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes))
 
   138 
   158 
   139 ##########################################################################################
 
   159 ##########################################################################################
 
   140 
   160 
   141 # Tools needed on solaris because OBJCOPY is broken.
 
   161 # Tools needed on solaris because OBJCOPY is broken.
 
   142 
   162 
   145     SRC := $(JDK_TOPDIR)/make/src/native/add_gnu_debuglink, \
 
   165     SRC := $(JDK_TOPDIR)/make/src/native/add_gnu_debuglink, \
 
   146     LANG := C, \
 
   166     LANG := C, \
 
   147     CC := $(BUILD_CC), \
 
   167     CC := $(BUILD_CC), \
 
   148     LDEXE := $(BUILD_LD), \
 
   168     LDEXE := $(BUILD_LD), \
 
   149     LDFLAGS := -lelf, \
 
   169     LDFLAGS := -lelf, \
 
   150     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/add_gnu_debuglink, \
 
   170     OBJECT_DIR := $(BUILDTOOLS_OUTPUTDIR)/objs/add_gnu_debuglink, \
 
   151     OUTPUT_DIR := $(JDK_OUTPUTDIR)/btbin, \
 
   171     OUTPUT_DIR := $(BUILDTOOLS_OUTPUTDIR)/bin, \
 
   152     PROGRAM := add_gnu_debuglink))
 
   172     PROGRAM := add_gnu_debuglink))
 
   153 
   173 
   154 $(eval $(call SetupNativeCompilation,FIX_EMPTY_SEC_HDR_FLAGS, \
 
   174 $(eval $(call SetupNativeCompilation,FIX_EMPTY_SEC_HDR_FLAGS, \
 
   155     SRC := $(JDK_TOPDIR)/make/src/native/fix_empty_sec_hdr_flags, \
 
   175     SRC := $(JDK_TOPDIR)/make/src/native/fix_empty_sec_hdr_flags, \
 
   156     LANG := C, \
 
   176     LANG := C, \
 
   157     CC := $(BUILD_CC), \
 
   177     CC := $(BUILD_CC), \
 
   158     LDEXE := $(BUILD_LD), \
 
   178     LDEXE := $(BUILD_LD), \
 
   159     LDFLAGS := -lelf, \
 
   179     LDFLAGS := -lelf, \
 
   160     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/fix_empty_sec_hdr_flags, \
 
   180     OBJECT_DIR := $(BUILDTOOLS_OUTPUTDIR)/objs/fix_empty_sec_hdr_flags, \
 
   161     OUTPUT_DIR := $(JDK_OUTPUTDIR)/btbin, \
 
   181     OUTPUT_DIR := $(BUILDTOOLS_OUTPUTDIR)/bin, \
 
   162     PROGRAM := fix_empty_sec_hdr_flags))
 
   182     PROGRAM := fix_empty_sec_hdr_flags))
 
   163 endif
 
   183 endif
 
       
   184 
       
   185 $(BUILD_TOOLS_JDK): $(BUILD_INTERIM_JIMAGE)
 
   164 
   186 
   165 java-tools: $(BUILD_TOOLS_JDK)
 
   187 java-tools: $(BUILD_TOOLS_JDK)
 
   166 
   188 
   167 all: java-tools
 
   189 all: java-tools
 
   168 
   190
jdk-sandbox