< prev index next >

make/gensrc/GensrcMisc.gmk

Print this page

        

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, 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

@@ -38,17 +38,11 @@
         @@VERSION_NUMBER@@ => $(VERSION_NUMBER) ; \
         @@VERSION_PRE@@ => $(VERSION_PRE) ; \
         @@VERSION_BUILD@@ => $(VERSION_BUILD) ; \
         @@VERSION_OPT@@ => $(VERSION_OPT) ; \
         @@VERSION_DATE@@ => $(VERSION_DATE) ; \
-        @@VERSION_CLASSFILE_MAJOR@@ => $(VERSION_CLASSFILE_MAJOR) ; \
-        @@VERSION_CLASSFILE_MINOR@@ => $(VERSION_CLASSFILE_MINOR) ; \
-        @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \
-        @@VENDOR_VERSION_STRING@@ => $(VENDOR_VERSION_STRING) ; \
-        @@VENDOR@@ => $(COMPANY_NAME) ; \
-        @@VENDOR_URL@@ => $(VENDOR_URL) ; \
-        @@VENDOR_URL_BUG@@ => $(VENDOR_URL_BUG), \
+        @@VENDOR_VERSION_STRING@@ => $(VENDOR_VERSION_STRING), \
 ))
 
 GENSRC_JAVA_BASE += $(BUILD_VERSION_JAVA)
 
 ################################################################################

@@ -68,19 +62,17 @@
 # that were added to variable references in the template files to avoid being
 # matched by the preprocessor. Remove any #line directives left by the
 # preprocessor.
 define generate-preproc-src
         $(call MakeDir, $(@D))
-        $(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/gensrc/java.base/_$(@F), \
-            ( $(NAWK) '/@@END_COPYRIGHT@@/{exit}1' $< && \
-              $(CPP) $(CPP_FLAGS) $(SYSROOT_CFLAGS) $(CFLAGS_JDKLIB) $< \
-                  2> >($(GREP) -v '^$(<F)$$' >&2) \
-                  | $(NAWK) '/@@START_HERE@@/,0' \
-                  |  $(SED) -e 's/@@START_HERE@@/\/\/ AUTOMATICALLY GENERATED FILE - DO NOT EDIT/' \
-                  -e 's/PREFIX_//' -e 's/^#.*//' \
-            ) > $@ \
-        )
+        ( $(NAWK) '/@@END_COPYRIGHT@@/{exit}1' $< && \
+          $(CPP) $(CPP_FLAGS) $(SYSROOT_CFLAGS) $(CFLAGS_JDKLIB) $< \
+              2> >($(GREP) -v '^$(<F)$$' >&2) \
+              | $(NAWK) '/@@START_HERE@@/,0' \
+              |  $(SED) -e 's/@@START_HERE@@/\/\/ AUTOMATICALLY GENERATED FILE - DO NOT EDIT/' \
+              -e 's/PREFIX_//' -e 's/^#.*//' \
+        ) > $@
 endef
 
 GENSRC_SOR_FILE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java
 
 $(GENSRC_SOR_FILE): \

@@ -89,11 +81,11 @@
 
 GENSRC_JAVA_BASE += $(GENSRC_SOR_FILE)
 
 ################################################################################
 
-ifeq ($(call isTargetOs, windows), false)
+ifneq ($(OPENJDK_TARGET_OS), windows)
 
   GENSRC_UC_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java
 
   $(GENSRC_UC_FILE): \
       $(TOPDIR)/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template

@@ -103,11 +95,11 @@
 
 endif
 
 ################################################################################
 
-ifeq ($(call isTargetOs, solaris), true)
+ifeq ($(OPENJDK_TARGET_OS), solaris)
 
   GENSRC_SC_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/SolarisConstants.java
 
   $(GENSRC_SC_FILE): \
       $(TOPDIR)/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template
< prev index next >