stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
J. Duke 2017-07-05 17:06:26 +02:00
commit d483483dca
9 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags-top-repo
View File

@ -55,3 +55,4 @@ c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79 20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79
a3242906c7747b5d9bcc3d118c7c3c69aa40f4b7 jdk7-b80 a3242906c7747b5d9bcc3d118c7c3c69aa40f4b7 jdk7-b80
8403096d1fe7ff5318df9708cfec84a3fd3e1cf9 jdk7-b81

1
corba/.hgtags
View File

@ -55,3 +55,4 @@ b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73
a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78 a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78
ec0421b5703b677e2226cf4bf7ae4eaafd8061c5 jdk7-b79 ec0421b5703b677e2226cf4bf7ae4eaafd8061c5 jdk7-b79
0336e70ca0aeabc783cc01658f36cb6e27ea7934 jdk7-b80 0336e70ca0aeabc783cc01658f36cb6e27ea7934 jdk7-b80
e08a42a2a94d97ea8eedb187a94dbff822c8fbba jdk7-b81

1
hotspot/.hgtags
View File

@ -55,3 +55,4 @@ d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78 e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78
a5a6adfca6ecefb5894a848debabfe442ff50e25 jdk7-b79 a5a6adfca6ecefb5894a848debabfe442ff50e25 jdk7-b79
3003ddd1d4330b06cb4691ae74d600d3685899eb jdk7-b80 3003ddd1d4330b06cb4691ae74d600d3685899eb jdk7-b80
1f9b07674480c224828852ffe137beea36b3cab5 jdk7-b81

1
jaxp/.hgtags
View File

@ -55,3 +55,4 @@ bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77
7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78 7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78
b1005c504358c18694c84e95fec16b28cdce7ae1 jdk7-b79 b1005c504358c18694c84e95fec16b28cdce7ae1 jdk7-b79
9219574db5936367114b0f31469837f27d5a375a jdk7-b80 9219574db5936367114b0f31469837f27d5a375a jdk7-b80
204e59d488cdaa9eafa8cb7164ea955b5a9d4a51 jdk7-b81

1
jaxws/.hgtags
View File

@ -55,3 +55,4 @@ fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75
fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78 fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78
c08894f5b6e594b9b12993e256b96c1b38099632 jdk7-b79 c08894f5b6e594b9b12993e256b96c1b38099632 jdk7-b79
447767dee56a0f8cb89acc8bf7be5f9be7d84e8b jdk7-b80 447767dee56a0f8cb89acc8bf7be5f9be7d84e8b jdk7-b80
f051045fe94a48fae1097f90cbd9227e6aae6b7e jdk7-b81

1
jdk/.hgtags
View File

@ -55,3 +55,4 @@ e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77
1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78 1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78
918920710d65432a2d54fdf407c1524a5571c4ad jdk7-b79 918920710d65432a2d54fdf407c1524a5571c4ad jdk7-b79
049cfaaa9a7374e3768a79969a799e8b59ad52fa jdk7-b80 049cfaaa9a7374e3768a79969a799e8b59ad52fa jdk7-b80
10b993d417fcdb40480dad7032ac241f4b87f1af jdk7-b81

9
jdk/make/common/shared/Defs-java.gmk
View File

@ -138,6 +138,10 @@ JAVACFLAGS += $(OTHER_JAVACFLAGS)
# Needed for javah # Needed for javah
JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
# Needed for javadoc to ensure it builds documentation
# against the newly built classes
JAVADOCFLAGS += -bootclasspath $(CLASSBINDIR)
# Needed for JAVADOC and BOOT_JAVACFLAGS # Needed for JAVADOC and BOOT_JAVACFLAGS
NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
@ -155,14 +159,15 @@ ifdef LANGTOOLS_DIST
-jar $(JAVAH_JAR) $(JAVAHFLAGS) -jar $(JAVAH_JAR) $(JAVAHFLAGS)
JAVADOC_CMD = $(BOOT_JAVA_CMD) \ JAVADOC_CMD = $(BOOT_JAVA_CMD) \
"-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \ "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
-jar $(JAVADOC_JAR) -jar $(JAVADOC_JAR) $(JAVADOCFLAGS)
else else
# If no explicit tools, use boot tools (add VM flags in this case) # If no explicit tools, use boot tools (add VM flags in this case)
JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
$(JAVACFLAGS) $(JAVACFLAGS)
JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
$(JAVAHFLAGS) $(JAVAHFLAGS)
JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) \
$(JAVADOCFLAGS)
endif endif
# Override of what javac to use (see deploy workspace) # Override of what javac to use (see deploy workspace)

2
jdk/make/docs/Makefile
View File

@ -69,7 +69,7 @@ DRAFT = '<br><strong>DRAFT&nbsp;'$(MILESTONE)-$(BUILD_NUMBER)'</strong>'
THIS_YEAR := $(shell $(DATE) | $(SED) -e 's/ / /g' | $(CUT) -d' ' -f6) THIS_YEAR := $(shell $(DATE) | $(SED) -e 's/ / /g' | $(CUT) -d' ' -f6)
TRADEMARK = &\#x2122; TRADEMARK = &\#x2122;
IGNORED_TAGS = beaninfo revised since.unbundled spec Note ToDo IGNORED_TAGS = beaninfo revised since.unbundled spec specdefault Note ToDo
JLS3_URL = http://java.sun.com/docs/books/jls/ JLS3_URL = http://java.sun.com/docs/books/jls/
JLS3_CITE = <a href="$(JLS3_URL)"> \ JLS3_CITE = <a href="$(JLS3_URL)"> \

9
jdk/make/javax/swing/beaninfo/SwingBeans.gmk
View File

@ -25,7 +25,7 @@
# #
# Makefile to build the BeanInfo generation tool (ie, a doclet), and # Makefile to build the BeanInfo generation tool (ie, a doclet), and
# then the beaninfo itself. Swing versions prior to 1.2 is no longer # then the beaninfo itself. Swing versions prior to 1.2 are no longer
# built. # built.
# #
# This makefile could be a lot simpler if we made it more regular. # This makefile could be a lot simpler if we made it more regular.
@ -44,13 +44,12 @@ swing-1.2-beans-debug:
$(MAKE) DEBUG_FLAG=true make-swing-beans $(MAKE) DEBUG_FLAG=true make-swing-beans
LOCAL_JAVADOC = $(JAVADOC_CMD) $(JAVADOCFLAGS)
# get the absolute path to the jar command. # get the absolute path to the jar command.
PREFIX = 1.2 PREFIX = 1.2
JAVADOCFLAGS = $(NO_PROPRIETARY_API_WARNINGS) $(LANGUAGE_VERSION) JAVADOCFLAGS += $(NO_PROPRIETARY_API_WARNINGS) $(LANGUAGE_VERSION)
SWINGPKG = javax/swing SWINGPKG = javax/swing
LOCAL_JAVAC_FLAGS = $(OTHER_JAVACFLAGS) LOCAL_JAVAC_FLAGS = $(OTHER_JAVACFLAGS)
# since LOCAL_JAVADOC runs on ALT_BOOTDIR, the doclet and all its classes must be compiled to match # since JAVADOC_CMD runs on ALT_BOOTDIR, the doclet and all its classes must be compiled to match
DOCLET_JAVAC_FLAGS = -source 6 -target 6 DOCLET_JAVAC_FLAGS = -source 6 -target 6
include FILES.gmk include FILES.gmk
@ -114,7 +113,7 @@ mkbeaninfo: $(BEANSRCDIR) .delete.beanlist $(FILES_beans) .javadoc.beanlist
.javadoc.beanlist: .javadoc.beanlist:
if [ -s $(TEMPDIR)/.beans.list ]; \ if [ -s $(TEMPDIR)/.beans.list ]; \
then $(LOCAL_JAVADOC) $(DOCLETFLAGS) -x $(DEBUG_FLAG) -d $(BEANSRCDIR) -t $(DOCLETSRC)/SwingBeanInfo.template -docletpath $(DOCLETDST) \ then $(JAVADOC_CMD) $(DOCLETFLAGS) -x $(DEBUG_FLAG) -d $(BEANSRCDIR) -t $(DOCLETSRC)/SwingBeanInfo.template -docletpath $(DOCLETDST) \
$(shell if [ -s $(TEMPDIR)/.beans.list ]; then $(CAT) $(TEMPDIR)/.beans.list; fi); \ $(shell if [ -s $(TEMPDIR)/.beans.list ]; then $(CAT) $(TEMPDIR)/.beans.list; fi); \
fi fi
@$(java-vm-cleanup) @$(java-vm-cleanup)