Mercurial > hg > icedtea8-forest > jdk

changeset 14012:acab6dbdd0b5 jdk8u212-b02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8189761: COMPANY_NAME, IMPLEMENTOR, BUNDLE_VENDOR, VENDOR, but no configure flag Reviewed-by: erikj, dholmes
author simonis
date Fri, 29 Mar 2019 15:10:56 +0000
parents 43ca3768126e
children 20c8a9b1cc6e
files make/lib/CoreLibraries.gmk src/share/native/java/lang/System.c
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/lib/CoreLibraries.gmk	Wed Mar 20 17:07:28 2019 +0000
+++ b/make/lib/CoreLibraries.gmk	Fri Mar 29 15:10:56 2019 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, 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
@@ -169,7 +169,8 @@
 LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
     -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
     -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
-     -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'
+     -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'  \
+     $(VERSION_CFLAGS)
 
 ifneq (, $(JDK_UPDATE_VERSION))
   LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"'
--- a/src/share/native/java/lang/System.c	Wed Mar 20 17:07:28 2019 +0000
+++ b/src/share/native/java/lang/System.c	Fri Mar 29 15:10:56 2019 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, 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
@@ -108,9 +108,14 @@
         (*env)->DeleteLocalRef(env, jkey);                            \
     } else ((void) 0)
 
-#ifndef VENDOR /* Third party may overwrite this. */
+/* Third party may overwrite these values. */
+#ifndef VENDOR
 #define VENDOR "Oracle Corporation"
+#endif
+#ifndef VENDOR_URL
 #define VENDOR_URL "http://java.oracle.com/"
+#endif
+#ifndef VENDOR_URL_BUG
 #define VENDOR_URL_BUG "http://bugreport.sun.com/bugreport/"
 #endif