Mercurial > hg > openjdk > jdk9
changeset 1516:f546760134eb jdk9-b67
Merge
author | lana |
---|---|
date | Thu, 28 May 2015 16:50:03 -0700 |
parents | c0941617668d (current diff) dc3bc6fd57b2 (diff) |
children | 983622d17601 b6201d741510 4999895b3a44 |
files | |
diffstat | 9 files changed, 25 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/flags.m4 Thu May 28 16:13:48 2015 -0700 +++ b/common/autoconf/flags.m4 Thu May 28 16:50:03 2015 -0700 @@ -559,6 +559,7 @@ -Zi -MD -Zc:wchar_t- -W3 -wd4800 \ -DWIN32_LEAN_AND_MEAN \ -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \ + -D_WINSOCK_DEPRECATED_NO_WARNINGS \ -DWIN32 -DIAL" if test "x$OPENJDK_TARGET_CPU" = xx86_64; then COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_AMD64_ -Damd64"
--- a/common/autoconf/generated-configure.sh Thu May 28 16:13:48 2015 -0700 +++ b/common/autoconf/generated-configure.sh Thu May 28 16:50:03 2015 -0700 @@ -4366,7 +4366,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1431429776 +DATE_WHEN_GENERATED=1432629750 ############################################################################### # @@ -42071,6 +42071,7 @@ -Zi -MD -Zc:wchar_t- -W3 -wd4800 \ -DWIN32_LEAN_AND_MEAN \ -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \ + -D_WINSOCK_DEPRECATED_NO_WARNINGS \ -DWIN32 -DIAL" if test "x$OPENJDK_TARGET_CPU" = xx86_64; then COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_AMD64_ -Damd64"
--- a/common/bin/compare_exceptions.sh.incl Thu May 28 16:13:48 2015 -0700 +++ b/common/bin/compare_exceptions.sh.incl Thu May 28 16:50:03 2015 -0700 @@ -94,7 +94,6 @@ ./bin/jstat ./bin/jstatd ./bin/keytool -./bin/native2ascii ./bin/orbd ./bin/pack200 ./bin/policytool @@ -173,7 +172,6 @@ ./bin/jstat ./bin/jstatd ./bin/keytool -./bin/native2ascii ./bin/orbd ./bin/pack200 ./bin/policytool @@ -293,7 +291,6 @@ ./bin/jstat ./bin/jstatd ./bin/keytool -./bin/native2ascii ./bin/orbd ./bin/pack200 ./bin/policytool @@ -428,7 +425,6 @@ ./bin/jstat ./bin/jstatd ./bin/keytool -./bin/native2ascii ./bin/orbd ./bin/pack200 ./bin/policytool @@ -509,7 +505,6 @@ ./bin/kinit.exe ./bin/klist.exe ./bin/ktab.exe -./bin/native2ascii.exe ./bin/orbd.exe ./bin/pack200.exe ./bin/policytool.exe @@ -585,7 +580,6 @@ ./bin/jstat ./bin/jstatd ./bin/keytool -./bin/native2ascii ./bin/orbd ./bin/pack200 ./bin/policytool
--- a/common/bin/unshuffle_list.txt Thu May 28 16:13:48 2015 -0700 +++ b/common/bin/unshuffle_list.txt Thu May 28 16:50:03 2015 -0700 @@ -1301,8 +1301,6 @@ jdk/src/jdk.deploy.osx/macosx/native/libosx/Dispatch.m : jdk/src/macosx/native/com/apple/concurrent/Dispatch.m 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/tools/hat : jdk/src/share/classes/com/sun/tools/hat -jdk/src/jdk.dev/share/classes/sun/tools/native2ascii : jdk/src/share/classes/sun/tools/native2ascii jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver : jdk/src/share/classes/com/sun/net/httpserver jdk/src/jdk.httpserver/share/classes/sun/net/httpserver : jdk/src/share/classes/sun/net/httpserver @@ -1487,16 +1485,16 @@ langtools/src/java.compiler/share/classes/javax/lang/model : langtools/src/share/classes/javax/lang/model langtools/src/java.compiler/share/classes/javax/tools : langtools/src/share/classes/javax/tools langtools/src/jdk.compiler/share/classes/com/sun/source : langtools/src/share/classes/com/sun/source -langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile : langtools/src/share/classes/com/sun/tools/classfile langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint : langtools/src/share/classes/com/sun/tools/doclint langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources : langtools/src/share/classes/com/sun/tools/doclint/resources langtools/src/jdk.compiler/share/classes/com/sun/tools/javac : langtools/src/share/classes/com/sun/tools/javac langtools/src/jdk.compiler/share/classes/com/sun/tools/javah : langtools/src/share/classes/com/sun/tools/javah -langtools/src/jdk.compiler/share/classes/com/sun/tools/javap : langtools/src/share/classes/com/sun/tools/javap langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac : langtools/src/share/classes/com/sun/tools/sjavac -langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps : langtools/src/share/classes/com/sun/tools/jdeps -langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources : langtools/src/share/classes/com/sun/tools/jdeps/resources langtools/src/jdk.javadoc/share/classes/com/sun/javadoc : langtools/src/share/classes/com/sun/javadoc langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets : langtools/src/share/classes/com/sun/tools/doclets langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc : langtools/src/share/classes/com/sun/tools/javadoc +langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile : langtools/src/share/classes/com/sun/tools/classfile +langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap : langtools/src/share/classes/com/sun/tools/javap +langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps : langtools/src/share/classes/com/sun/tools/jdeps +langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources : langtools/src/share/classes/com/sun/tools/jdeps/resources nashorn/src/jdk.scripting.nashorn/share/classes : nashorn/src
--- a/make/CheckModules.gmk Thu May 28 16:13:48 2015 -0700 +++ b/make/CheckModules.gmk Thu May 28 16:50:03 2015 -0700 @@ -29,7 +29,7 @@ include $(SPEC) include MakeBase.gmk -JDEPS_MODULES_XML := $(JDK_OUTPUTDIR)/modules/jdk.dev/com/sun/tools/jdeps/resources/jdeps-modules.xml +JDEPS_MODULES_XML := $(JDK_OUTPUTDIR)/modules/jdk.jdeps/com/sun/tools/jdeps/resources/jdeps-modules.xml # # Verify access across module boundaries
--- a/make/CompileJavaModules.gmk Thu May 28 16:13:48 2015 -0700 +++ b/make/CompileJavaModules.gmk Thu May 28 16:50:03 2015 -0700 @@ -412,6 +412,12 @@ ################################################################################ +jdk.jdeps_CLEAN_FILES := $(wildcard \ + $(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \ + $(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties) + +################################################################################ + jdk.jdi_EXCLUDES += \ com/sun/tools/example/debug/bdi \ com/sun/tools/example/debug/event \
--- a/make/Images.gmk Thu May 28 16:13:48 2015 -0700 +++ b/make/Images.gmk Thu May 28 16:50:03 2015 -0700 @@ -46,7 +46,7 @@ # tools TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.javadoc jdk.jcmd jdk.jconsole \ - jdk.hotspot.agent jdk.hprof.agent jdk.jartool jdk.jdi jdk.jdwp.agent \ + jdk.hotspot.agent jdk.hprof.agent jdk.jartool jdk.jdeps jdk.jdi jdk.jdwp.agent \ jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws ifeq ($(OPENJDK_TARGET_OS), windows) @@ -221,7 +221,6 @@ jstack.1 \ jstat.1 \ jstatd.1 \ - native2ascii.1 \ policytool.1 \ rmic.1 \ schemagen.1 \
--- a/make/Main.gmk Thu May 28 16:13:48 2015 -0700 +++ b/make/Main.gmk Thu May 28 16:50:03 2015 -0700 @@ -412,7 +412,7 @@ # Explicitly add dependencies for special targets java.base-java: unpack-sec - jdk.dev-gendata: java rmic + jdk.jdeps-gendata: java rmic zip-security: java.base-java java.security.jgss-java java.security.jgss-libs \ $(filter jdk.crypto%, $(JAVA_TARGETS))
--- a/modules.xml Thu May 28 16:13:48 2015 -0700 +++ b/modules.xml Thu May 28 16:50:03 2015 -0700 @@ -1523,16 +1523,6 @@ <name>com.sun.tools.javac</name> </export> <export> - <name>com.sun.tools.javah</name> - </export> - <export> - <name>com.sun.tools.javap</name> - </export> - <export> - <name>com.sun.tools.classfile</name> - <to>jdk.dev</to> - </export> - <export> <name>com.sun.tools.doclint</name> <to>jdk.javadoc</to> </export> @@ -1551,6 +1541,7 @@ <export> <name>com.sun.tools.javac.file</name> <to>jdk.javadoc</to> + <to>jdk.jdeps</to> </export> <export> <name>com.sun.tools.javac.jvm</name> @@ -1575,6 +1566,7 @@ <export> <name>com.sun.tools.javac.util</name> <to>jdk.javadoc</to> + <to>jdk.jdeps</to> </export> </module> <module> @@ -1607,8 +1599,6 @@ <module> <name>jdk.dev</name> <depend>java.base</depend> - <depend>java.xml</depend> - <depend>jdk.compiler</depend> </module> <module> <name>jdk.hotspot.agent</name> @@ -1678,6 +1668,13 @@ </export> </module> <module> + <name>jdk.jdeps</name> + <depend>java.base</depend> + <depend>java.compiler</depend> + <depend>java.xml</depend> + <depend>jdk.compiler</depend> + </module> + <module> <name>jdk.jdi</name> <depend>java.base</depend> <depend>jdk.attach</depend>