/hg/icedtea: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jun 2 17:41:42 UTC 2014
changeset aaf366c2ac6a in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=aaf366c2ac6a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Jun 02 17:16:14 2014 +0100
PR1364: Replace hgforest support
2014-06-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
* INSTALL:
Remove documentation of --with-project as
option is being removed.
* Makefile.am:
(OPENJDK_HG_URL): Removed.
(CVMI_HG_URL): Likewise.
(CLOSURES_HG_URL): Likewise.
(CACIOCAVALLO_HG_URL): Likewise.
(BSD_HG_URL): Likewise.
(NIO2_HG_URL): Likewise.
(REV_ARG): Added and set conditionally if
$(HGREV) is set.
(clean-local): Drop clean-hgforest.
(hgforest): Removed.
(clean-hgforest): Likewise.
(download-openjdk): Remove project conditionals.
Replace fclone usage with multiple clone calls.
(download-nashorn): Add hg support.
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_HG): Drop IT_WITH_PROJECT dependency
and simply to yes/no.
(IT_WITH_PROJECT): Removed.
* configure.ac: Drop IT_WITH_PROJECT.
changeset c728621e76f2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c728621e76f2
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Jun 02 18:41:24 2014 +0100
PR1813: HotSpot URL should be used with --enable-hg
2014-06-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1813: HotSpot URL should be used with --enable-hg
* Makefile.am:
(HOTSPOT_URL): Drop unused variable to avoid
confusion.
(.PHONY): Add clean-download-hotspot.
(download); Depend on download-hotspot.
(clean-download): Move clean-download-nashorn
to clean-download-openjdk to retain ordering.
(download-openjdk): Remove hotspot from for loop
and HotSpot zip download rules.
(clean-download-openjdk): Depend on clean-download-nashorn
and clean-download-hotspot.
(download-nashorn): Depend on download-openjdk so
root directory exists for Nashorn checkout.
(download-hotspot): New target. Cloning now uses HS_URL
as with zip downloading.
(clean-download-hotspot): Separated from clean-download-openjdk.
* NEWS: Updated.
diffstat:
ChangeLog | 55 ++++++++++++++++++++++-
INSTALL | 3 -
Makefile.am | 136 +++++++++++++++++++++++-----------------------------------
NEWS | 2 +
acinclude.m4 | 44 +------------------
configure.ac | 1 -
6 files changed, 111 insertions(+), 130 deletions(-)
diffs (407 lines):
diff -r 239ef498435c -r c728621e76f2 ChangeLog
--- a/ChangeLog Mon Jun 02 14:50:10 2014 +0100
+++ b/ChangeLog Mon Jun 02 18:41:24 2014 +0100
@@ -1,11 +1,60 @@
-2014-06-02 Andrew John Hughes <ahughes at redhat.com>
+2014-06-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1813: HotSpot URL should be used with --enable-hg
+ * Makefile.am:
+ (HOTSPOT_URL): Drop unused variable to avoid
+ confusion.
+ (.PHONY): Add clean-download-hotspot.
+ (download); Depend on download-hotspot.
+ (clean-download): Move clean-download-nashorn
+ to clean-download-openjdk to retain ordering.
+ (download-openjdk): Remove hotspot from for loop
+ and HotSpot zip download rules.
+ (clean-download-openjdk): Depend on clean-download-nashorn
+ and clean-download-hotspot.
+ (download-nashorn): Depend on download-openjdk so
+ root directory exists for Nashorn checkout.
+ (download-hotspot): New target. Cloning now uses HS_URL
+ as with zip downloading.
+ (clean-download-hotspot): Separated from clean-download-openjdk.
+ * NEWS: Updated.
+
+2014-06-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1364: Replace hgforest support
+ * INSTALL:
+ Remove documentation of --with-project as
+ option is being removed.
+ * Makefile.am:
+ (OPENJDK_HG_URL): Removed.
+ (CVMI_HG_URL): Likewise.
+ (CLOSURES_HG_URL): Likewise.
+ (CACIOCAVALLO_HG_URL): Likewise.
+ (BSD_HG_URL): Likewise.
+ (NIO2_HG_URL): Likewise.
+ (REV_ARG): Added and set conditionally if
+ $(HGREV) is set.
+ (clean-local): Drop clean-hgforest.
+ (hgforest): Removed.
+ (clean-hgforest): Likewise.
+ (download-openjdk): Remove project conditionals.
+ Replace fclone usage with multiple clone calls.
+ (download-nashorn): Add hg support.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_ENABLE_HG): Drop IT_WITH_PROJECT dependency
+ and simply to yes/no.
+ (IT_WITH_PROJECT): Removed.
+ * configure.ac: Drop IT_WITH_PROJECT.
+
+2014-06-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(download-openjdk): Fix typo using
HOTSPOT_SHA256SUM instead of HS_SHA256SUM.
* NEWS: Updated.
-2014-05-30 Andrew John Hughes <ahughes at redhat.com>
+2014-05-30 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1806: Support Debian/Ubuntu 7 & 8 OpenJDK
Installs as Boot JDK
@@ -15,7 +64,7 @@
and java-8-openjdk to ICEDTEA7_VMS and
ICEDTEA8_VMS respectively.
-2014-05-29 Andrew John Hughes <ahughes at redhat.com>
+2014-05-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/alt-jar.patch,
* patches/cacao/arch.patch,
diff -r 239ef498435c -r c728621e76f2 INSTALL
--- a/INSTALL Mon Jun 02 14:50:10 2014 +0100
+++ b/INSTALL Mon Jun 02 18:41:24 2014 +0100
@@ -167,9 +167,6 @@
* --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset.
* --with-llvm-config: Specify the location of the llvm-config binary.
* --with-version-suffix: Appends the given text to the JDK version output.
-* --with-project: Build an OpenJDK project from the following: icedtea, jdk7, closures, cvmi, cacaiocavallo,
- bsd, nio2. The default is icedtea. Use of others is at the user's risk and builds may fail. This setting
- affects which forest is checked out when --enable-hg is used and the set of patches applied.
Other options may be supplied which enable or disable new features.
These are documented fully in the relevant section below.
diff -r 239ef498435c -r c728621e76f2 Makefile.am
--- a/Makefile.am Mon Jun 02 14:50:10 2014 +0100
+++ b/Makefile.am Mon Jun 02 18:41:24 2014 +0100
@@ -38,12 +38,6 @@
ICEDTEA_PREFIX = icedtea8-forest
ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX)
-OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk8/jdk8
-CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/
-CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/
-CACIOCAVALLO_HG_URL = http://hg.openjdk.java.net/caciocavallo/jdk8/
-BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port
-NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/
OPENJDK_URL = $(ICEDTEA_HG_URL)
CORBA_URL = $(ICEDTEA_HG_URL)/corba
@@ -51,7 +45,6 @@
JAXWS_URL = $(ICEDTEA_HG_URL)/jaxws
JDK_URL = $(ICEDTEA_HG_URL)/jdk
LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langtools
-HOTSPOT_URL = $(ICEDTEA_HG_URL)/hotspot
NASHORN_URL = $(ICEDTEA_HG_URL)/nashorn
# Build directories
@@ -139,6 +132,10 @@
NASHORN_SRC_ZIP = nashorn.tar.gz
endif
+if WITH_HGREV
+REV_ARG = -r $(HGREV)
+endif
+
if ENABLE_PULSE_JAVA
PULSE_JAVA_TARGET = stamps/pulse-java.stamp
endif
@@ -503,7 +500,7 @@
clean-icedtea clean-icedtea-debug clean-icedtea-boot clean-clone clean-clone-boot \
clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
- clean-extract clean-native-ecj clean-hgforest clean-icedtea-stage2 \
+ clean-extract clean-native-ecj clean-icedtea-stage2 \
clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter
if [ -e bootstrap ]; then \
@@ -535,7 +532,7 @@
jtregcheck clean-remove-intree-libraries \
clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \
clean-extract-hotspot clean-sanitise-openjdk clean-icedtea-debug \
- clean-download-nashorn clean-extract-nashorn
+ clean-download-nashorn clean-extract-nashorn clean-download-hotspot
env:
@echo 'unset JAVA_HOME'
@@ -561,59 +558,24 @@
# OpenJDK Source Preparation Targets
# ==================================
-# Check for forest support
-
-stamps/hgforest.stamp:
-if USE_HG
- if ! $(HG) fclone -h; \
- then \
- echo "No forest extension found. Please refer to" \
- "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
- exit 1; \
- fi;
-endif
- mkdir -p stamps
- touch $@
-
-clean-hgforest:
- rm -f stamps/hgforest.stamp
-
# Download OpenJDK sources.
stamps/download.stamp: stamps/download-openjdk.stamp stamps/download-cacao.stamp stamps/download-jamvm.stamp \
- stamps/download-nashorn.stamp
+ stamps/download-nashorn.stamp stamps/download-hotspot.stamp
mkdir -p stamps
touch $@
-clean-download: clean-download-openjdk clean-download-cacao clean-download-jamvm clean-download-nashorn
+clean-download: clean-download-openjdk clean-download-cacao clean-download-jamvm
rm -f stamps/download.stamp
-stamps/download-openjdk.stamp: stamps/hgforest.stamp
-if !OPENJDK_SRC_DIR_FOUND
-if USE_CLOSURES
- $(HG) fclone $(CLOSURES_HG_URL) openjdk;
-else
-if USE_CVMI
- $(HG) fclone $(CVMI_HG_URL) openjdk;
-else
-if USE_CACIOCAVALLO
- $(HG) fclone $(CACIOCAVALLO_HG_URL) openjdk;
-else
-if USE_BSD
- $(HG) fclone $(BSD_HG_URL) openjdk;
-else
-if USE_NIO2
- hg fclone $(NIO2_HG_URL) openjdk;
-else
-if USE_ICEDTEA
- hg fclone $(ICEDTEA_HG_URL) openjdk;
+stamps/download-openjdk.stamp:
+if OPENJDK_SRC_DIR_FOUND
else
if USE_HG
-if WITH_HGREV
- $(HG) fclone -r $(HGREV) $(OPENJDK_HG_URL) openjdk;
-else
- $(HG) fclone $(OPENJDK_HG_URL) openjdk;
-endif
+ $(HG) clone $(REV_ARG) $(ICEDTEA_HG_URL) openjdk;
+ for repos in corba jaxp jaxws langtools jdk ; do \
+ $(HG) clone $(REV_ARG) $(ICEDTEA_HG_URL)/$${repos} openjdk/$${repos}; \
+ done
else
if USE_ALT_OPENJDK_SRC_ZIP
ln -sf $(ALT_OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP)
@@ -711,34 +673,12 @@
then echo "ERROR: Bad download of langtools zip"; false; \
fi; \
fi ;
-if USE_ALT_HOTSPOT_SRC_ZIP
- ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP)
-endif
- if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \
- | $(SHA256SUM) --check ; \
- then \
- if [ -e $(HOTSPOT_SRC_ZIP) ] ; \
- then \
- mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
- fi ; \
- $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
- if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \
- | $(SHA256SUM) --check ; \
- then echo "ERROR: Bad download of HotSpot zip"; false; \
- fi; \
- fi
-endif
-endif
-endif
-endif
-endif
-endif
endif
endif
mkdir -p stamps
touch $@
-clean-download-openjdk:
+clean-download-openjdk: clean-download-nashorn clean-download-hotspot
if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
rm -f $(OPENJDK_SRC_ZIP) ; \
fi
@@ -757,9 +697,6 @@
if [ ! -z $(LANGTOOLS_SRC_ZIP) ] ; then \
rm -f $(LANGTOOLS_SRC_ZIP) ; \
fi
- if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \
- rm -f $(HOTSPOT_SRC_ZIP) ; \
- fi
rm -f stamps/download-openjdk.stamp
stamps/download-cacao.stamp:
@@ -816,11 +753,15 @@
rm -f $(JAMVM_SRC_ZIP)
rm -f stamps/download-jamvm.stamp
-stamps/download-nashorn.stamp:
-if !OPENJDK_SRC_DIR_FOUND
+stamps/download-nashorn.stamp: stamps/download-openjdk.stamp
+if OPENJDK_SRC_DIR_FOUND
+else
+if USE_HG
+ $(HG) clone $(REV_ARG) $(ICEDTEA_HG_URL)/nashorn openjdk/nashorn
+else
if USE_ALT_NASHORN_SRC_ZIP
ln -sf $(ALT_NASHORN_SRC_ZIP) $(NASHORN_SRC_ZIP)
-else
+endif
if ! echo "$(NASHORN_SHA256SUM) $(NASHORN_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
@@ -845,6 +786,39 @@
fi
rm -f stamps/download-nashorn.stamp
+stamps/download-hotspot.stamp: stamps/download-openjdk.stamp
+if OPENJDK_SRC_DIR_FOUND
+else
+if USE_HG
+ $(HG) clone $(REV_ARG) $(HS_URL) openjdk/hotspot
+else
+if USE_ALT_HOTSPOT_SRC_ZIP
+ ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP)
+endif
+ if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \
+ | $(SHA256SUM) --check ; \
+ then \
+ if [ -e $(HOTSPOT_SRC_ZIP) ] ; \
+ then \
+ mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
+ fi ; \
+ $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
+ if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \
+ | $(SHA256SUM) --check ; \
+ then echo "ERROR: Bad download of HotSpot zip"; false; \
+ fi; \
+ fi
+endif
+endif
+ mkdir -p stamps
+ touch $@
+
+clean-download-hotspot:
+ if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \
+ rm -f $(HOTSPOT_SRC_ZIP) ; \
+ fi
+ rm -f stamps/download-hotspot.stamp
+
stamps/extract.stamp: stamps/extract-openjdk.stamp \
stamps/extract-cacao.stamp stamps/remove-intree-libraries.stamp \
stamps/extract-jamvm.stamp stamps/extract-hotspot.stamp \
diff -r 239ef498435c -r c728621e76f2 NEWS
--- a/NEWS Mon Jun 02 14:50:10 2014 +0100
+++ b/NEWS Mon Jun 02 18:41:24 2014 +0100
@@ -37,6 +37,8 @@
- Remove jcheck
- PR1806: Support Debian/Ubuntu 7 & 8 OpenJDK Installs as Boot JDK
- PR1812: Unable to locate HotSpot checksum when downloading
+ - PR1364: Replace hgforest support
+ - PR1813: HotSpot URL should be used with --enable-hg
* JamVM
- JSR 292: Invoke Dynamic
- JSR 308: Type Annotations
diff -r 239ef498435c -r c728621e76f2 acinclude.m4
--- a/acinclude.m4 Mon Jun 02 14:50:10 2014 +0100
+++ b/acinclude.m4 Mon Jun 02 18:41:24 2014 +0100
@@ -822,10 +822,9 @@
AC_DEFUN([IT_ENABLE_HG],
[
- AC_REQUIRE([IT_WITH_PROJECT])
AC_MSG_CHECKING(whether to retrieve the source code from Mercurial)
AC_ARG_ENABLE([hg],
- [AS_HELP_STRING(--enable-hg,download source code from Mercurial [[default=depends on project]])],
+ [AS_HELP_STRING(--enable-hg,download source code from Mercurial [[default=no]])],
[
case "${enableval}" in
no)
@@ -837,14 +836,7 @@
esac
],
[
- case "${project}" in
- jdk8)
- enable_hg=no
- ;;
- *)
- enable_hg=yes
- ;;
- esac
+ enable_hg=no
])
AC_MSG_RESULT([${enable_hg}])
AM_CONDITIONAL([USE_HG], test x"${enable_hg}" = "xyes")
@@ -878,38 +870,6 @@
AC_SUBST(VERSION_SUFFIX, $version_suffix)
])
-AC_DEFUN([IT_WITH_PROJECT],
-[
- DEFAULT_PROJECT="jdk8"
- AC_MSG_CHECKING(which OpenJDK project is being used)
- AC_ARG_WITH([project],
- [AS_HELP_STRING(--with-project=PROJECT,choose the OpenJDK project to use: icedtea jdk7 closures cvmi caciocavallo bsd nio2 [[PROJECT=icedtea]])],
- [
- case "${withval}" in
- yes)
- project="${DEFAULT_PROJECT}"
- ;;
- no)
- AC_MSG_ERROR([argument passed to --with-project should be a supported OpenJDK project (see help)])
- ;;
- *)
- project=${withval}
- ;;
- esac
- ],
- [
- project="${DEFAULT_PROJECT}"
- ])
- AC_MSG_RESULT([${project}])
- AC_SUBST(PROJECT_NAME, $project)
- AM_CONDITIONAL([USE_CLOSURES], test x"${project}" = "xclosures")
- AM_CONDITIONAL([USE_CVMI], test x"${project}" = "xcvmi")
- AM_CONDITIONAL([USE_CACIOCAVALLO], test x"${project}" = "xcaciocavallo")
- AM_CONDITIONAL([USE_BSD], test x"${project}" = "xbsd")
- AM_CONDITIONAL([USE_NIO2], test x"${project}" = "xnio2")
- AM_CONDITIONAL([USE_ICEDTEA], test x"${project}" = "xicedtea")
-])
-
AC_DEFUN([IT_WITH_GCJ],
[
AC_MSG_CHECKING([whether to compile ecj natively])
diff -r 239ef498435c -r c728621e76f2 configure.ac
--- a/configure.ac Mon Jun 02 14:50:10 2014 +0100
+++ b/configure.ac Mon Jun 02 18:41:24 2014 +0100
@@ -141,7 +141,6 @@
IT_CHECK_ADDITIONAL_VMS
IT_WITH_VERSION_SUFFIX
-IT_WITH_PROJECT
IT_ENABLE_HG
IT_WITH_TZDATA_DIR
More information about the distro-pkg-dev
mailing list