jdk Cdiff make/gensrc/GensrcMisc.gmk

make/gensrc/GensrcMisc.gmk


*** 81,93 ****
  
  ##########################################################################################
  
  GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java
  
! GENSRC_SOR_SRC := $(JDK_TOPDIR)/src/share/native/sun/nio/ch
  GENSRC_SOR_SRC_FILE := genSocketOptionRegistry.c
! GENSRC_SOR_BIN := $(JDK_OUTPUTDIR)/gensrc/genSocketOptionRegistry
  
  SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOR_SRC)/$(GENSRC_SOR_SRC_FILE) | \
      $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
  
  $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE, \
--- 81,93 ----
  
  ##########################################################################################
  
  GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java
  
! GENSRC_SOR_SRC := $(JDK_TOPDIR)/make/src/native/genconstants
  GENSRC_SOR_SRC_FILE := genSocketOptionRegistry.c
! GENSRC_SOR_BIN := $(JDK_OUTPUTDIR)/btnative/genSocketOptionRegistry
  
  SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOR_SRC)/$(GENSRC_SOR_SRC_FILE) | \
      $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
  
  $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE, \
*** 98,108 ****
      LDEXE := $(BUILD_LD), \
      OBJECT_DIR := $(GENSRC_SOR_BIN), \
      OUTPUT_DIR := $(GENSRC_SOR_BIN), \
      PROGRAM := genSocketOptionRegistry))
  
! ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java), )
    HAS_SOCKET_OPTION_REGISTRY := true
  endif
  
  ifneq ($(HAS_SOCKET_OPTION_REGISTRY), true)
    $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java: $(BUILD_GENSRC_SOR_EXE)
--- 98,108 ----
      LDEXE := $(BUILD_LD), \
      OBJECT_DIR := $(GENSRC_SOR_BIN), \
      OUTPUT_DIR := $(GENSRC_SOR_BIN), \
      PROGRAM := genSocketOptionRegistry))
  
! ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template), )
    HAS_SOCKET_OPTION_REGISTRY := true
  endif
  
  ifneq ($(HAS_SOCKET_OPTION_REGISTRY), true)
    $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java: $(BUILD_GENSRC_SOR_EXE)
*** 110,132 ****
          $(RM) $@ $@.tmp
          NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@.tmp
          $(BUILD_GENSRC_SOR_EXE) >> $@.tmp
          $(MV) $@.tmp $@
  else
!   $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java: $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java
          $(call install-file)
  endif
  
  ##########################################################################################
  
  ifneq ($(OPENJDK_TARGET_OS), windows)
  
    GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java
  
!   GENSRC_UC_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
    GENSRC_UC_SRC_FILE := genUnixConstants.c
!   GENSRC_UC_BIN := $(JDK_OUTPUTDIR)/gensrc/genUnixConstants
  
    UC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_UC_SRC)/$(GENSRC_UC_SRC_FILE) | \
        $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
  
    $(eval $(call SetupNativeCompilation,BUILD_GENSRC_UC_EXE, \
--- 110,133 ----
          $(RM) $@ $@.tmp
          NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@.tmp
          $(BUILD_GENSRC_SOR_EXE) >> $@.tmp
          $(MV) $@.tmp $@
  else
!   $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java: \
!       $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template
          $(call install-file)
  endif
  
  ##########################################################################################
  
  ifneq ($(OPENJDK_TARGET_OS), windows)
  
    GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java
  
!   GENSRC_UC_SRC := $(JDK_TOPDIR)/make/src/native/genconstants
    GENSRC_UC_SRC_FILE := genUnixConstants.c
!   GENSRC_UC_BIN := $(JDK_OUTPUTDIR)/btnative/genUnixConstants
  
    UC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_UC_SRC)/$(GENSRC_UC_SRC_FILE) | \
        $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
  
    $(eval $(call SetupNativeCompilation,BUILD_GENSRC_UC_EXE, \
*** 138,148 ****
        CFLAGS := $(filter -D%, $(CFLAGS_JDKEXE)), \
        OBJECT_DIR := $(GENSRC_UC_BIN), \
        OUTPUT_DIR := $(GENSRC_UC_BIN), \
        PROGRAM := genUnixConstants))
  
!   ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java), )
      HAS_UNIX_CONSTANTS := true
    endif
  
    ifneq ($(HAS_UNIX_CONSTANTS), true)
      $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java: $(BUILD_GENSRC_UC_EXE)
--- 139,149 ----
        CFLAGS := $(filter -D%, $(CFLAGS_JDKEXE)), \
        OBJECT_DIR := $(GENSRC_UC_BIN), \
        OUTPUT_DIR := $(GENSRC_UC_BIN), \
        PROGRAM := genUnixConstants))
  
!   ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template), )
      HAS_UNIX_CONSTANTS := true
    endif
  
    ifneq ($(HAS_UNIX_CONSTANTS), true)
      $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java: $(BUILD_GENSRC_UC_EXE)
*** 150,160 ****
          $(RM) $@ $@.tmp
          NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(UC_COPYRIGHT_YEARS)" > $@.tmp
          $(BUILD_GENSRC_UC_EXE) >> $@.tmp
          $(MV) $@.tmp $@
    else
!     $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java: $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java
          $(call install-file)
    endif
  
  endif
  
--- 151,162 ----
          $(RM) $@ $@.tmp
          NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(UC_COPYRIGHT_YEARS)" > $@.tmp
          $(BUILD_GENSRC_UC_EXE) >> $@.tmp
          $(MV) $@.tmp $@
    else
!     $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java: \
!         $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template
                  $(call install-file)
    endif
  
  endif
  
*** 162,174 ****
  
  ifeq ($(OPENJDK_TARGET_OS), solaris)
  
    GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java
  
!   GENSRC_SOL_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
    GENSRC_SOL_SRC_FILE := genSolarisConstants.c
!   GENSRC_SOL_BIN := $(JDK_OUTPUTDIR)/gensrc/genSolarisConstants
  
    SOL_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOL_SRC)/$(GENSRC_SOL_SRC_FILE) | \
        $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
  
    $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOL_EXE, \
--- 164,176 ----
  
  ifeq ($(OPENJDK_TARGET_OS), solaris)
  
    GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java
  
!   GENSRC_SOL_SRC := $(JDK_TOPDIR)/make/src/native/genconstants
    GENSRC_SOL_SRC_FILE := genSolarisConstants.c
!   GENSRC_SOL_BIN := $(JDK_OUTPUTDIR)/btnative/genSolarisConstants
  
    SOL_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOL_SRC)/$(GENSRC_SOL_SRC_FILE) | \
        $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
  
    $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOL_EXE, \