/hg/icedtea6: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Feb 23 12:40:51 PST 2011
changeset ef85acf6d959 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ef85acf6d959
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 23 20:25:24 2011 +0000
Check existence of source zips during configure.
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 3ab8ffa7e1c0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3ab8ffa7e1c0
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 23 20:32:30 2011 +0000
Treat --without-x-src-zip as equivalent to not specifying the
option.
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 fcde34790552 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fcde34790552
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 23 20:39:53 2011 +0000
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.
diffstat:
3 files changed, 100 insertions(+), 37 deletions(-)
ChangeLog | 37 ++++++++++++++++++++++++++
acinclude.m4 | 80 ++++++++++++++++++++++++++++++++++++++--------------------
configure.ac | 20 +++++++-------
diffs (322 lines):
diff -r 5357369e2385 -r fcde34790552 ChangeLog
--- a/ChangeLog Wed Feb 23 20:07:35 2011 +0000
+++ b/ChangeLog Wed Feb 23 20:39:53 2011 +0000
@@ -1,3 +1,40 @@ 2011-02-23 Andrew John Hughes <ahughes
+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-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-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>
* patches/cacao/arm-jvm.cfg-pr600.patch:
diff -r 5357369e2385 -r fcde34790552 acinclude.m4
--- a/acinclude.m4 Wed Feb 23 20:07:35 2011 +0000
+++ b/acinclude.m4 Wed Feb 23 20:39:53 2011 +0000
@@ -599,12 +599,16 @@ AC_DEFUN([IT_WITH_OPENJDK_SRC_ZIP],
[AS_HELP_STRING(--with-openjdk-src-zip,specify the location of the openjdk source zip)],
[
ALT_OPENJDK_SRC_ZIP=${withval}
- AM_CONDITIONAL(USE_ALT_OPENJDK_SRC_ZIP, test x = x)
+ if test "x${ALT_OPENJDK_SRC_ZIP}" = "xno"; then
+ ALT_OPENJDK_SRC_ZIP="not specified"
+ elif ! test -f ${ALT_OPENJDK_SRC_ZIP} ; then
+ AC_MSG_ERROR([Invalid OpenJDK source zip specified: ${ALT_OPENJDK_SRC_ZIP}])
+ fi
],
[
ALT_OPENJDK_SRC_ZIP="not specified"
- AM_CONDITIONAL(USE_ALT_OPENJDK_SRC_ZIP, test x != x)
])
+ AM_CONDITIONAL(USE_ALT_OPENJDK_SRC_ZIP, test "x{ALT_OPENJDK_SRC_ZIP}" = "xnot specified")
AC_MSG_RESULT(${ALT_OPENJDK_SRC_ZIP})
AC_SUBST(ALT_OPENJDK_SRC_ZIP)
])
@@ -901,7 +905,7 @@ AC_DEFUN([IT_SET_SHARK_BUILD],
AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
])
-AC_DEFUN([IT_CHECK_ENABLE_JAMVM],
+AC_DEFUN([IT_ENABLE_JAMVM],
[
AC_MSG_CHECKING(whether to use JamVM as VM)
AC_ARG_ENABLE([jamvm],
@@ -918,14 +922,16 @@ AC_DEFUN([IT_CHECK_ENABLE_JAMVM],
AC_SUBST(ENABLE_JAMVM)
])
-AC_DEFUN([IT_CHECK_WITH_JAMVM_SRC_ZIP],
+AC_DEFUN([IT_WITH_JAMVM_SRC_ZIP],
[
AC_MSG_CHECKING([for a JamVM source zip])
AC_ARG_WITH([jamvm-src-zip],
[AS_HELP_STRING(--with-jamvm-src-zip,specify the location of the JamVM source zip)],
[
ALT_JAMVM_SRC_ZIP=${withval}
- if ! test -f ${ALT_JAMVM_SRC_ZIP} ; then
+ if test "x${ALT_JAMVM_SRC_ZIP}" = "xno"; then
+ ALT_JAMVM_SRC_ZIP="not specified"
+ elif ! test -f ${ALT_JAMVM_SRC_ZIP} ; then
AC_MSG_ERROR([Invalid JamVM source zip specified: ${ALT_JAMVM_SRC_ZIP}])
fi
],
@@ -937,7 +943,7 @@ AC_DEFUN([IT_CHECK_WITH_JAMVM_SRC_ZIP],
AC_SUBST(ALT_JAMVM_SRC_ZIP)
])
-AC_DEFUN([IT_CHECK_ENABLE_CACAO],
+AC_DEFUN([IT_ENABLE_CACAO],
[
AC_MSG_CHECKING(whether to use CACAO as VM)
AC_ARG_ENABLE([cacao],
@@ -954,7 +960,7 @@ AC_DEFUN([IT_CHECK_ENABLE_CACAO],
AC_SUBST(ENABLE_CACAO)
])
-AC_DEFUN([IT_CHECK_WITH_CACAO_HOME],
+AC_DEFUN([IT_WITH_CACAO_HOME],
[
AC_MSG_CHECKING([for a CACAO home directory])
AC_ARG_WITH([cacao-home],
@@ -979,24 +985,28 @@ AC_DEFUN([IT_CHECK_WITH_CACAO_HOME],
AC_SUBST(CACAO_IMPORT_PATH)
])
-AC_DEFUN([IT_CHECK_WITH_CACAO_SRC_ZIP],
+AC_DEFUN([IT_WITH_CACAO_SRC_ZIP],
[
AC_MSG_CHECKING([for a CACAO source zip])
AC_ARG_WITH([cacao-src-zip],
[AS_HELP_STRING(--with-cacao-src-zip,specify the location of the CACAO source zip)],
[
ALT_CACAO_SRC_ZIP=${withval}
- AM_CONDITIONAL(USE_ALT_CACAO_SRC_ZIP, test x = x)
+ if test "x${ALT_CACAO_SRC_ZIP}" = "xno"; then
+ ALT_CACAO_SRC_ZIP="not specified"
+ elif ! test -f ${ALT_CACAO_SRC_ZIP} ; then
+ AC_MSG_ERROR([Invalid CACAO source zip specified: ${ALT_CACAO_SRC_ZIP}])
+ fi
],
[
ALT_CACAO_SRC_ZIP="not specified"
- AM_CONDITIONAL(USE_ALT_CACAO_SRC_ZIP, test x != x)
])
+ AM_CONDITIONAL(USE_ALT_CACAO_SRC_ZIP, test "x{ALT_CACAO_SRC_ZIP}" = "xnot specified")
AC_MSG_RESULT(${ALT_CACAO_SRC_ZIP})
AC_SUBST(ALT_CACAO_SRC_ZIP)
])
-AC_DEFUN([IT_CHECK_WITH_CACAO_SRC_DIR],
+AC_DEFUN([IT_WITH_CACAO_SRC_DIR],
[
AC_MSG_CHECKING([for a CACAO source directory])
AC_ARG_WITH([cacao-src-dir],
@@ -1013,7 +1023,7 @@ AC_DEFUN([IT_CHECK_WITH_CACAO_SRC_DIR],
AC_SUBST(ALT_CACAO_SRC_DIR)
])
-AC_DEFUN([IT_CHECK_WITH_GCJ],
+AC_DEFUN([IT_WITH_GCJ],
[
AC_MSG_CHECKING([whether to compile ecj natively])
AC_ARG_WITH([gcj],
@@ -1031,7 +1041,7 @@ AC_DEFUN([IT_CHECK_WITH_GCJ],
AC_SUBST([GCJ])
])
-AC_DEFUN([IT_CHECK_WITH_HOTSPOT_BUILD],
+AC_DEFUN([IT_WITH_HOTSPOT_BUILD],
[
ORIGINAL_BUILD="original"
ALTERNATE_BUILD="hs20"
@@ -1057,68 +1067,84 @@ AC_DEFUN([IT_CHECK_WITH_HOTSPOT_BUILD],
AC_DEFUN([IT_WITH_HOTSPOT_SRC_ZIP],
[
- AC_MSG_CHECKING(for a HotSpot source zip)
+ AC_MSG_CHECKING([for a HotSpot source zip])
AC_ARG_WITH([hotspot-src-zip],
[AS_HELP_STRING(--with-hotspot-src-zip,specify the location of the hotspot source zip)],
[
ALT_HOTSPOT_SRC_ZIP=${withval}
- AM_CONDITIONAL(USE_ALT_HOTSPOT_SRC_ZIP, test x = x)
+ if test "x${ALT_HOTSPOT_SRC_ZIP}" = "xno"; then
+ ALT_HOTSPOT_SRC_ZIP="not specified"
+ elif ! test -f ${ALT_HOTSPOT_SRC_ZIP} ; then
+ AC_MSG_ERROR([Invalid HotSpot source zip specified: ${ALT_HOTSPOT_SRC_ZIP}])
+ fi
],
[
ALT_HOTSPOT_SRC_ZIP="not specified"
- AM_CONDITIONAL(USE_ALT_HOTSPOT_SRC_ZIP, test x != x)
])
+ AM_CONDITIONAL(USE_ALT_HOTSPOT_SRC_ZIP, test "x{ALT_HOTSPOT_SRC_ZIP}" = "xnot specified")
AC_MSG_RESULT(${ALT_HOTSPOT_SRC_ZIP})
AC_SUBST(ALT_HOTSPOT_SRC_ZIP)
])
AC_DEFUN([IT_WITH_JAXP_DROP_ZIP],
[
- AC_MSG_CHECKING(for a JAXP drop zip)
+ AC_MSG_CHECKING([for a JAXP drop zip])
AC_ARG_WITH([jaxp-drop-zip],
[AS_HELP_STRING(--with-jaxp-drop-zip,specify the location of the JAXP drop zip)],
[
ALT_JAXP_DROP_ZIP=${withval}
- AM_CONDITIONAL(USE_ALT_JAXP_DROP_ZIP, test x = x)
+ if test "x${ALT_JAXP_DROP_ZIP}" = "xno"; then
+ ALT_JAXP_DROP_ZIP="not specified"
+ elif ! test -f ${ALT_JAXP_DROP_ZIP} ; then
+ AC_MSG_ERROR([Invalid JAXP drop zip specified: ${ALT_JAXP_DROP_ZIP}])
+ fi
],
[
ALT_JAXP_DROP_ZIP="not specified"
- AM_CONDITIONAL(USE_ALT_JAXP_DROP_ZIP, test x != x)
])
+ AM_CONDITIONAL(USE_ALT_JAXP_DROP_ZIP, test "x{ALT_JAXP_DROP_ZIP}" = "xnot specified")
AC_MSG_RESULT(${ALT_JAXP_DROP_ZIP})
AC_SUBST(ALT_JAXP_DROP_ZIP)
])
AC_DEFUN([IT_WITH_JAF_DROP_ZIP],
[
- AC_MSG_CHECKING(for a JAF drop zip)
+ AC_MSG_CHECKING([for a JAF drop zip])
AC_ARG_WITH([jaf-drop-zip],
[AS_HELP_STRING(--with-jaf-drop-zip,specify the location of the JAF drop zip)],
[
ALT_JAF_DROP_ZIP=${withval}
- AM_CONDITIONAL(USE_ALT_JAF_DROP_ZIP, test x = x)
+ if test "x${ALT_JAF_DROP_ZIP}" = "xno"; then
+ ALT_JAF_DROP_ZIP="not specified"
+ elif ! test -f ${ALT_JAF_DROP_ZIP} ; then
+ AC_MSG_ERROR([Invalid JAF drop zip specified: ${ALT_JAF_DROP_ZIP}])
+ fi
],
[
ALT_JAF_DROP_ZIP="not specified"
- AM_CONDITIONAL(USE_ALT_JAF_DROP_ZIP, test x != x)
])
+ AM_CONDITIONAL(USE_ALT_JAF_DROP_ZIP, test "x{ALT_JAF_DROP_ZIP}" = "xnot specified")
AC_MSG_RESULT(${ALT_JAF_DROP_ZIP})
AC_SUBST(ALT_JAF_DROP_ZIP)
])
AC_DEFUN([IT_WITH_JAXWS_DROP_ZIP],
[
- AC_MSG_CHECKING(for a JAXWS drop zip)
+ AC_MSG_CHECKING([for a JAXWS drop zip])
AC_ARG_WITH([jaxws-drop-zip],
[AS_HELP_STRING(--with-jaxws-drop-zip,specify the location of the JAXWS drop zip)],
[
ALT_JAXWS_DROP_ZIP=${withval}
- AM_CONDITIONAL(USE_ALT_JAXWS_DROP_ZIP, test x = x)
+ if test "x${ALT_JAXWS_DROP_ZIP}" = "xno"; then
+ ALT_JAXWS_DROP_ZIP="not specified"
+ elif ! test -f ${ALT_JAXWS_DROP_ZIP} ; then
+ AC_MSG_ERROR([Invalid JAXWS drop zip specified: ${ALT_JAXWS_DROP_ZIP}])
+ fi
],
[
ALT_JAXWS_DROP_ZIP="not specified"
- AM_CONDITIONAL(USE_ALT_JAXWS_DROP_ZIP, test x != x)
])
+ AM_CONDITIONAL(USE_ALT_JAXWS_DROP_ZIP, test "x{ALT_JAXWS_DROP_ZIP}" = "xnot specified")
AC_MSG_RESULT(${ALT_JAXWS_DROP_ZIP})
AC_SUBST(ALT_JAXWS_DROP_ZIP)
])
@@ -1145,7 +1171,7 @@ AC_DEFUN([IT_ENABLE_HG],
AM_CONDITIONAL([USE_HG], test x"${enable_hg}" = "xyes")
])
-AC_DEFUN([IT_CHECK_WITH_HG_REVISION],
+AC_DEFUN([IT_WITH_HG_REVISION],
[
AC_MSG_CHECKING([which Mercurial revision to use])
AC_ARG_WITH([hg-revision],
@@ -1225,7 +1251,7 @@ AC_DEFUN([IT_CHECK_FOR_JDK],
AC_SUBST(SYSTEM_JDK_DIR)
])
-AC_DEFUN([IT_CHECK_WITH_TZDATA_DIR],
+AC_DEFUN([IT_WITH_TZDATA_DIR],
[
DEFAULT="/usr/share/javazi"
AC_MSG_CHECKING([which Java timezone data directory to use])
diff -r 5357369e2385 -r fcde34790552 configure.ac
--- a/configure.ac Wed Feb 23 20:07:35 2011 +0000
+++ b/configure.ac Wed Feb 23 20:39:53 2011 +0000
@@ -44,8 +44,8 @@ IT_CHECK_FOR_MERCURIAL
IT_CHECK_FOR_MERCURIAL
IT_OBTAIN_HG_REVISIONS
AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
-IT_CHECK_WITH_GCJ
-IT_CHECK_WITH_HOTSPOT_BUILD
+IT_WITH_GCJ
+IT_WITH_HOTSPOT_BUILD
AC_PATH_TOOL([LINUX32],[linux32])
IT_CHECK_GCC_VERSION
IT_CHECK_NUMBER_OF_PARALLEL_JOBS
@@ -171,21 +171,21 @@ IT_WITH_JAF_DROP_ZIP
IT_WITH_JAF_DROP_ZIP
IT_WITH_JAXWS_DROP_ZIP
-IT_CHECK_ENABLE_CACAO
-IT_CHECK_WITH_CACAO_HOME
-IT_CHECK_WITH_CACAO_SRC_ZIP
-IT_CHECK_WITH_CACAO_SRC_DIR
+IT_ENABLE_CACAO
+IT_WITH_CACAO_HOME
+IT_WITH_CACAO_SRC_ZIP
+IT_WITH_CACAO_SRC_DIR
-IT_CHECK_ENABLE_JAMVM
-IT_CHECK_WITH_JAMVM_SRC_ZIP
+IT_ENABLE_JAMVM
+IT_WITH_JAMVM_SRC_ZIP
IT_DISABLE_OPTIMIZATIONS
IT_SET_SHARK_BUILD
IT_ENABLE_ZERO_BUILD
IT_CHECK_ADDITIONAL_VMS
IT_ENABLE_HG
-IT_CHECK_WITH_HG_REVISION
-IT_CHECK_WITH_TZDATA_DIR
+IT_WITH_HG_REVISION
+IT_WITH_TZDATA_DIR
IT_GETDTDTYPE_CHECK
IT_JAVAH
More information about the distro-pkg-dev
mailing list