/hg/icedtea: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Nov 16 20:31:16 PST 2009
changeset 4afd580ad443 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4afd580ad443
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 01:28:51 2009 +0000
Obtain a better default for --with-parallel-jobs using getconf
2009-11-17 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_FIND_NUMBER_OF_PROCESSORS): Add
new macro which finds out the number of available
processors.
* configure.ac: Call IT_FIND_NUMBER_OF_PROCESSORS and use
result to set default for --with-parallel-jobs.
changeset 3f7290ca2f57 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3f7290ca2f57
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 04:34:42 2009 +0000
Bump to 1.12. Ensure make distcheck passes by adding missing clean
targets and sources.
2009-11-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add missing CORBA CurrentPackage
directory to list of distributed sources. (clean-
local): Ensure all targets are included. (clean-download):
Also depend on clean-cacao and clean-visualvm.
(clean-clone-boot): Depend on clean-patch-boot. (clean-
icedtea): Makefile is in openjdk, not openjdk/make.
(clean-icedtea-boot): Remove stamp last. (clean-icedtea-
stage1): New target to revert icedtea-stage1.stamp.
(clean-plugin): Remove the stamp. (clean-pulse-java): Remove
the empty pulseaudio directory if building out-of-tree.
(clean-add-cacao): Revert add-cacao.stamp. (clean-add-cacao-
debug): Revert add-cacao-debug.stamp. (add-zero.stamp): Make
-zero print ERROR when Shark is built and vice-versa for
when Zero is built. (clean-add-zero): Revert add-zero.stamp.
(clean-add-zero-debug): Revert add-zero-debug.stamp.
* configure.ac: Bump to 1.12.
changeset 766972166cea in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=766972166cea
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 04:35:14 2009 +0000
Added tag icedtea-1.12 for changeset 3f7290ca2f57
diffstat:
5 files changed, 103 insertions(+), 18 deletions(-)
.hgtags | 1
ChangeLog | 36 +++++++++++++++++++++++++++++++++
Makefile.am | 62 ++++++++++++++++++++++++++++++++++++++++++++--------------
acinclude.m4 | 14 ++++++++++++-
configure.ac | 8 ++++---
diffs (288 lines):
diff -r 14aa53fc72ba -r 766972166cea .hgtags
--- a/.hgtags Mon Nov 16 21:34:54 2009 +0000
+++ b/.hgtags Tue Nov 17 04:35:14 2009 +0000
@@ -21,3 +21,4 @@ 0000000000000000000000000000000000000000
0000000000000000000000000000000000000000 icedtea-1.11
0000000000000000000000000000000000000000 icedtea-1.11
df574d432c00e6ad570cc9d92eb4dcd51d31eb7a icedtea-1.11
+3f7290ca2f5730cf1ebd8fcbbd062417750655aa icedtea-1.12
diff -r 14aa53fc72ba -r 766972166cea ChangeLog
--- a/ChangeLog Mon Nov 16 21:34:54 2009 +0000
+++ b/ChangeLog Tue Nov 17 04:35:14 2009 +0000
@@ -1,3 +1,39 @@ 2009-11-16 Gary Benson <gbenson at redhat
+2009-11-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Add missing CORBA CurrentPackage directory to
+ list of distributed sources.
+ (clean-local): Ensure all targets are included.
+ (clean-download): Also depend on clean-cacao
+ and clean-visualvm.
+ (clean-clone-boot): Depend on clean-patch-boot.
+ (clean-icedtea): Makefile is in openjdk, not
+ openjdk/make.
+ (clean-icedtea-boot): Remove stamp last.
+ (clean-icedtea-stage1): New target to revert
+ icedtea-stage1.stamp.
+ (clean-plugin): Remove the stamp.
+ (clean-pulse-java): Remove the empty pulseaudio
+ directory if building out-of-tree.
+ (clean-add-cacao): Revert add-cacao.stamp.
+ (clean-add-cacao-debug): Revert add-cacao-debug.stamp.
+ (add-zero.stamp): Make -zero print ERROR when Shark
+ is built and vice-versa for when Zero is built.
+ (clean-add-zero): Revert add-zero.stamp.
+ (clean-add-zero-debug): Revert add-zero-debug.stamp.
+ * configure.ac:
+ Bump to 1.12.
+
+2009-11-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_FIND_NUMBER_OF_PROCESSORS): Add
+ new macro which finds out the number of
+ available processors.
+ * configure.ac:
+ Call IT_FIND_NUMBER_OF_PROCESSORS and use
+ result to set default for --with-parallel-jobs.
+
2009-11-16 Gary Benson <gbenson at redhat.com>
* Makefile.am:
diff -r 14aa53fc72ba -r 766972166cea Makefile.am
--- a/Makefile.am Mon Nov 16 21:34:54 2009 +0000
+++ b/Makefile.am Tue Nov 17 04:35:14 2009 +0000
@@ -568,6 +568,7 @@ GENERATED_FILES = $(top_srcdir)/generate
$(top_srcdir)/generated/org/omg/DynamicAny/DynAnyPackage/*.java \
$(top_srcdir)/generated/org/omg/DynamicAny/DynAnyFactoryPackage/*.java \
$(top_srcdir)/generated/org/omg/PortableServer/*.java \
+ $(top_srcdir)/generated/org/omg/PortableServer/CurrentPackage/*.java \
$(top_srcdir)/generated/org/omg/PortableServer/POAManagerPackage/*.java \
$(top_srcdir)/generated/org/omg/PortableServer/POAPackage/*.java \
$(top_srcdir)/generated/sun/awt/X11/*.java \
@@ -703,12 +704,13 @@ check-local: jtregcheck
check-local: jtregcheck
clean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \
- clean-clone clean-clone-boot clean-plugs clean-extra clean-netx \
- clean-visualvm clean-nbplatform clean-bootstrap-directory-stage1 \
- clean-bootstrap-directory-stage2 clean-bootstrap-directory-symlink-stage1 \
- clean-bootstrap-directory-symlink-stage2 clean-extract clean-generated \
- clean-plugin clean-liveconnect clean-native-ecj clean-hgforest \
- clean-icedtea-stage2 clean-icedtea-debug-stage2
+ clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
+ clean-plugs clean-extra clean-netx clean-visualvm clean-nbplatform \
+ clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
+ clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
+ clean-extract clean-generated clean-plugin clean-liveconnect clean-native-ecj \
+ clean-hgforest clean-icedtea-stage2 clean-icedtea-debug-stage2 clean-icedtea-stage1 \
+ clean-add-zero clean-add-zero-debug clean-add-cacao clean-add-cacao-debug
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -716,9 +718,6 @@ clean-local: clean-jtreg clean-jtreg-rep
rmdir lib ; \
fi
rm -f jni-common.o
-if ADD_ZERO_BUILD
- rm -rf zerovm
-endif
distclean-local: clean-local clean-download
if [ -e stamps ] ; then \
@@ -792,7 +791,8 @@ stamps/download.stamp: stamps/download-d
mkdir -p stamps
touch $@
-clean-download: clean-drops clean-download-openjdk
+clean-download: clean-drops clean-download-openjdk clean-download-cacao \
+ clean-download-visualvm
rm -f stamps/download.stamp
stamps/download-jaxp-drop.stamp:
@@ -1540,9 +1540,9 @@ stamps/clone-boot.stamp: stamps/overlay.
mkdir -p stamps
touch $@
-clean-clone-boot:
+clean-clone-boot: clean-patch-boot
+ rm -rf openjdk-boot
rm -f stamps/clone-boot.stamp
- rm -rf openjdk-boot
stamps/patch-boot.stamp: stamps/clone-boot.stamp
mkdir -p stamps; \
@@ -1854,7 +1854,7 @@ clean-icedtea: stamps/download.stamp
clean-icedtea: stamps/download.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/make clobber
+ -C openjdk clobber
rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
@@ -1908,14 +1908,17 @@ hotspot-helper: stamps/bootstrap-directo
-C openjdk-boot hotspot
clean-icedtea-boot: stamps/clone-boot.stamp
- rm -f stamps/icedtea-boot.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_BOOT) \
-C openjdk-boot clobber
+ rm -f stamps/icedtea-boot.stamp
stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp
mkdir -p stamps
touch $@
+
+clean-icedtea-stage1:
+ rm -f stamps/icedtea-stage1.stamp
# Plugin
@@ -2003,6 +2006,7 @@ stamps/plugin.stamp: $(ICEDTEAPLUGIN_TAR
touch $@
clean-plugin: $(ICEDTEAPLUGIN_CLEAN) $(ICEDTEANPPLUGIN_CLEAN)
+ rm -f stamps/plugin.stamp
liveconnect-source-files.txt:
if test "x${LIVECONNECT_DIR}" != x; then \
@@ -2174,6 +2178,9 @@ if ENABLE_PULSE_JAVA
[ -z "$(PULSE_JAVA_CLASS_DIR)" ] || rm -rf $(PULSE_JAVA_CLASS_DIR)
rm -f pulse-java.jar
rm -f libpulse-java.so
+ if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
+ rmdir $(abs_top_builddir)/pulseaudio ; \
+ fi
endif
rm -f stamps/pulse-java*.stamp
@@ -2290,6 +2297,11 @@ endif
endif
touch $@
+clean-add-cacao:
+ rm -rf $(BUILD_JRE_ARCH_DIR)/cacao
+ sed -i 's#-cacao KNOWN#-cacao ERROR#' jvm.cfg
+ rm -f stamps/add-cacao.stamp
+
stamps/add-cacao-debug.stamp: stamps/icedtea-debug.stamp stamps/cacao.stamp
if ADD_CACAO_BUILD
mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao
@@ -2305,6 +2317,11 @@ endif
endif
touch $@
+clean-add-cacao-debug:
+ rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao
+ sed -i 's#-cacao KNOWN#-cacao ERROR#' jvm.cfg
+ rm -f stamps/add-cacao-debug.stamp
+
# configure script arguments, quoted in single quotes
CONFIGURE_ARGS = @CONFIGURE_ARGS@
ADD_ZERO_CONFIGURE_ARGS = \
@@ -2349,17 +2366,28 @@ if ZERO_BUILD
cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
$(BUILD_JRE_ARCH_DIR)/shark/
printf -- '-shark KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+ printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
else
mkdir -p $(BUILD_JRE_ARCH_DIR)/zero
cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
$(BUILD_JRE_ARCH_DIR)/zero/
printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+ printf -- '-shark ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
else
printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
printf -- '-shark ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
touch $@
+
+clean-add-zero:
+ rm -rf $(BUILD_JRE_ARCH_DIR)/zero
+ sed -i 's#-zero KNOWN#-zero ERROR#' jvm.cfg
+ sed -i 's#-shark KNOWN#-shark ERROR#' jvm.cfg
+if ADD_ZERO_BUILD
+ rm -rf zerovm
+endif
+ rm -f stamps/add-zero.stamp
stamps/add-zero-debug.stamp: stamps/icedtea-debug.stamp
mkdir -p stamps
@@ -2389,6 +2417,12 @@ else
printf -- '-shark ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
touch $@
+
+clean-add-zero-debug:
+ rm -rf $(BUILD_JRE_ARCH_DIR)/zero
+ sed -i 's#-zero KNOWN#-zero ERROR#' jvm.cfg
+ sed -i 's#-shark KNOWN#-shark ERROR#' jvm.cfg
+ rm -f stamps/add-zero-debug.stamp
# end additional VMs
diff -r 14aa53fc72ba -r 766972166cea acinclude.m4
--- a/acinclude.m4 Mon Nov 16 21:34:54 2009 +0000
+++ b/acinclude.m4 Tue Nov 17 04:35:14 2009 +0000
@@ -1558,4 +1558,16 @@ rmdir tmp.$$
rmdir tmp.$$
AM_CONDITIONAL([LACKS_$1], test x"${it_cv_$1}" = "xyes")
AC_PROVIDE([$0])dnl
-])
\ No newline at end of file
+])
+
+AC_DEFUN([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
+])
diff -r 14aa53fc72ba -r 766972166cea configure.ac
--- a/configure.ac Mon Nov 16 21:34:54 2009 +0000
+++ b/configure.ac Tue Nov 17 04:35:14 2009 +0000
@@ -1,4 +1,4 @@ AC_INIT([icedtea], [1.11], [distro-pkg-d
-AC_INIT([icedtea], [1.11], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [1.12], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
@@ -47,6 +47,7 @@ AC_CHECK_WITH_HOTSPOT_BUILD
AC_CHECK_WITH_HOTSPOT_BUILD
AC_PATH_TOOL([LINUX32],[linux32])
AC_CHECK_GCC_VERSION
+IT_FIND_NUMBER_OF_PROCESSORS
AC_MSG_CHECKING([for a NetBeans installation])
AC_ARG_WITH([netbeans-home],
@@ -151,19 +152,20 @@ AC_MSG_RESULT(${ENABLE_NSS})
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=2
+ PARALLEL_JOBS=${proc_default}
else
PARALLEL_JOBS=${withval}
fi
],
[
- PARALLEL_JOBS=2
+ PARALLEL_JOBS=${proc_default}
])
AC_MSG_RESULT(${PARALLEL_JOBS})
AC_SUBST(PARALLEL_JOBS)
More information about the distro-pkg-dev
mailing list