# HG changeset patch
# User jlaskey
# Date 1379078095 10800
# Node ID ddf76977d04aa9c90f7809d2201796ee23145721
# Parent 96f207364e46e9fc18cf1a8a31bae179b376ed9a# Parent 73355c4c1bc8c81e941f80a00db4e5272401e98b
Merge
diff -r 96f207364e46 -r ddf76977d04a .hgtags
--- a/.hgtags Tue Aug 27 16:05:30 2013 -0300
+++ b/.hgtags Fri Sep 13 10:14:55 2013 -0300
@@ -226,3 +226,5 @@
5eb3c1dc348f72a7f84f7d9d07834e8bbe09a799 jdk8-b102
b7e64be81c8a7690703df5711f4fc2375da8a9cb jdk8-b103
96c1b9b7524b52c3fcefc90ffad4c767396727c8 jdk8-b104
+5166118c59178b5d31001bc4058e92486ee07d9b jdk8-b105
+8e7b4d9fb00fdf1334376aeac050c9bca6d1b383 jdk8-b106
diff -r 96f207364e46 -r ddf76977d04a NewMakefile.gmk
--- a/NewMakefile.gmk Tue Aug 27 16:05:30 2013 -0300
+++ b/NewMakefile.gmk Fri Sep 13 10:14:55 2013 -0300
@@ -69,11 +69,11 @@
# Run the makefile with an arbitraty SPEC using -p -q (quiet dry-run and dump rules) to find
# available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
- $(MAKE) -p -q -f common/makefiles/Main.gmk SPEC=$(firstword $(SPEC)) | \
+ $(MAKE) -p -q -f common/makefiles/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
$(all_phony_targets):
- $(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
+ @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
$(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
.PHONY: $(all_phony_targets)
diff -r 96f207364e46 -r ddf76977d04a README-builds.html
--- a/README-builds.html Tue Aug 27 16:05:30 2013 -0300
+++ b/README-builds.html Fri Sep 13 10:14:55 2013 -0300
@@ -154,7 +154,7 @@
Once you have all the repositories, keep in mind that each
- repository is it's own independent repository.
+ repository is its own independent repository.
You can also re-run ./get_source.sh
anytime to
pull over all the latest changesets in all the repositories.
This set of nested repositories has been given the term
@@ -241,6 +241,14 @@
source code for the OpenJDK Corba functionality
+
--with-boot-jdk
.
diff -r 96f207364e46 -r ddf76977d04a common/autoconf/autogen.sh --- a/common/autoconf/autogen.sh Tue Aug 27 16:05:30 2013 -0300 +++ b/common/autoconf/autogen.sh Fri Sep 13 10:14:55 2013 -0300 @@ -44,10 +44,8 @@ custom_hook=$custom_script_dir/custom-hook.m4 AUTOCONF="`which autoconf 2> /dev/null | grep -v '^no autoconf in'`" -AUTOCONF_267="`which autoconf-2.67 2> /dev/null | grep -v '^no autoconf-2.67 in'`" echo "Autoconf found: ${AUTOCONF}" -echo "Autoconf-2.67 found: ${AUTOCONF_267}" if test "x${AUTOCONF}" = x; then echo You need autoconf installed to be able to regenerate the configure script @@ -55,10 +53,6 @@ exit 1 fi -if test "x${AUTOCONF_267}" != x; then - AUTOCONF=${AUTOCONF_267}; -fi - echo Generating generated-configure.sh with ${AUTOCONF} cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | ${AUTOCONF} -W all -I$script_dir - > $script_dir/generated-configure.sh rm -rf autom4te.cache diff -r 96f207364e46 -r ddf76977d04a common/autoconf/configure.ac --- a/common/autoconf/configure.ac Tue Aug 27 16:05:30 2013 -0300 +++ b/common/autoconf/configure.ac Fri Sep 13 10:14:55 2013 -0300 @@ -30,7 +30,7 @@ ############################################################################### -AC_PREREQ([2.61]) +AC_PREREQ([2.69]) AC_INIT(OpenJDK, jdk8, build-dev@openjdk.java.net,,http://openjdk.java.net) AC_CONFIG_AUX_DIR([build-aux]) diff -r 96f207364e46 -r ddf76977d04a common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Tue Aug 27 16:05:30 2013 -0300 +++ b/common/autoconf/generated-configure.sh Fri Sep 13 10:14:55 2013 -0300 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for OpenJDK jdk8. +# Generated by GNU Autoconf 2.69 for OpenJDK jdk8. # # Report bugs to- Q: The
configure
file looks horrible! + Q: Thegenerated-configure.sh
file looks horrible! How are you going to edit it?
- A: Theconfigure
file is generated (think + A: Thegenerated-configure.sh
file is generated (think "compiled") by the autoconf tools. The source code is - inconfigure.ac
various .m4 files in common/autoconf, - which are - much more readable. + inconfigure.ac
and various .m4 files in common/autoconf, + which are much more readable.Q: - Why is the
configure
file checked in, + Why is thegenerated-configure.sh
file checked in, if it is generated?
A: @@ -1229,13 +1236,29 @@Q: Do you require a specific version of autoconf for regenerating -
+ +configure
? +generated-configure.sh
?
A: - Currently, no, but this will likely be the case when things have - settled down a bit more. (The reason for this is to avoid - large spurious changes inconfigure
- in commits that made small changes toconfigure.ac
). + Yes, version 2.69 is required and should be easy + enough to aquire on all supported operating + systems. The reason for this is to avoid + large spurious changes ingenerated-configure.sh
. ++ Q: + How do you regenerate
generated-configure.sh
+ after making changes to the input files? +
+ A: + Regneratinggenerated-configure.sh
+ should always be done using the + scriptcommon/autoconf/autogen.sh
to + ensure that the correct files get updated. This + script should also be run after mercurial tries to + mergegenerated-configure.sh
as a + merge of the generated file is not guaranteed to + be correct.@@ -1307,9 +1330,9 @@ you will need to modify the makefiles. But for normal file additions or removals, no changes are needed. There are certan exceptions for some native libraries where the source files are spread - over many directories which also contain courses for other + over many directories which also contain sources for other libraries. In these cases it was simply easier to create include lists - rather thane excludes. + rather than excludes.
@@ -1327,14 +1350,14 @@
Q:
@@ -1386,24 +1409,6 @@configure
provides OpenJDK-specific features such as ---enable-jigsaw
or--with-builddeps-server
- that are not described in this document. What about those? +--with-builddeps-server
that are not + described in this document. What about those?
A: Try them out if you like! But be aware that most of these are experimental features. Many of them don't do anything at all at the moment; the option - is just a placeholder. Other depends on + is just a placeholder. Others depend on pieces of code or infrastructure that is currently not ready for prime time.- Q: What is @GenerateNativeHeaders? -
- -
- A: - To speed up compilation, we added a flag to javac which makes it - do the job of javah as well, as a by-product; that is, generating - native .h header files. These files are only generated - if a class contains native methods. However, sometimes - a class contains no native method, - but still contains constants that native code needs to use. - The new GenerateNativeHeaders annotation tells javac to - force generation of a - header file in these cases. (We don't want to generate - native headers for all classes that contains constants - but no native methods, since - that would slow down the compilation process needlessly.) -Q: Is anything able to use the results of the new build's default make target?
@@ -1429,10 +1434,9 @@ What should I do?
A: - It might very well be that we have missed to add support for + It might very well be that we have neglected to add support for an option that was actually used from outside the build system. - Email us and we will - add support for it! + Email us and we will add support for it!