changeset in /hg/icedtea: Fix building with --enable-hg by addin...
Andrew John Hughes
ahughes at redhat.com
Wed May 27 11:33:11 PDT 2009
changeset 31e361735a0c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=31e361735a0c
description:
Fix building with --enable-hg by adding support for the IcedTea project.
2009-05-27 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Add support for IcedTea project and make this
the default. Update download URLs to be relative
to the IcedTea project URL. Always include javax.script
in copy dirs (conditional is an artefact of IcedTea6 merge).
* acinclude.m4:
(WITH_PROJECT): Add support for IcedTea and make it the
default.
diffstat:
3 files changed, 40 insertions(+), 26 deletions(-)
ChangeLog | 11 +++++++++++
Makefile.am | 42 ++++++++++++++++++++++--------------------
acinclude.m4 | 13 +++++++------
diffs (157 lines):
diff -r ea63ce8e8819 -r 31e361735a0c ChangeLog
--- a/ChangeLog Wed May 27 17:57:45 2009 +0100
+++ b/ChangeLog Wed May 27 19:35:49 2009 +0100
@@ -1,3 +1,14 @@ 2009-05-27 Andrew John Hughes <ahughes
+2009-05-27 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Add support for IcedTea project and make this
+ the default. Update download URLs to be relative
+ to the IcedTea project URL. Always include javax.script
+ in copy dirs (conditional is an artefact of IcedTea6 merge).
+ * acinclude.m4:
+ (WITH_PROJECT): Add support for IcedTea and make it the
+ default.
+
2009-05-27 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r ea63ce8e8819 -r 31e361735a0c Makefile.am
--- a/Makefile.am Wed May 27 17:57:45 2009 +0100
+++ b/Makefile.am Wed May 27 19:35:49 2009 +0100
@@ -1677,6 +1677,7 @@ dist-openjdk: stamps/extract-cacao.stamp
OPENJDK_HOTSPOT_URL = http://hg.openjdk.java.net/jdk7/hotspot/hotspot
+ICEDTEA_HG_URL = http://hg.openjdk.java.net/icedtea/jdk7
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/
CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/
@@ -1684,13 +1685,13 @@ BSD_HG_URL = http://hg.openjdk.java.net/
BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port
NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/
-OPENJDK_URL = http://hg.openjdk.java.net/icedtea/jdk7
-CORBA_URL = http://hg.openjdk.java.net/icedtea/jdk7/corba
-JAXP_URL = http://hg.openjdk.java.net/icedtea/jdk7/jaxp
-JAXWS_URL = http://hg.openjdk.java.net/icedtea/jdk7/jaxws
-JDK_URL = http://hg.openjdk.java.net/icedtea/jdk7/jdk
-LANGTOOLS_URL = http://hg.openjdk.java.net/icedtea/jdk7/langtools
-HOTSPOT_URL = http://hg.openjdk.java.net/icedtea/jdk7/hotspot
+OPENJDK_URL = $(ICEDTEA_HG_URL)
+CORBA_URL = $(ICEDTEA_HG_URL)/corba
+JAXP_URL = $(ICEDTEA_HG_URL)/jaxp
+JAXWS_URL = $(ICEDTEA_HG_URL)/jaxws
+JDK_URL = $(ICEDTEA_HG_URL)/jdk
+LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langtools
+HOTSPOT_URL = $(ICEDTEA_HG_URL)/hotspot
if USE_ALT_OPENJDK_SRC_ZIP
OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
@@ -1776,11 +1777,22 @@ if USE_NIO2
if USE_NIO2
hg fclone $(NIO2_HG_URL) openjdk;
else
+if USE_JDK7
+ hg fclone $(OPENJDK_HG_URL) openjdk;
+else
if USE_HG
if WITH_HGREV
- $(HG) fclone -r $(HGREV) $(OPENJDK_HG_URL) openjdk;
+ $(HG) fclone -r $(HGREV) $(ICEDTEA_HG_URL) openjdk;
else
- $(HG) fclone $(OPENJDK_HG_URL) openjdk;
+ $(HG) fclone $(ICEDTEA_HG_URL) openjdk;
+endif
+endif
+endif
+endif
+endif
+endif
+endif
+endif
endif
else
if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \
@@ -1837,13 +1849,6 @@ else
fi ; \
$(WGET) $(LANGTOOLS_URL)/archive/$(LANGTOOLS_CHANGESET).tar.gz -O $(LANGTOOLS_SRC_ZIP); \
fi ;
-endif
-endif
-endif
-endif
-endif
-endif
-endif
if ! echo "$(HS_MD5SUM) $(HOTSPOT_SRC_ZIP)" \
| $(MD5SUM) --check ; \
then \
@@ -2929,10 +2934,7 @@ ICEDTEA_COPY_DIRS = \
java/util \
java/rmi \
sun/awt/ \
- javax/net/ssl
-
-if WITH_ALT_HSBUILD
-ICEDTEA_COPY_DIRS += \
+ javax/net/ssl \
javax/script
endif
diff -r ea63ce8e8819 -r 31e361735a0c acinclude.m4
--- a/acinclude.m4 Wed May 27 17:57:45 2009 +0100
+++ b/acinclude.m4 Wed May 27 19:35:49 2009 +0100
@@ -889,7 +889,7 @@ AC_DEFUN([ENABLE_HG],
[
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=no]])],
+ [AS_HELP_STRING(--enable-hg,download source code from Mercurial [[default=depends on project]])],
[
case "${enableval}" in
no)
@@ -902,7 +902,7 @@ AC_DEFUN([ENABLE_HG],
],
[
case "${project}" in
- jdk7)
+ icedtea)
enable_hg=no
;;
*)
@@ -946,14 +946,14 @@ AC_DEFUN([WITH_PROJECT],
[
AC_MSG_CHECKING(which OpenJDK project is being used)
AC_ARG_WITH([project],
- [AS_HELP_STRING(--with-project,choose the OpenJDK project to use: jdk7 closures cvmi caciocavallo bsd nio2 [[default=jdk7]])],
+ [AS_HELP_STRING(--with-project,choose the OpenJDK project to use: icedtea jdk7 closures cvmi caciocavallo bsd nio2 [[default=icedtea]])],
[
case "${withval}" in
yes)
- project=jdk7
+ project=icedtea
;;
no)
- project=jdk7
+ AC_MSG_ERROR([argument passed to --with-project should be a supported OpenJDK project (see help)])
;;
*)
project=${withval}
@@ -961,7 +961,7 @@ AC_DEFUN([WITH_PROJECT],
esac
],
[
- project=jdk7
+ project=icedtea
])
AC_MSG_RESULT([${project}])
AC_SUBST(PROJECT_NAME, $project)
@@ -970,6 +970,7 @@ AC_DEFUN([WITH_PROJECT],
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_JDK7], test x"${project}" = "xjdk7")
])
AC_DEFUN([AC_CHECK_WITH_GCJ],
More information about the distro-pkg-dev
mailing list