jdk/make/Tools.gmk

*** 32,63 ****
  include MakeBase.gmk
  include JavaCompilation.gmk
  include NativeCompilation.gmk
  include SetupJavaCompilers.gmk
  
! # The exception handling of swing beaninfo which have the own tool directory
! ifeq (, $(BUILD_TOOLS_JDK))
!   $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \
        SETUP := GENERATE_OLDBYTECODE, \
        ADD_JAVAC_FLAGS := "-Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes", \
        SRC := $(JDK_TOPDIR)/make/src/classes, \
        BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
!       COPY := boot.modules ext.modules))
! endif
  
! $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/generatenimbus/resources/%.template: \
!     $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/%.template
!         $(call install-file)
! 
! 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))
! 
! # Resource used by CheckDeps tool
! $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/deps/refs.allowed: \
!     $(JDK_TOPDIR)/make/data/checkdeps/refs.allowed
!         $(call install-file)
  
! BUILD_TOOLS_JDK += $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/deps/refs.allowed
  
  # 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 \
      build.tools.addjsum.AddJsum
  
--- 32,58 ----
  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:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes", \
      SRC := $(JDK_TOPDIR)/make/src/classes, \
      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
!     COPY := boot.modules ext.modules refs.allowed))
! 
! $(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 \
      build.tools.addjsum.AddJsum
  
*** 159,179 ****
  ##########################################################################################
  
  # Tools needed on solaris because OBJCOPY is broken.
  
  ifeq ($(OPENJDK_TARGET_OS), solaris)
! $(eval $(call SetupNativeCompilation,ADD_GNU_DEBUGLINK, \
      SRC := $(JDK_TOPDIR)/make/src/native/add_gnu_debuglink, \
      LANG := C, \
      CC := $(BUILD_CC), \
      LDEXE := $(BUILD_LD), \
      LDFLAGS := -lelf, \
      OBJECT_DIR := $(BUILDTOOLS_OUTPUTDIR)/objs/add_gnu_debuglink, \
      OUTPUT_DIR := $(BUILDTOOLS_OUTPUTDIR)/bin, \
      PROGRAM := add_gnu_debuglink))
  
! $(eval $(call SetupNativeCompilation,FIX_EMPTY_SEC_HDR_FLAGS, \
      SRC := $(JDK_TOPDIR)/make/src/native/fix_empty_sec_hdr_flags, \
      LANG := C, \
      CC := $(BUILD_CC), \
      LDEXE := $(BUILD_LD), \
      LDFLAGS := -lelf, \
--- 154,174 ----
  ##########################################################################################
  
  # Tools needed on solaris because OBJCOPY is broken.
  
  ifeq ($(OPENJDK_TARGET_OS), solaris)
!   $(eval $(call SetupNativeCompilation,ADD_GNU_DEBUGLINK, \
        SRC := $(JDK_TOPDIR)/make/src/native/add_gnu_debuglink, \
        LANG := C, \
        CC := $(BUILD_CC), \
        LDEXE := $(BUILD_LD), \
        LDFLAGS := -lelf, \
        OBJECT_DIR := $(BUILDTOOLS_OUTPUTDIR)/objs/add_gnu_debuglink, \
        OUTPUT_DIR := $(BUILDTOOLS_OUTPUTDIR)/bin, \
        PROGRAM := add_gnu_debuglink))
  
!   $(eval $(call SetupNativeCompilation,FIX_EMPTY_SEC_HDR_FLAGS, \
        SRC := $(JDK_TOPDIR)/make/src/native/fix_empty_sec_hdr_flags, \
        LANG := C, \
        CC := $(BUILD_CC), \
        LDEXE := $(BUILD_LD), \
        LDFLAGS := -lelf, \