jdk/make/gensrc/GensrcMisc.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 51,74 ****
      $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
  
  $(eval $(call SetupNativeCompilation, BUILD_GENSRC_SOR_EXE, \
      SRC := $(GENSRC_SOR_SRC), \
      INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \
      TOOLCHAIN := TOOLCHAIN_BUILD, \
      OBJECT_DIR := $(GENSRC_SOR_BIN), \
      OUTPUT_DIR := $(GENSRC_SOR_BIN), \
      PROGRAM := genSocketOptionRegistry))
  
  SOR_PREGEN_FILE := $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template
  
  ifeq ($(wildcard $(SOR_PREGEN_FILE)), )
!   $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java: $(BUILD_GENSRC_SOR_EXE)
          $(MKDIR) -p $(@D)
          $(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
    $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java: $(SOR_PREGEN_FILE)
          $(call install-file)
  endif
--- 51,76 ----
      $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
  
  $(eval $(call SetupNativeCompilation, BUILD_GENSRC_SOR_EXE, \
      SRC := $(GENSRC_SOR_SRC), \
      INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \
+     CFLAGS_windows := -nologo, \
+     LDFLAGS_windows := -nologo, \
      TOOLCHAIN := TOOLCHAIN_BUILD, \
      OBJECT_DIR := $(GENSRC_SOR_BIN), \
      OUTPUT_DIR := $(GENSRC_SOR_BIN), \
      PROGRAM := genSocketOptionRegistry))
  
  SOR_PREGEN_FILE := $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template
  
  ifeq ($(wildcard $(SOR_PREGEN_FILE)), )
!   $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java: $(BUILD_GENSRC_SOR_EXE_TARGET)
          $(MKDIR) -p $(@D)
          $(RM) $@ $@.tmp
          NAWK="$(NAWK)" SH="$(SH)" $(SH) -e \
              $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@.tmp
!         $(BUILD_GENSRC_SOR_EXE_TARGET) >> $@.tmp
          $(MV) $@.tmp $@
  else
    $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java: $(SOR_PREGEN_FILE)
          $(call install-file)
  endif
*** 95,110 ****
        PROGRAM := genUnixConstants))
  
    UC_PREGEN_FILE := $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template
  
    ifeq ($(wildcard $(UC_PREGEN_FILE)), )
!     $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java: $(BUILD_GENSRC_UC_EXE)
          $(MKDIR) -p $(@D)
          $(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
      $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java: $(UC_PREGEN_FILE)
          $(call install-file)
    endif
--- 97,112 ----
        PROGRAM := genUnixConstants))
  
    UC_PREGEN_FILE := $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template
  
    ifeq ($(wildcard $(UC_PREGEN_FILE)), )
!     $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java: $(BUILD_GENSRC_UC_EXE_TARGET)
          $(MKDIR) -p $(@D)
          $(RM) $@ $@.tmp
          NAWK="$(NAWK)" SH="$(SH)" $(SH) -e \
              $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(UC_COPYRIGHT_YEARS)" > $@.tmp
!         $(BUILD_GENSRC_UC_EXE_TARGET) >> $@.tmp
          $(MV) $@.tmp $@
    else
      $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java: $(UC_PREGEN_FILE)
          $(call install-file)
    endif
*** 130,145 ****
        TOOLCHAIN := TOOLCHAIN_BUILD, \
        OBJECT_DIR := $(GENSRC_SOL_BIN), \
        OUTPUT_DIR := $(GENSRC_SOL_BIN), \
        PROGRAM := genSolarisConstants))
  
!   $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/SolarisConstants.java: $(BUILD_GENSRC_SOL_EXE)
          $(MKDIR) -p $(@D)
          $(RM) $@ $@.tmp
          NAWK="$(NAWK)" SH="$(SH)" $(SH) -e \
              $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(SOL_COPYRIGHT_YEARS)" > $@.tmp
!         $(BUILD_GENSRC_SOL_EXE) >> $@.tmp
          $(MV) $@.tmp $@
  
  
  endif
  
--- 132,147 ----
        TOOLCHAIN := TOOLCHAIN_BUILD, \
        OBJECT_DIR := $(GENSRC_SOL_BIN), \
        OUTPUT_DIR := $(GENSRC_SOL_BIN), \
        PROGRAM := genSolarisConstants))
  
!   $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/SolarisConstants.java: $(BUILD_GENSRC_SOL_EXE_TARGET)
          $(MKDIR) -p $(@D)
          $(RM) $@ $@.tmp
          NAWK="$(NAWK)" SH="$(SH)" $(SH) -e \
              $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(SOL_COPYRIGHT_YEARS)" > $@.tmp
!         $(BUILD_GENSRC_SOL_EXE_TARGET) >> $@.tmp
          $(MV) $@.tmp $@
  
  
  endif