/hg/icedtea: 13 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed May 25 05:19:59 PDT 2011
changeset eff72c004141 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=eff72c004141
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 25 01:37:57 2011 +0100
PR103: Usage of native2ascii during bootstrap.
2011-02-22 Andrew John Hughes <ahughes at redhat.com>
PR103: Usage of native2ascii during bootstrap.
* Makefile.am: (bootstrap-directory-ecj): Symlink
native2ascii.
* NEWS: Updated.
* acinclude.m4: (IT_FIND_NATIVE2ASCII): Added.
* configure.ac: Call IT_FIND_NATIVE2ASCII.
changeset c12aafe2de1b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c12aafe2de1b
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Feb 22 12:52:39 2011 +0000
PR497: Mercurial revision detection not very reliable
2011-02-22 Andrew John Hughes <ahughes at redhat.com>
PR497: Mercurial revision detection not very reliable
* acinclude.m4: (IT_OBTAIN_HG_REVISIONS): Use hg id rather
than hg tip.
changeset 97063b48abc0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=97063b48abc0
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 25 01:42:05 2011 +0100
Replace WITH_CACAO with more accurate ENABLE_CACAO.
2011-02-22 Andrew John Hughes <ahughes at redhat.com>
Use more accurate ENABLE_CACAO rather than
WITH_CACAO.
* Makefile.am: Replace WITH_CACAO throughout.
* acinclude.m4: Likewise.
changeset de13896b4712 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=de13896b4712
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 25 01:48:54 2011 +0100
Update INSTALL documentation for latest changes.
2011-02-23 Andrew John Hughes <ahughes at redhat.com>
* INSTALL: Update with native2ascii option and
JamVM. Mention --without-hotspot-build in HotSpot
documentation.
changeset 36c3bb7acd7c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=36c3bb7acd7c
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 23 17:05:16 2011 +0000
Cleanup the IT_CHECK_WITH_JAMVM_SRC_ZIP macro and document it in
INSTALL.
2011-02-23 Andrew John Hughes <ahughes at redhat.com>
* INSTALL: Mention --with-alt-jamvm-src-zip.
* acinclude.m4: (IT_CHECK_WITH_JAMVM_SRC_ZIP): Use a single
AM_CONDITIONAL. Check that the specified value is a valid
file using test.
changeset 1320911bda96 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1320911bda96
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 25 01:51:14 2011 +0100
Fix references to output directory in INSTALL.
2011-05-25 Andrew John Hughes <ahughes at redhat.com>
* INSTALL: Fix references to
openjdk/build/<os>-<arch> to reference openjdk.build.
changeset 027cc10ea7bf in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=027cc10ea7bf
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 25 01:58:11 2011 +0100
Make JDK binary macros more idiot-proof.
2011-02-23 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: Make java, javah, rmic and jar
macros more idiot-proof like the new native2ascii macro.
(IT_FIND_JAVA): Improve output, check file exists and is
executable and look for alternatives on the path if not.
(IT_FIND_JAVAH): Likewise. (IT_FIND_JAR): Likewise.
(IT_FIND_RMIC): Likewise. (IT_FIND_NATIVE2ASCII): Invert
executable test for clarify.
changeset 475fabfc836b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=475fabfc836b
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 25 02:08:09 2011 +0100
Check existence of source zips during configure.
2011-05-25 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_WITH_CORBA_SRC_ZIP): Check zip
exists and is a regular file. Use a single AM_CONDITIONAL.
(IT_WITH_JAXP_SRC_ZIP): Likewise. (IT_WITH_JAXWS_SRC_ZIP):
Likewise. (IT_WITH_JDK_SRC_ZIP): Likewise.
(IT_WITH_LANGTOOLS_SRC_ZIP): Likewise.
2011-02-23 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_ZIP): Check
zip exists and is a regular file. Use a single
AM_CONDITIONAL. (IT_WITH_OPENJDK_SRC_ZIP): Likewise.
(IT_WITH_HOTSPOT_SRC_ZIP): Likewise.
(IT_WITH_JAXP_DROP_ZIP): Likewise. (IT_WITH_JAF_DROP_ZIP):
Likewise. (IT_WITH_JAXWS_DROP_ZIP): Likewise.
changeset 742ab4a6e279 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=742ab4a6e279
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 25 02:11:47 2011 +0100
Treat --without-x-src-zip as equivalent to not specifying the
option.
2011-05-25 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_WITH_CORBA_SRC_ZIP): Treat
--without option as equivalent to unspecified.
(IT_WITH_JAXP_SRC_ZIP): Likewise. (IT_WITH_JAXWS_SRC_ZIP):
Likewise. (IT_WITH_JDK_SRC_ZIP): Likewise.
(IT_WITH_LANGTOOLS_DROP_ZIP): Likewise.
2011-02-23 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_ZIP): Treat
--without option as equivalent to unspecified.
(IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise.
(IT_WITH_OPENJDK_SRC_ZIP): Likewise.
(IT_WITH_HOTSPOT_SRC_ZIP): Likewise.
(IT_WITH_JAXP_DROP_ZIP): Likewise. (IT_WITH_JAF_DROP_ZIP):
Likewise. (IT_WITH_JAXWS_DROP_ZIP): Likewise.
changeset 8d2c6f90feb9 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d2c6f90feb9
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 25 02:15:27 2011 +0100
Remove superfluous use of CHECK in macro naming.
2011-02-23 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_ENABLE_JAMVM): Renamed from
IT_CHECK_ENABLE_JAMVM. (IT_WITH_JAMVM_SRC_ZIP): Renamed form
IT_CHECK_WITH_JAMVM_SRC_ZIP. (IT_ENABLE_CACAO): Renamed from
IT_CHECK_ENABLE_CACAO. (IT_WITH_CACAO_HOME): Renamed form
IT_CHECK_WITH_CACAO_HOME. (IT_WITH_CACAO_SRC_ZIP): Renamed
form IT_CHECK_WITH_CACAO_SRC_ZIP. (IT_WITH_CACAO_SRC_DIR):
Renamed form IT_CHECK_WITH_CACAO_SRC_DIR. (IT_WITH_GCJ):
Renamed from IT_CHECK_WITH_GCJ. (IT_WITH_HOTSPOT_BUILD):
Renamed from IT_CHECK_WITH_HOTSPOT_BUILD.
(IT_WITH_HG_REVISION): Renamed from IT_CHECK_WITH_HG_REVISION.
(IT_WITH_TZDATA_DIR): Renamed from IT_CHECK_WITH_TZDATA_DIR.
changeset 5b68b587ad17 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5b68b587ad17
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 25 02:17:57 2011 +0100
Invert AM_CONDITIONAL test in --with-x-src-zip to get correct
behaviour.
2011-05-25 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_WITH_CORBA_SRC_ZIP): Invert
AM_CONDITIONAL test to get correct behaviour.
(IT_WITH_JAXP_SRC_ZIP): Likewise. (IT_WITH_JAXWS_SRC_ZIP):
Likewise. (IT_WITH_JDK_SRC_ZIP): Likewise.
(IT_WITH_LANGTOOLS_DROP_ZIP): Likewise.
2011-02-23 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_ZIP):
Invert AM_CONDITIONAL test to get correct behaviour.
(IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise.
(IT_WITH_OPENJDK_SRC_ZIP): Likewise.
(IT_WITH_HOTSPOT_SRC_ZIP): Likewise.
(IT_WITH_JAXP_DROP_ZIP): Likewise. (IT_WITH_JAF_DROP_ZIP):
Likewise. (IT_WITH_JAXWS_DROP_ZIP): Likewise.
changeset ee016b0bca71 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ee016b0bca71
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 25 02:20:29 2011 +0100
Add the missing $.
2011-05-25 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_WITH_CORBA_SRC_ZIP): Add missing
$. (IT_WITH_JAXP_SRC_ZIP): Likewise.
(IT_WITH_JAXWS_SRC_ZIP): Likewise. (IT_WITH_JDK_SRC_ZIP):
Likewise. (IT_WITH_LANGTOOLS_DROP_ZIP): Likewise.
2011-02-23 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_ZIP): Add
missing $. (IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise.
(IT_WITH_OPENJDK_SRC_ZIP): Likewise.
(IT_WITH_HOTSPOT_SRC_ZIP): Likewise.
(IT_WITH_JAXP_DROP_ZIP): Likewise. (IT_WITH_JAF_DROP_ZIP):
Likewise. (IT_WITH_JAXWS_DROP_ZIP): Likewise.
changeset 3331b5399731 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3331b5399731
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 25 13:19:52 2011 +0100
Add missing 'fi'.
2011-05-25 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_FIND_JAVAH): Add 'fi' missed in
merge.
diffstat:
ChangeLog | 164 +++++++++++++++++++++++++++++++++
INSTALL | 18 +++-
Makefile.am | 15 +-
NEWS | 1 +
acinclude.m4 | 293 ++++++++++++++++++++++++++++++++++++++++------------------
configure.ac | 19 ++-
6 files changed, 400 insertions(+), 110 deletions(-)
diffs (truncated from 970 to 500 lines):
diff -r 3024025d7759 -r 3331b5399731 ChangeLog
--- a/ChangeLog Mon May 23 15:52:47 2011 +0100
+++ b/ChangeLog Wed May 25 13:19:52 2011 +0100
@@ -1,3 +1,167 @@
+2011-05-25 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_FIND_JAVAH): Add 'fi' missed in merge.
+
+2011-05-25 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_WITH_CORBA_SRC_ZIP): Add missing $.
+ (IT_WITH_JAXP_SRC_ZIP): Likewise.
+ (IT_WITH_JAXWS_SRC_ZIP): Likewise.
+ (IT_WITH_JDK_SRC_ZIP): Likewise.
+ (IT_WITH_LANGTOOLS_DROP_ZIP): Likewise.
+
+2011-02-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_CHECK_WITH_CACAO_SRC_ZIP): Add missing $.
+ (IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise.
+ (IT_WITH_OPENJDK_SRC_ZIP): Likewise.
+ (IT_WITH_HOTSPOT_SRC_ZIP): Likewise.
+ (IT_WITH_JAXP_DROP_ZIP): Likewise.
+ (IT_WITH_JAF_DROP_ZIP): Likewise.
+ (IT_WITH_JAXWS_DROP_ZIP): Likewise.
+
+2011-05-25 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_WITH_CORBA_SRC_ZIP): Invert
+ AM_CONDITIONAL test to get correct behaviour.
+ (IT_WITH_JAXP_SRC_ZIP): Likewise.
+ (IT_WITH_JAXWS_SRC_ZIP): Likewise.
+ (IT_WITH_JDK_SRC_ZIP): Likewise.
+ (IT_WITH_LANGTOOLS_DROP_ZIP): Likewise.
+
+2011-02-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_CHECK_WITH_CACAO_SRC_ZIP): Invert
+ AM_CONDITIONAL test to get correct behaviour.
+ (IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise.
+ (IT_WITH_OPENJDK_SRC_ZIP): Likewise.
+ (IT_WITH_HOTSPOT_SRC_ZIP): Likewise.
+ (IT_WITH_JAXP_DROP_ZIP): Likewise.
+ (IT_WITH_JAF_DROP_ZIP): Likewise.
+ (IT_WITH_JAXWS_DROP_ZIP): Likewise.
+
+2011-02-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_ENABLE_JAMVM): Renamed from IT_CHECK_ENABLE_JAMVM.
+ (IT_WITH_JAMVM_SRC_ZIP): Renamed form IT_CHECK_WITH_JAMVM_SRC_ZIP.
+ (IT_ENABLE_CACAO): Renamed from IT_CHECK_ENABLE_CACAO.
+ (IT_WITH_CACAO_HOME): Renamed form IT_CHECK_WITH_CACAO_HOME.
+ (IT_WITH_CACAO_SRC_ZIP): Renamed form IT_CHECK_WITH_CACAO_SRC_ZIP.
+ (IT_WITH_CACAO_SRC_DIR): Renamed form IT_CHECK_WITH_CACAO_SRC_DIR.
+ (IT_WITH_GCJ): Renamed from IT_CHECK_WITH_GCJ.
+ (IT_WITH_HOTSPOT_BUILD): Renamed from IT_CHECK_WITH_HOTSPOT_BUILD.
+ (IT_WITH_HG_REVISION): Renamed from IT_CHECK_WITH_HG_REVISION.
+ (IT_WITH_TZDATA_DIR): Renamed from IT_CHECK_WITH_TZDATA_DIR.
+
+2011-05-25 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_WITH_CORBA_SRC_ZIP): Treat
+ --without option as equivalent to unspecified.
+ (IT_WITH_JAXP_SRC_ZIP): Likewise.
+ (IT_WITH_JAXWS_SRC_ZIP): Likewise.
+ (IT_WITH_JDK_SRC_ZIP): Likewise.
+ (IT_WITH_LANGTOOLS_DROP_ZIP): Likewise.
+
+2011-02-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_CHECK_WITH_CACAO_SRC_ZIP): Treat
+ --without option as equivalent to unspecified.
+ (IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise.
+ (IT_WITH_OPENJDK_SRC_ZIP): Likewise.
+ (IT_WITH_HOTSPOT_SRC_ZIP): Likewise.
+ (IT_WITH_JAXP_DROP_ZIP): Likewise.
+ (IT_WITH_JAF_DROP_ZIP): Likewise.
+ (IT_WITH_JAXWS_DROP_ZIP): Likewise.
+
+2011-05-25 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_WITH_CORBA_SRC_ZIP): Check zip exists
+ and is a regular file. Use a single AM_CONDITIONAL.
+ (IT_WITH_JAXP_SRC_ZIP): Likewise.
+ (IT_WITH_JAXWS_SRC_ZIP): Likewise.
+ (IT_WITH_JDK_SRC_ZIP): Likewise.
+ (IT_WITH_LANGTOOLS_SRC_ZIP): Likewise.
+
+2011-02-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_CHECK_WITH_CACAO_SRC_ZIP): Check zip exists
+ and is a regular file. Use a single AM_CONDITIONAL.
+ (IT_WITH_OPENJDK_SRC_ZIP): Likewise.
+ (IT_WITH_HOTSPOT_SRC_ZIP): Likewise.
+ (IT_WITH_JAXP_DROP_ZIP): Likewise.
+ (IT_WITH_JAF_DROP_ZIP): Likewise.
+ (IT_WITH_JAXWS_DROP_ZIP): Likewise.
+
+2011-02-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ Make java, javah, rmic and jar macros more
+ idiot-proof like the new native2ascii macro.
+ (IT_FIND_JAVA): Improve output, check file
+ exists and is executable and look for alternatives
+ on the path if not.
+ (IT_FIND_JAVAH): Likewise.
+ (IT_FIND_JAR): Likewise.
+ (IT_FIND_RMIC): Likewise.
+ (IT_FIND_NATIVE2ASCII): Invert executable test
+ for clarify.
+
+2011-05-25 Andrew John Hughes <ahughes at redhat.com>
+
+ * INSTALL:
+ Fix references to openjdk/build/<os>-<arch>
+ to reference openjdk.build.
+
+2011-02-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * INSTALL: Mention --with-alt-jamvm-src-zip.
+ * acinclude.m4:
+ (IT_CHECK_WITH_JAMVM_SRC_ZIP): Use a single
+ AM_CONDITIONAL. Check that the specified value
+ is a valid file using test.
+
+2011-02-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * INSTALL:
+ Update with native2ascii option and JamVM.
+ Mention --without-hotspot-build in HotSpot
+ documentation.
+
+2011-02-22 Andrew John Hughes <ahughes at redhat.com>
+
+ Use more accurate ENABLE_CACAO rather
+ than WITH_CACAO.
+ * Makefile.am:
+ Replace WITH_CACAO throughout.
+ * acinclude.m4: Likewise.
+
+2011-02-22 Andrew John Hughes <ahughes at redhat.com>
+
+ PR497: Mercurial revision detection not very reliable
+ * acinclude.m4:
+ (IT_OBTAIN_HG_REVISIONS): Use hg id rather
+ than hg tip.
+
+2011-02-22 Andrew John Hughes <ahughes at redhat.com>
+
+ PR103: Usage of native2ascii during bootstrap.
+ * Makefile.am:
+ (bootstrap-directory-ecj): Symlink native2ascii.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_FIND_NATIVE2ASCII): Added.
+ * configure.ac: Call IT_FIND_NATIVE2ASCII.
+
2011-05-23 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
diff -r 3024025d7759 -r 3331b5399731 INSTALL
--- a/INSTALL Mon May 23 15:52:47 2011 +0100
+++ b/INSTALL Wed May 25 13:19:52 2011 +0100
@@ -113,6 +113,9 @@
is checked for gjavah and javah.
* --with-rmic: Specify the location of a 'rmic' binary. By default, the path
is checked for grmic and rmic.
+* --with-native2ascii: Specify the location of a 'native2ascii' binary. By default,
+ ${SYSTEM_JDK_DIR}/bin/native2ascii is used. If this is absent, then the path
+ is checked for native2ascii and gnative2ascii.
* --with-ecj-jar: Specify the location of an ecj JAR file. By default, the
following paths are checked:
- /usr/share/java/eclipse-ecj.jar
@@ -149,6 +152,7 @@
and building one.
* --with-cacao-src-zip: Specify the location of a CACAO tarball to avoid downloading.
* --with-cacao-src-dir: Specify the location of a CACAO source tree to avoid downloading.
+* --with-jamvm-src-zip: Specify the location of a JamVM tarball to avoid downloading.
* --with-hg-revision: Specify a hg revision to use (as opposed to tip) with the --enable-hg option.
* --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi.
* --with-netbeans: Specify the location of NetBeans for VisualVM, defaulting to the netbeans on the path.
@@ -171,6 +175,7 @@
* --enable-systemtap: Include support for tracing using systemtap.
* --enable-nss: Enable the NSS security provider.
* --enable-cacao: Replace HotSpot with the CACAO VM.
+* --enable-jamvm: Replace HotSpot with JamVM.
* --enable-shark: Build the Shark LLVM-based JIT.
* --enable-zero: Build the zero assembler port on x86/x86_64/sparc platforms.
* --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK.
@@ -218,7 +223,7 @@
or later if you want Java method tracing). The tapset needs to know
the final install location of the JDK, so the --with-abs-install-dir
should also be used to specify this. If not set, it defaults to the
-in-tree location of openjdk/build/<os>-<arch>/j2sdk-image and requires
+in-tree location of openjdk.build/j2sdk-image and requires
manual changes to tapset/hotspot.stp to work from elsewhere. For
example, if you plan to install the resulting build in
/usr/lib/jvm/java-1.6.0-openjdk, then you should specify
@@ -245,11 +250,20 @@
more platforms than HotSpot, including ppc, ppc64, arm and mips.
When --enable-cacao is specified, CACAO will be downloaded and built,
followed by the JDK portion of OpenJDK resulting in a CACAO+OpenJDK
-image in openjdk/build/<os>-<arch>/j2sdk-image. The --with-cacao-home
+image in openjdk.build/j2sdk-image. The --with-cacao-home
option can be used to specify the use of an existing CACAO install
instead, and --with-cacao-src-zip/dir options exist to allow the use
of a pre-downloaded zip or source tree respectively.
+JamVM
+=====
+
+IcedTea6 can use JamVM as the virtual machine, as opposed to HotSpot.
+When --enable-jamvm is specified, JamVM will be downloaded and built,
+followed by the JDK portion of OpenJDK resulting in a JamVM+OpenJDK
+image in openjdk.build/j2sdk-image. The --with-jamvm-src-zip option
+exists to allow the use of a pre-downloaded zip.
+
Zero & Shark
============
diff -r 3024025d7759 -r 3331b5399731 Makefile.am
--- a/Makefile.am Mon May 23 15:52:47 2011 +0100
+++ b/Makefile.am Wed May 25 13:19:52 2011 +0100
@@ -176,7 +176,7 @@
PREFER_SOURCE = -Xprefer:source
endif
-if WITH_CACAO
+if ENABLE_CACAO
ICEDTEA_BUILD_TARGET = jdk_only
ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only
else
@@ -304,7 +304,7 @@
patches/cacao/memory.patch
endif
-if WITH_CACAO
+if ENABLE_CACAO
ICEDTEA_PATCHES += \
patches/cacao/ignore-tests.patch
endif
@@ -480,7 +480,7 @@
VERBOSE="$(VERBOSE)" \
STATIC_CXX="false"
-if WITH_CACAO
+if ENABLE_CACAO
ICEDTEA_ENV += \
ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
endif
@@ -1480,7 +1480,7 @@
mv openjdk/jdk/make/common/shared/Defs.gmk Defs.gmk.bak
cat Defs.gmk.bak > openjdk/jdk/make/common/shared/Defs.gmk
icedtea_version="$(PACKAGE_VERSION)$(ICEDTEA_REV)" ; \
- if test "x$(WITH_CACAO)" = "xyes" || \
+ if test "x$(ENABLE_CACAO)" = "xyes" || \
test "x$(ENABLE_JAMVM)" = "xyes"; then \
echo "JDK_DERIVATIVE_NAME=$${icedtea_version}" \
>>openjdk/jdk/make/common/shared/Defs.gmk ; \
@@ -1678,6 +1678,7 @@
ln -sf $(JAVAH) $(STAGE1_BOOT_DIR)/bin/javah
ln -sf $(RMIC) $(STAGE1_BOOT_DIR)/bin/rmic
ln -sf $(JAR) $(STAGE1_BOOT_DIR)/bin/jar
+ ln -sf $(NATIVE2ASCII) $(STAGE1_BOOT_DIR)/bin/native2ascii
ln -sf ../../../javac $(STAGE1_BOOT_DIR)/bin/javac
ln -sf ../../../javap $(STAGE1_BOOT_DIR)/bin/javap
mkdir -p $(STAGE1_BOOT_DIR)/lib/endorsed && \
@@ -1795,7 +1796,7 @@
if SHARK_BUILD
printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
-if WITH_CACAO
+if ENABLE_CACAO
printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
if ENABLE_SYSTEMTAP
@@ -1860,7 +1861,7 @@
if SHARK_BUILD
printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
-if WITH_CACAO
+if ENABLE_CACAO
printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
if ENABLE_SYSTEMTAP
@@ -2365,7 +2366,7 @@
check-jdk: stamps/jtreg.stamp
mkdir -p test/jdk/JTwork test/jdk/JTreport
-if WITH_CACAO
+if ENABLE_CACAO
CACAO_EXCLUDE="-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.cacao.jtx"
endif
if test "x$${DISPLAY}" = "x"; then XVFB_RUN="@XVFB_RUN_CMD@"; fi; \
diff -r 3024025d7759 -r 3331b5399731 NEWS
--- a/NEWS Mon May 23 15:52:47 2011 +0100
+++ b/NEWS Wed May 25 13:19:52 2011 +0100
@@ -12,6 +12,7 @@
- PR616, PR99: Don't statically link libstdc++
- PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize.
- PR714: Forwardport replace-hotspot support from IcedTea6.
+ - PR103: Usage of native2ascii during bootstrap
* JamVM
- Ignore all unknown options.
- Handle overflow in getPhysicalMemory().
diff -r 3024025d7759 -r 3331b5399731 acinclude.m4
--- a/acinclude.m4 Mon May 23 15:52:47 2011 +0100
+++ b/acinclude.m4 Wed May 25 13:19:52 2011 +0100
@@ -209,28 +209,41 @@
AC_DEFUN([IT_FIND_JAVA],
[
- AC_MSG_CHECKING(for java)
+ JAVA_DEFAULT=${SYSTEM_JDK_DIR}/bin/java
+ AC_MSG_CHECKING([if a java binary was specified])
AC_ARG_WITH([java],
[AS_HELP_STRING([--with-java[[=PATH]]],specify location of a 1.5 Java VM)],
[
- JAVA="${withval}"
+ if test "x${withval}" = "xyes"; then
+ JAVA=no
+ else
+ JAVA="${withval}"
+ fi
],
[
- JAVA=${SYSTEM_JDK_DIR}/bin/java
+ JAVA=no
])
- if ! test -f "${JAVA}"; then
- AC_PATH_PROG(JAVA, "${JAVA}")
+ AC_MSG_RESULT(${JAVA})
+ if test "x${JAVA}" = "xno"; then
+ JAVA=${JAVA_DEFAULT}
fi
- if test -z "${JAVA}"; then
- AC_PATH_PROG(JAVA, "gij")
+ AC_MSG_CHECKING([if $JAVA is a valid executable])
+ if test -x "${JAVA}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ JAVA=""
+ AC_PATH_PROG(JAVA, "java")
+ if test -z "${JAVA}"; then
+ AC_PATH_PROG(JAVA, "gij")
+ fi
+ if test -z "${JAVA}"; then
+ AC_PATH_PROG(JAVA, "cacao")
+ fi
+ if test -z "${JAVA}"; then
+ AC_MSG_ERROR("A 1.5-compatible Java VM is required.")
+ fi
fi
- if test -z "${JAVA}"; then
- AC_PATH_PROG(JAVA, "java")
- fi
- if test -z "${JAVA}"; then
- AC_MSG_ERROR("A 1.5-compatible Java VM is required.")
- fi
- AC_MSG_RESULT(${JAVA})
AC_SUBST(JAVA)
])
@@ -367,15 +380,19 @@
if test "x${JAVAH}" == "xno"; then
JAVAH=${JAVAH_DEFAULT}
fi
- AC_PATH_PROG(JAVAH, "${JAVAH}")
- if test -z "${JAVAH}"; then
+ AC_MSG_CHECKING([if $JAVAH is a valid executable])
+ if test -x "${JAVAH}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ JAVAH=""
AC_PATH_PROG(JAVAH, "javah")
- fi
- if test -z "${JAVAH}"; then
- AC_PATH_PROG(JAVAH, "gjavah")
- fi
- if test -z "${JAVAH}"; then
- AC_MSG_ERROR("A Java header generator was not found.")
+ if test -z "${JAVAH}"; then
+ AC_PATH_PROG(JAVAH, "gjavah")
+ fi
+ if test -z "${JAVAH}"; then
+ AC_MSG_ERROR("A Java header generator was not found.")
+ fi
fi
AC_SUBST(JAVAH)
])
@@ -400,15 +417,19 @@
if test "x${JAR}" == "xno"; then
JAR=${JAR_DEFAULT}
fi
- AC_PATH_PROG(JAR, "${JAR}")
- if test -z "${JAR}"; then
+ AC_MSG_CHECKING([if $JAR is a valid executable])
+ if test -x "${JAR}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ JAR=""
AC_PATH_PROG(JAR, "jar")
- fi
- if test -z "${JAR}"; then
- AC_PATH_PROG(JAR, "gjar")
- fi
- if test -z "${JAR}"; then
- AC_MSG_ERROR("No Java archive tool was found.")
+ if test -z "${JAR}"; then
+ AC_PATH_PROG(JAR, "gjar")
+ fi
+ if test -z "${JAR}"; then
+ AC_MSG_ERROR("No Java archive tool was found.")
+ fi
fi
AC_MSG_CHECKING([whether jar supports @<file> argument])
touch _config.txt
@@ -466,19 +487,60 @@
if test "x${RMIC}" = "xno"; then
RMIC=${RMIC_DEFAULT}
fi
- AC_PATH_PROG(RMIC, "${RMIC}")
- if test -z "${RMIC}"; then
+ AC_MSG_CHECKING([if $RMIC is a valid executable])
+ if test -x "${RMIC}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ RMIC=""
AC_PATH_PROG(RMIC, "rmic")
- fi
- if test -z "${RMIC}"; then
- AC_PATH_PROG(RMIC, "grmic")
- fi
- if test -z "${RMIC}"; then
- AC_MSG_ERROR("An RMI compiler was not found.")
+ if test -z "${RMIC}"; then
+ AC_PATH_PROG(RMIC, "grmic")
+ fi
+ if test -z "${RMIC}"; then
+ AC_MSG_ERROR("An RMI compiler was not found.")
+ fi
fi
AC_SUBST(RMIC)
])
+AC_DEFUN([IT_FIND_NATIVE2ASCII],
+[
+ NATIVE2ASCII_DEFAULT=${SYSTEM_JDK_DIR}/bin/native2ascii
+ AC_MSG_CHECKING([if a native2ascii binary was specified])
+ AC_ARG_WITH([native2ascii],
+ [AS_HELP_STRING(--with-native2ascii,specify location of the native2ascii converter)],
+ [
+ if test "x${withval}" = "xyes"; then
+ NATIVE2ASCII=no
+ else
+ NATIVE2ASCII="${withval}"
+ fi
+ ],
+ [
+ NATIVE2ASCII=no
+ ])
+ AC_MSG_RESULT(${NATIVE2ASCII})
+ if test "x${NATIVE2ASCII}" = "xno"; then
+ NATIVE2ASCII=${NATIVE2ASCII_DEFAULT}
+ fi
+ AC_MSG_CHECKING([if $NATIVE2ASCII is a valid executable])
+ if test -x "${NATIVE2ASCII}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ NATIVE2ASCII=""
+ AC_PATH_PROG(NATIVE2ASCII, "native2ascii")
+ if test -z "${NATIVE2ASCII}"; then
+ AC_PATH_PROG(NATIVE2ASCII, "gnative2ascii")
+ fi
+ if test -z "${NATIVE2ASCII}"; then
+ AC_MSG_ERROR("A native2ascii converter was not found.")
+ fi
+ fi
+ AC_SUBST([NATIVE2ASCII])
+])
+
AC_DEFUN([IT_WITH_OPENJDK_SRC_ZIP],
[
AC_MSG_CHECKING([for an OpenJDK source zip])
More information about the distro-pkg-dev
mailing list