changeset 1270:d8565dd15c8a

Merge
author erikj
date Fri, 07 Nov 2014 12:45:05 +0100
parents 3854e60a6d22 723a67b0c442
children 20cd406508f1
files common/autoconf/generated-configure.sh common/bin/compare_exceptions.sh.incl common/bin/unshuffle_list.txt make/CompileJavaModules.gmk make/Images.gmk make/Main.gmk make/common/Modules.gmk modules.xml
diffstat 10 files changed, 15 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Fri Nov 07 11:15:36 2014 +0100
+++ b/common/autoconf/generated-configure.sh	Fri Nov 07 12:45:05 2014 +0100
@@ -4328,7 +4328,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1413880391
+DATE_WHEN_GENERATED=1415357710
 
 ###############################################################################
 #
@@ -20119,7 +20119,7 @@
     if test "x$USER_RELEASE_SUFFIX" = x; then
       BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
       # Avoid [:alnum:] since it depends on the locale.
-      CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
+      CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
       USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
     fi
   fi
--- a/common/autoconf/jdk-options.m4	Fri Nov 07 11:15:36 2014 +0100
+++ b/common/autoconf/jdk-options.m4	Fri Nov 07 12:45:05 2014 +0100
@@ -528,7 +528,7 @@
     if test "x$USER_RELEASE_SUFFIX" = x; then
       BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
       # Avoid [:alnum:] since it depends on the locale.
-      CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
+      CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
       USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
     fi
   fi
--- a/common/bin/compare_exceptions.sh.incl	Fri Nov 07 11:15:36 2014 +0100
+++ b/common/bin/compare_exceptions.sh.incl	Fri Nov 07 12:45:05 2014 +0100
@@ -71,7 +71,6 @@
 ./jre/lib/i386/libverify.so
 ./jre/lib/i386/server/libjvm.so
 ./bin/appletviewer
-./bin/extcheck
 ./bin/idlj
 ./bin/jar
 ./bin/jarsigner
@@ -161,7 +160,6 @@
 ./jre/lib/amd64/server/libjsig.so
 ./jre/lib/amd64/server/libjvm.so
 ./bin/appletviewer
-./bin/extcheck
 ./bin/idlj
 ./bin/jar
 ./bin/jarsigner
@@ -306,7 +304,6 @@
 ./jre/lib/i386/server/libjvm_db.so
 ./jre/lib/i386/server/libjvm_dtrace.so
 ./bin/appletviewer
-./bin/extcheck
 ./bin/idlj
 ./bin/jar
 ./bin/jarsigner
@@ -449,7 +446,6 @@
 ./jre/lib/amd64/server/libjvm_db.so
 ./jre/lib/amd64/server/libjvm_dtrace.so
 ./bin/amd64/appletviewer
-./bin/amd64/extcheck
 ./bin/amd64/idlj
 ./bin/amd64/jar
 ./bin/amd64/jarsigner
@@ -609,7 +605,6 @@
 ./jre/plugin/sparc/ns7/libjavaplugin_oji.so
 ./jre/lib/sparc/server/libjvm.so
 ./bin/appletviewer
-./bin/extcheck
 ./bin/idlj
 ./bin/jar
 ./bin/jarsigner
@@ -757,7 +752,6 @@
 ./jre/lib/sparcv9/libzip.so
 ./jre/lib/sparcv9/server/libjvm.so
 ./bin/sparcv9/appletviewer
-./bin/sparcv9/extcheck
 ./bin/sparcv9/idlj
 ./bin/sparcv9/jar
 ./bin/sparcv9/jarsigner
@@ -839,7 +833,6 @@
 ./jre/bin/jsoundds.dll
 ./jre/bin/server/jvm.dll
 ./bin/appletviewer.exe
-./bin/extcheck.exe
 ./bin/idlj.exe
 ./bin/jar.exe
 ./bin/jarsigner.exe
@@ -938,7 +931,6 @@
 
 ACCEPTED_BIN_DIFF="
 ./bin/appletviewer
-./bin/extcheck
 ./bin/idlj
 ./bin/jar
 ./bin/jarsigner
--- a/common/bin/unshuffle_list.txt	Fri Nov 07 11:15:36 2014 +0100
+++ b/common/bin/unshuffle_list.txt	Fri Nov 07 12:45:05 2014 +0100
@@ -1301,7 +1301,6 @@
 jdk/src/jdk.deploy.osx/macosx/native/libosx/JavaAppLauncher.m : jdk/src/macosx/native/apple/launcher/JavaAppLauncher.m
 jdk/src/jdk.deploy.osx/macosx/native/libosx/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m
 jdk/src/jdk.dev/share/classes/com/sun/jarsigner : jdk/src/share/classes/com/sun/jarsigner
-jdk/src/jdk.dev/share/classes/com/sun/tools/extcheck : jdk/src/share/classes/com/sun/tools/extcheck
 jdk/src/jdk.dev/share/classes/com/sun/tools/hat : jdk/src/share/classes/com/sun/tools/hat
 jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner : jdk/src/share/classes/sun/security/tools/jarsigner
 jdk/src/jdk.dev/share/classes/sun/tools/jar : jdk/src/share/classes/sun/tools/jar
--- a/make/CompileJavaModules.gmk	Fri Nov 07 11:15:36 2014 +0100
+++ b/make/CompileJavaModules.gmk	Fri Nov 07 12:45:05 2014 +0100
@@ -252,14 +252,6 @@
 # Exclude building of IIOP transport for RMI Connector
 java.management_EXCLUDES := com/sun/jmx/remote/protocol/iiop
 
-# Why is this in the open source tree?
-ifdef OPENJDK
-  java.management_EXCLUDES := \
-      com/sun/jmx/snmp \
-      sun/management/snmp \
-      #
-endif
-
 ifeq ($(RMICONNECTOR_IIOP), false)
   java.management_EXCLUDES += com/sun/jmx/remote/protocol/iiop
 endif
@@ -482,6 +474,11 @@
   $1_DEPS := $$(call FindDepsForModule, $1)
 
   $1_CLASSPATH := $$(addprefix $(JDK_OUTPUTDIR)/modules/,$$($1_DEPS))
+  # When crypto classes are prebuilt, need to look for classes already in 
+  # output dir.
+  ifneq ($(BUILD_CRYPTO), true)
+    $1_CLASSPATH += $(JDK_OUTPUTDIR)/modules/$1
+  endif
   ifeq ($1, jdk.hotspot.agent)
     ## The source of this module is compiled elsewhere, hotspot, and imported.
     ## Service types are required in the classpath when compiing module-info
--- a/make/Images.gmk	Fri Nov 07 11:15:36 2014 +0100
+++ b/make/Images.gmk	Fri Nov 07 12:45:05 2014 +0100
@@ -188,7 +188,6 @@
   JDK_MAN_PAGES += \
       $(JRE_MAN_PAGES) \
       appletviewer.1 \
-      extcheck.1 \
       idlj.1 \
       jar.1 \
       jarsigner.1 \
--- a/make/Main.gmk	Fri Nov 07 11:15:36 2014 +0100
+++ b/make/Main.gmk	Fri Nov 07 12:45:05 2014 +0100
@@ -254,7 +254,7 @@
 
 test:
 	($(CD) $(SRC_ROOT)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
-	    JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_OUTPUT_DIR) \
+	    JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_OUTPUTDIR) \
 	    ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
 
 test-make:
--- a/make/common/Modules.gmk	Fri Nov 07 11:15:36 2014 +0100
+++ b/make/common/Modules.gmk	Fri Nov 07 12:45:05 2014 +0100
@@ -41,9 +41,6 @@
     $(NASHORN_TOPDIR)/src \
     #
 
-# There are snmp classes in the open but they are not included in OpenJDK
-JAVA_MODULES_FILTER := jdk.snmp
-
 # Find all modules with java sources by looking in the source dirs
 define FindJavaModules
   $(filter-out $(JAVA_MODULES_FILTER), $(sort $(notdir \
--- a/make/common/NON_CORE_PKGS.gmk	Fri Nov 07 11:15:36 2014 +0100
+++ b/make/common/NON_CORE_PKGS.gmk	Fri Nov 07 12:45:05 2014 +0100
@@ -94,7 +94,8 @@
 endif
 
 JDK_PKGS = jdk \
-      jdk.net
+      jdk.net \
+      jdk.management.cmm
 
 # non-core packages in rt.jar
 NON_CORE_PKGS = $(DOMAPI_PKGS) \
--- a/modules.xml	Fri Nov 07 11:15:36 2014 +0100
+++ b/modules.xml	Fri Nov 07 12:45:05 2014 +0100
@@ -1583,6 +1583,10 @@
     <depend>jdk.crypto.ec</depend>
   </module>
   <module>
+    <name>jdk.crypto.ucrypto</name>
+    <depend>java.base</depend>
+  </module>
+  <module>
     <name>jdk.deploy.osx</name>
     <depend>java.base</depend>
     <depend>java.desktop</depend>