jdk/make/Tools.gmk

*** 24,58 ****
  #
  
  ifndef _TOOLS_GMK
  _TOOLS_GMK := 1
  
- default: all
- 
- include $(SPEC)
- include MakeBase.gmk
  include JavaCompilation.gmk
- include NativeCompilation.gmk
- include SetupJavaCompilers.gmk
  
  ################################################################################
! 
! $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \
!     SETUP := GENERATE_OLDBYTECODE, \
!     ADD_JAVAC_FLAGS := -Xbootclasspath/p:$(call PathList, \
!         $(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes \
!         $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes), \
!     SRC := $(JDK_TOPDIR)/make/src/classes $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes, \
!     BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
!     COPY := boot.modules ext.modules))
! 
! $(eval $(call SetupCopyFiles,COPY_NIMBUS_TEMPLATES, \
!     SRC := $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus, \
!     DEST := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/generatenimbus/resources, \
!     FILES := $(wildcard $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template)))
! 
! BUILD_TOOLS_JDK += $(COPY_NIMBUS_TEMPLATES)
  
  ################################################################################
  
  # Add a checksum ("jsum") to the end of a text file. Prevents trivial tampering with class lists.
  TOOL_ADDJSUM = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
--- 24,41 ----
  #
  
  ifndef _TOOLS_GMK
  _TOOLS_GMK := 1
  
  include JavaCompilation.gmk
  
  ################################################################################
! # To avoid reevaluating the compilation setup for the tools each time this file
! # is included, the actual compilation is handled by CompileTools.gmk. The
! # following trick is used to be able to declare a dependency on the built tools.
! BUILD_TOOLS_JDK := $(call SetupJavaCompilationCompileTarget, \
!     BUILD_TOOLS_JDK, $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes)
  
  ################################################################################
  
  # Add a checksum ("jsum") to the end of a text file. Prevents trivial tampering with class lists.
  TOOL_ADDJSUM = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
*** 133,168 ****
  
  TOOL_IMAGEBUILDER = $(JAVA_SMALL) -Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes \
      -cp $(call PathList, $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes $(JDK_OUTPUTDIR)) \
      build.tools.module.ImageBuilder
  
- ##########################################################################################
- 
- JIMAGE_PKGS := \
-     jdk/internal/jimage \
-     jdk/internal/jrtfs \
-     #
- 
- $(eval $(call SetupJavaCompilation,BUILD_INTERIM_JIMAGE, \
-     SETUP := GENERATE_OLDBYTECODE, \
-     SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
-     INCLUDES := $(JIMAGE_PKGS), \
-     BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes))
- 
- # Because of the explicit INCLUDES in the compilation setup above, the service provider
- # file will not be copied unless META-INF/services would also be added to the INCLUDES.
- # Adding META-INF/services would include all files in that directory when only the one
- # is needed, which is why this explicit copy is defined instead.
- $(eval $(call SetupCopyFiles,COPY_JIMAGE_SERVICE_PROVIDER, \
-     SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
-     DEST := $(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes, \
-     FILES := META-INF/services/java.nio.file.spi.FileSystemProvider))
- 
- ##########################################################################################
- 
- $(BUILD_TOOLS_JDK): $(BUILD_INTERIM_JIMAGE) $(COPY_JIMAGE_SERVICE_PROVIDER)
- 
- java-tools: $(BUILD_TOOLS_JDK)
- 
- all: java-tools
- 
  endif # _TOOLS_GMK
--- 116,121 ----