/hg/icedtea: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed May 12 02:59:13 PDT 2010
changeset 27ce7d579936 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=27ce7d579936
author: Matthias Klose <doko at ubuntu.com>
date: Wed May 12 09:38:28 2010 +0100
Proper dependency checking for files involved in the build of the
NPPlugin
2010-01-14 Matthias Klose <doko at ubuntu.com>
* Makefile.am (stamps/icedtea-npplugin): New target, add
file dependencies for building the IcedTeaNPPlugin.so.
changeset f6febe400063 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f6febe400063
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 12 10:22:50 2010 +0100
Cleanup quoting and output of configure macros and make them less
error-prone.
2010-01-16 Andrew John Hughes <ahughes at redhat.com>
configure output and option cleanup
* acinclude.m4: (FIND_ECJ_JAR): Always produce output,
not just when explicitly specified. (FIND_JAVAH): Handle the
yes and no possibilities better. (FIND_JAR):
Likewise. (FIND_RMIC): Likewise.
(WITH_OPENJDK_SRC_ZIP): Quote checking output.
(WITH_ALT_JAR_BINARY): Likewise. (FIND_XALAN2_JAR): Improve
wording. (FIND_XALAN2_SERIALIZER_JAR): Likewise.
(FIND_XERCES_JAR): Likewise. (FIND_NETBEANS): Handle yes and
no possibilities better. (FIND_RHINO_JAR): Quote
checking output. (ENABLE_ZERO_BUILD): Quote checking output.
(AC_CHECK_WITH_CACAO_SRC_ZIP): Likewise.
(AC_CHECK_WITH_CACAO_SRC_DIR): Likewise.
(IT_CHECK_NUMBER_OF_PARALLEL_JOBS): Moved to a macro from
configure.ac.
* configure.ac: Invoke new macros. Quote output and correct
typos. Perform IT_CHECK_ADDITIONAL_VMS earlier with Shark,
Zero and CACAO checks.
changeset 51f35c22d7b6 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=51f35c22d7b6
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 12 10:31:37 2010 +0100
Handle yes/no in --with-parallel-jobs, detecting the number of
processors when yes is specified.
2010-01-16 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_CHECK_NUMBER_OF_PARALLEL_JOBS):
Handle --with-parallel-jobs and
--without-parallel-jobs correctly.
--with-parallel-jobs (no arguments) uses available processors
+ 1, while
--without-parallel-jobs (the default) uses 2.
(IT_FIND_NUMBER_OF_PROCESSORS): Dependency of above. Uses
getconf to obtain the number of available processors.
diffstat:
4 files changed, 176 insertions(+), 80 deletions(-)
ChangeLog | 46 ++++++++++++++
Makefile.am | 5 +
acinclude.m4 | 180 +++++++++++++++++++++++++++++++++++++++-------------------
configure.ac | 25 +-------
diffs (461 lines):
diff -r b361e1d82aaa -r 51f35c22d7b6 ChangeLog
--- a/ChangeLog Tue May 11 21:40:50 2010 +0100
+++ b/ChangeLog Wed May 12 10:31:37 2010 +0100
@@ -1,3 +1,49 @@ 2010-05-11 Andrew John Hughes <ahughes@
+2010-01-16 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_CHECK_NUMBER_OF_PARALLEL_JOBS):
+ Handle --with-parallel-jobs and
+ --without-parallel-jobs correctly.
+ --with-parallel-jobs (no arguments) uses
+ available processors + 1, while
+ --without-parallel-jobs (the default) uses 2.
+ (IT_FIND_NUMBER_OF_PROCESSORS):
+ Dependency of above. Uses getconf to
+ obtain the number of available processors.
+
+2010-01-16 Andrew John Hughes <ahughes at redhat.com>
+
+ configure output and option cleanup
+ * acinclude.m4:
+ (FIND_ECJ_JAR): Always produce output,
+ not just when explicitly specified.
+ (FIND_JAVAH): Handle the yes and no
+ possibilities better.
+ (FIND_JAR): Likewise.
+ (FIND_RMIC): Likewise.
+ (WITH_OPENJDK_SRC_ZIP): Quote checking output.
+ (WITH_ALT_JAR_BINARY): Likewise.
+ (FIND_XALAN2_JAR): Improve wording.
+ (FIND_XALAN2_SERIALIZER_JAR): Likewise.
+ (FIND_XERCES_JAR): Likewise.
+ (FIND_NETBEANS): Handle yes and no
+ possibilities better.
+ (FIND_RHINO_JAR): Quote checking output.
+ (ENABLE_ZERO_BUILD): Quote checking output.
+ (AC_CHECK_WITH_CACAO_SRC_ZIP): Likewise.
+ (AC_CHECK_WITH_CACAO_SRC_DIR): Likewise.
+ (IT_CHECK_NUMBER_OF_PARALLEL_JOBS): Moved to a macro
+ from configure.ac.
+ * configure.ac:
+ Invoke new macros. Quote output and correct
+ typos. Perform IT_CHECK_ADDITIONAL_VMS earlier
+ with Shark, Zero and CACAO checks.
+
+2010-01-14 Matthias Klose <doko at ubuntu.com>
+
+ * Makefile.am (stamps/icedtea-npplugin): New target, add file
+ dependencies for building the IcedTeaNPPlugin.so.
+
2010-05-11 Andrew John Hughes <ahughes at redhat.com>
* .hgignore: Remove jar files.
diff -r b361e1d82aaa -r 51f35c22d7b6 Makefile.am
--- a/Makefile.am Tue May 11 21:40:50 2010 +0100
+++ b/Makefile.am Wed May 12 10:31:37 2010 +0100
@@ -177,7 +177,7 @@ if ENABLE_NPPLUGIN
if ENABLE_NPPLUGIN
PLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
PLUGIN_BUILD_DIR=$(abs_top_builddir)/plugin.build/icedteanp
-ICEDTEANPPLUGIN_TARGET = $(PLUGIN_BUILD_DIR)/IcedTeaNPPlugin.so
+ICEDTEANPPLUGIN_TARGET = stamps/icedtea-npplugin
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin
PLUGIN_PATCH = patches/icedtea-liveconnect.patch
LIVECONNECT_DIR = sun/applet netscape
@@ -2026,6 +2026,9 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
$(MOZILLA_LIBS)\
-shared -o $@
+stamps/icedtea-npplugin: $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
+ touch stamps/icedtea-npplugin
+
clean-IcedTeaNPPlugin:
rm -f $(addprefix $(PLUGIN_BUILD_DIR)/,$(NPPLUGIN_OBJECTS))
rm -f $(PLUGIN_BUILD_DIR)/IcedTeaNPPlugin.so
diff -r b361e1d82aaa -r 51f35c22d7b6 acinclude.m4
--- a/acinclude.m4 Tue May 11 21:40:50 2010 +0100
+++ b/acinclude.m4 Wed May 12 10:31:37 2010 +0100
@@ -239,19 +239,17 @@ AC_DEFUN([FIND_ECJ_JAR],
ECJ_JAR=
])
if test -z "${ECJ_JAR}"; then
- if test -e "/usr/share/java/eclipse-ecj.jar"; then
- ECJ_JAR=/usr/share/java/eclipse-ecj.jar
- elif test -e "/usr/share/java/ecj.jar"; then
- ECJ_JAR=/usr/share/java/ecj.jar
- elif test -e "/usr/share/eclipse-ecj-3.3/lib/ecj.jar"; then
- ECJ_JAR=/usr/share/eclipse-ecj-3.3/lib/ecj.jar
- elif test -e "/usr/share/eclipse-ecj-3.2/lib/ecj.jar"; then
- ECJ_JAR=/usr/share/eclipse-ecj-3.2/lib/ecj.jar
- elif test -e "/usr/share/eclipse-ecj-3.1/lib/ecj.jar"; then
- ECJ_JAR=/usr/share/eclipse-ecj-3.1/lib/ecj.jar
- else
- ECJ_JAR=no
- fi
+ for jar in /usr/share/java/eclipse-ecj.jar \
+ /usr/share/java/ecj.jar \
+ /usr/share/eclipse-ecj-3.{2,3,4,5}/lib/ecj.jar; do
+ if test -e $jar; then
+ ECJ_JAR=$jar
+ break
+ fi
+ done
+ if test -z "${ECJ_JAR}"; then
+ ECJ_JAR=no
+ fi
fi
AC_MSG_RESULT(${ECJ_JAR})
if test "x${ECJ_JAR}" = "xno"; then
@@ -274,55 +272,67 @@ AC_DEFUN([AC_CHECK_GCC_VERSION],
AC_DEFUN([FIND_JAVAH],
[
- AC_MSG_CHECKING(for javah)
+ JAVAH_DEFAULT=${SYSTEM_JDK_DIR}/bin/javah
+ AC_MSG_CHECKING([if a javah executable is specified])
AC_ARG_WITH([javah],
- [AS_HELP_STRING(--with-javah,specify location of the Java header generator)],
+ [AS_HELP_STRING(--with-javah,specify location of javah)],
[
- JAVAH="${withval}"
+ if test "x${withval}" = "xyes"; then
+ JAVAH=no
+ else
+ JAVAH="${withval}"
+ fi
],
[
- JAVAH=${SYSTEM_JDK_DIR}/bin/javah
+ JAVAH=no
])
- if ! test -f "${JAVAH}"; then
- AC_PATH_PROG(JAVAH, "${JAVAH}")
+ AC_MSG_RESULT(${JAVAH})
+ if test "x${JAVAH}" == "xno"; then
+ JAVAH=${JAVAH_DEFAULT}
+ fi
+ AC_PATH_PROG(JAVAH, "${JAVAH}")
+ if test -z "${JAVAH}"; then
+ AC_PATH_PROG(JAVAH, "javah")
fi
if test -z "${JAVAH}"; then
AC_PATH_PROG(JAVAH, "gjavah")
fi
if test -z "${JAVAH}"; then
- AC_PATH_PROG(JAVAH, "javah")
- fi
- if test -z "${JAVAH}"; then
AC_MSG_ERROR("A Java header generator was not found.")
fi
- AC_MSG_RESULT(${JAVAH})
AC_SUBST(JAVAH)
])
AC_DEFUN([FIND_JAR],
[
- AC_MSG_CHECKING(for jar)
+ JAR_DEFAULT=${SYSTEM_JDK_DIR}/bin/jar
+ AC_MSG_CHECKING([if a jar executable is specified])
AC_ARG_WITH([jar],
- [AS_HELP_STRING(--with-jar,specify location of the Java archive tool (jar))],
+ [AS_HELP_STRING(--with-jar,specify location of jar)],
[
- JAR="${withval}"
+ if test "x${withval}" = "xyes"; then
+ JAR=no
+ else
+ JAR="${withval}"
+ fi
],
[
- JAR=${SYSTEM_JDK_DIR}/bin/jar
+ JAR=no
])
- if ! test -f "${JAR}"; then
- AC_PATH_PROG(JAR, "${JAR}")
+ AC_MSG_RESULT(${JAR})
+ if test "x${JAR}" == "xno"; then
+ JAR=${JAR_DEFAULT}
+ fi
+ AC_PATH_PROG(JAR, "${JAR}")
+ if test -z "${JAR}"; then
+ AC_PATH_PROG(JAR, "jar")
fi
if test -z "${JAR}"; then
AC_PATH_PROG(JAR, "gjar")
fi
if test -z "${JAR}"; then
- AC_PATH_PROG(JAR, "jar")
- fi
- if test -z "${JAR}"; then
AC_MSG_ERROR("No Java archive tool was found.")
fi
- AC_MSG_RESULT(${JAR})
AC_MSG_CHECKING([whether jar supports @<file> argument])
touch _config.txt
cat >_config.list <<EOF
@@ -361,28 +371,34 @@ EOF
AC_DEFUN([FIND_RMIC],
[
- AC_MSG_CHECKING(for rmic)
+ RMIC_DEFAULT=${SYSTEM_JDK_DIR}/bin/rmic
+ AC_MSG_CHECKING(if an rmic executable is specified)
AC_ARG_WITH([rmic],
- [AS_HELP_STRING(--with-rmic,specify location of the RMI compiler)],
+ [AS_HELP_STRING(--with-rmic,specify location of rmic)],
[
- RMIC="${withval}"
+ if test "x${withval}" = "xyes"; then
+ RMIC=no
+ else
+ RMIC="${withval}"
+ fi
],
[
- RMIC=${SYSTEM_JDK_DIR}/bin/rmic
+ RMIC=no
])
- if ! test -f "${RMIC}"; then
- AC_PATH_PROG(RMIC, "${RMIC}")
+ AC_MSG_RESULT(${RMIC})
+ if test "x${RMIC}" = "xno"; then
+ RMIC=${RMIC_DEFAULT}
+ fi
+ AC_PATH_PROG(RMIC, "${RMIC}")
+ if test -z "${RMIC}"; then
+ AC_PATH_PROG(RMIC, "rmic")
fi
if test -z "${RMIC}"; then
AC_PATH_PROG(RMIC, "grmic")
fi
if test -z "${RMIC}"; then
- AC_PATH_PROG(RMIC, "rmic")
- fi
- if test -z "${RMIC}"; then
AC_MSG_ERROR("An RMI compiler was not found.")
fi
- AC_MSG_RESULT(${RMIC})
AC_SUBST(RMIC)
])
@@ -428,7 +444,7 @@ AC_DEFUN([FIND_ENDORSED_JARS],
AC_DEFUN([WITH_OPENJDK_SRC_ZIP],
[
- AC_MSG_CHECKING(for an OpenJDK source zip)
+ AC_MSG_CHECKING([for an OpenJDK source zip])
AC_ARG_WITH([openjdk-src-zip],
[AS_HELP_STRING(--with-openjdk-src-zip,specify the location of the openjdk source zip)],
[
@@ -446,7 +462,7 @@ AC_DEFUN([WITH_OPENJDK_SRC_ZIP],
AC_DEFUN([WITH_ALT_JAR_BINARY],
[
- AC_MSG_CHECKING(for an alternate jar command)
+ AC_MSG_CHECKING([for an alternate jar command])
AC_ARG_WITH([alt-jar],
[AS_HELP_STRING(--with-alt-jar, specify the location of an alternate jar binary to use for building)],
[
@@ -463,7 +479,7 @@ AC_DEFUN([WITH_ALT_JAR_BINARY],
AC_DEFUN([FIND_XALAN2_JAR],
[
- AC_MSG_CHECKING(xalan2 jar)
+ AC_MSG_CHECKING([for a xalan2 jar])
AC_ARG_WITH([xalan2-jar],
[AS_HELP_STRING(--with-xalan2-jar,specify location of the xalan2 jar)],
[
@@ -494,7 +510,7 @@ AC_DEFUN([FIND_XALAN2_JAR],
AC_DEFUN([FIND_XALAN2_SERIALIZER_JAR],
[
- AC_MSG_CHECKING(for xalan2 serializer jar)
+ AC_MSG_CHECKING([for a xalan2 serializer jar])
AC_ARG_WITH([xalan2-serializer-jar],
[AS_HELP_STRING(--with-xalan2-serializer-jar,specify location of the xalan2-serializer jar)],
[
@@ -525,7 +541,7 @@ AC_DEFUN([FIND_XALAN2_SERIALIZER_JAR],
AC_DEFUN([FIND_XERCES2_JAR],
[
- AC_MSG_CHECKING(for xerces2 jar)
+ AC_MSG_CHECKING([for a xerces2 jar])
AC_ARG_WITH([xerces2-jar],
[AS_HELP_STRING(--with-xerces2-jar,specify location of the xerces2 jar)],
[
@@ -558,20 +574,27 @@ AC_DEFUN([FIND_XERCES2_JAR],
AC_DEFUN([FIND_NETBEANS],
[
+ AC_MSG_CHECKING([if the location of NetBeans is specified])
AC_ARG_WITH([netbeans],
[AS_HELP_STRING(--with-netbeans,specify location of netbeans)],
[
- if test -f "${withval}"; then
- AC_MSG_CHECKING(netbeans)
+ if test "x${withval}" = "xyes"; then
+ NETBEANS=no
+ else
NETBEANS="${withval}"
- AC_MSG_RESULT(${withval})
- else
- AC_PATH_PROG(NETBEANS, "${withval}")
fi
],
[
- NETBEANS=
+ NETBEANS=no
])
+ AC_MSG_RESULT(${NETBEANS})
+ if ! test -f "${NETBEANS}"; then
+ if test "x${NETBEANS}" = "xno"; then
+ NETBEANS=
+ else
+ AC_PATH_PROG(NETBEANS, "${NETBEANS}")
+ fi
+ fi
if test -z "${NETBEANS}"; then
AC_PATH_PROG(NETBEANS, "netbeans")
fi
@@ -583,7 +606,7 @@ AC_DEFUN([FIND_NETBEANS],
AC_DEFUN([FIND_RHINO_JAR],
[
- AC_MSG_CHECKING(whether to include Javascript support via Rhino)
+ AC_MSG_CHECKING([whether to include Javascript support via Rhino])
AC_ARG_WITH([rhino],
[AS_HELP_STRING(--with-rhino,specify location of the rhino jar)],
[
@@ -657,7 +680,7 @@ AC_DEFUN([FIND_TOOL],
AC_DEFUN([ENABLE_ZERO_BUILD],
[
- AC_MSG_CHECKING(whether to use the zero-assembler port)
+ AC_MSG_CHECKING([whether to use the zero-assembler port])
use_zero=no
AC_ARG_ENABLE([zero],
[AS_HELP_STRING(--enable-zero,
@@ -787,7 +810,7 @@ AC_DEFUN([AC_CHECK_ENABLE_CACAO],
AC_DEFUN([AC_CHECK_WITH_CACAO_HOME],
[
- AC_MSG_CHECKING(for CACAO home directory)
+ AC_MSG_CHECKING([for a CACAO home directory])
AC_ARG_WITH([cacao-home],
[AS_HELP_STRING([--with-cacao-home],
[CACAO home directory [[default=/usr/local/cacao]]])],
@@ -812,7 +835,7 @@ AC_DEFUN([AC_CHECK_WITH_CACAO_HOME],
AC_DEFUN([AC_CHECK_WITH_CACAO_SRC_ZIP],
[
- AC_MSG_CHECKING(for a CACAO source 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)],
[
@@ -1814,3 +1837,44 @@ AM_CONDITIONAL([JAVAC_LACKS_DIAMOND], te
AM_CONDITIONAL([JAVAC_LACKS_DIAMOND], test x"${it_cv_diamond}" = "xyes")
AC_PROVIDE([$0])dnl
])
+
+# Finds number of available processors using sysconf
+AC_DEFUN_ONCE([IT_FIND_NUMBER_OF_PROCESSORS],[
+ FIND_TOOL([GETCONF], [getconf])
+ AC_CACHE_CHECK([the number of online processors], it_cv_proc, [
+ if number=$($GETCONF _NPROCESSORS_ONLN); then
+ it_cv_proc=$number;
+ else
+ it_cv_proc=2;
+ fi
+ ])
+ AC_PROVIDE([$0])dnl
+])
+
+# Provides the option --with-parallel-jobs
+# * --with-parallel-jobs; use jobs=processors + 1
+# * --with-parallel-jobs=x; use jobs=x
+# * --without-parallel-jobs (default); use jobs=2
+AC_DEFUN_ONCE([IT_CHECK_NUMBER_OF_PARALLEL_JOBS],
+[
+AC_REQUIRE([IT_FIND_NUMBER_OF_PROCESSORS])
+proc_default=$(($it_cv_proc + 1))
+AC_MSG_CHECKING([how many parallel build jobs to execute])
+AC_ARG_WITH([parallel-jobs],
+ [AS_HELP_STRING([--with-parallel-jobs],
+ [build IcedTea using the specified number of parallel jobs])],
+ [
+ if test "x${withval}" = xyes; then
+ PARALLEL_JOBS=${proc_default}
+ elif test "x${withval}" = xno; then
+ PARALLEL_JOBS=2
+ else
+ PARALLEL_JOBS=${withval}
+ fi
+ ],
+ [
+ PARALLEL_JOBS=2
+ ])
+AC_MSG_RESULT(${PARALLEL_JOBS})
+AC_SUBST(PARALLEL_JOBS)
+])
diff -r b361e1d82aaa -r 51f35c22d7b6 configure.ac
--- a/configure.ac Tue May 11 21:40:50 2010 +0100
+++ b/configure.ac Wed May 12 10:31:37 2010 +0100
@@ -66,7 +66,7 @@ AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}])
AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}])
AC_SUBST(SYSTEM_NETBEANS_DIR)
-AC_MSG_CHECKING(whether to build VisualVM)
+AC_MSG_CHECKING([whether to build VisualVM])
AC_ARG_ENABLE([visualvm],
[AS_HELP_STRING([--enable-visualvm],
[Enable compilation of visualvm.])],
@@ -132,25 +132,6 @@ AM_CONDITIONAL([ENABLE_NSS], [test x$ENA
AM_CONDITIONAL([ENABLE_NSS], [test x$ENABLE_NSS = xyes])
AC_MSG_RESULT(${ENABLE_NSS})
-AC_MSG_CHECKING([how many parallel build jobs to execute])
-proc_default=$(($it_cv_proc + 1))
-AC_ARG_WITH([parallel-jobs],
- [AS_HELP_STRING([--with-parallel-jobs],
- [build IcedTea using the specified number of parallel jobs])],
- [
- if test "x${withval}" = x
- then
- PARALLEL_JOBS=${proc_default}
- else
- PARALLEL_JOBS=${withval}
- fi
- ],
- [
- PARALLEL_JOBS=${proc_default}
- ])
-AC_MSG_RESULT(${PARALLEL_JOBS})
-AC_SUBST(PARALLEL_JOBS)
-
AC_ARG_WITH([pkgversion],
[AS_HELP_STRING([--with-pkgversion=PKG],
[Use PKG in the version string in addition to "IcedTea"])],
@@ -167,6 +148,7 @@ SET_ARCH_DIRS
SET_ARCH_DIRS
SET_OS_DIRS
+IT_CHECK_NUMBER_OF_PARALLEL_JOBS
IT_CHECK_IF_BOOTSTRAPPING
IT_CHECK_FOR_JDK
FIND_JAVA
@@ -215,10 +197,11 @@ DISABLE_OPTIMIZATIONS
DISABLE_OPTIMIZATIONS
SET_SHARK_BUILD
ENABLE_ZERO_BUILD
+IT_CHECK_ADDITIONAL_VMS
+
WITH_VERSION_SUFFIX
WITH_PROJECT
ENABLE_HG
-IT_CHECK_ADDITIONAL_VMS
AC_CHECK_WITH_TZDATA_DIR
AC_PATH_TOOL([HG],[hg])
More information about the distro-pkg-dev
mailing list