Author: ismaild
Date: Thu Jan 17 21:58:36 2008
New Revision: 11310
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11310&view=rev
Log:
rename --with-icecream-max-jobs to --max-jobs so it can be enabled without
icecream, set its default value to 1.
Modified:
trunk/ChangeLog
trunk/bin/build-ooo
trunk/bin/build-tools
trunk/bin/setup.in
trunk/configure.in
trunk/doc/intro.txt
Modified: trunk/bin/build-ooo
==============================================================================
--- trunk/bin/build-ooo (original)
+++ trunk/bin/build-ooo Thu Jan 17 21:58:36 2008
@@ -96,8 +96,8 @@
fi
EXTRA_DMAKE_FLAGS=
-if test "$ENABLE_ICECREAM" = "yes" -a "$ICECREAM_JOBS" -gt 1; then
- EXTRA_DMAKE_FLAGS="-- -P$ICECREAM_JOBS"
+if test "$MAX_JOBS" -gt 1; then
+ EXTRA_DMAKE_FLAGS="-- -P$MAX_JOBS"
fi
# Automake exports MAKEFLAGS= --unix or something
Modified: trunk/bin/build-tools
==============================================================================
--- trunk/bin/build-tools (original)
+++ trunk/bin/build-tools Thu Jan 17 21:58:36 2008
@@ -20,8 +20,8 @@
cd $BUILDDIR/$GCC_VER
./configure --prefix=$BUILDDIR --enable-languages=c++ || exit 1;
MAKE_FLAGS=
- if test "z$ENABLE_ICECREAM" != "z"; then
- MAKE_FLAGS="-j$ICECREAM_JOBS"
+ if test "$MAX_JOBS" -gt 1; then
+ MAKE_FLAGS="-j$MAX_JOBS"
fi
make $MAKE_FLAGS && make install || exit 1;
fi
Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in (original)
+++ trunk/bin/setup.in Thu Jan 17 21:58:36 2008
@@ -16,8 +16,8 @@
BUILD_NCPUS='@BUILD_NCPUS@'
ENABLE_CCACHE='@ENABLE_CCACHE@'
ENABLE_ICECREAM='@ENABLE_ICECREAM@'
-ICECREAM_JOBS='@ICECREAM_JOBS@'
ICECREAM_BINDIR='@ICECREAM_BINDIR@'
+MAX_JOBS='@MAX_JOBS@'
OOO_WIDGET_FLAGS='@OOO_WIDGET_FLAGS@'
OOO_CUSTOM_IMAGES='@OOO_CUSTOM_IMAGES@'
OOO_CRYSTAL_IMAGES='@OOO_CRYSTAL_IMAGES@'
@@ -273,10 +273,13 @@
echo " ccache: no"
fi
if test "$ENABLE_ICECREAM" = "yes"; then
- echo " icecream: yes, in '$ICECREAM_BINDIR'. Max number of jobs is
'$ICECREAM_JOBS'"
+ echo " icecream: yes, in '$ICECREAM_BINDIR'.
if test "z$ICECC_VERSION" != "z"; then
echo " icecream: using '$ICECC_VERSION' compiler tarball."
fi
else
echo " icecream: no"
fi
+if test "$MAX_JOBS" -gt 1; then
+ echo Max number of jobs is '$MAX_JOBS'"
+fi
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Thu Jan 17 21:58:36 2008
@@ -193,19 +193,19 @@
Example: --with-gcc-speedup=ccache,icecream],
,)
-AC_ARG_WITH(icecream-max-jobs,
-[
- --with-icecream-max-jobs
- Maximum number of jobs that make will issue at
- the same time. Defaults to 10.],
-,)
-
AC_ARG_WITH(icecream-bindir,
[
--with-icecream-bindir Location of icecream's gcc and g++.
Defaults to /opt/icecream/bin.],
,)
+AC_ARG_WITH(max-jobs,
+[
+ --with-max-jobs
+ Maximum number of jobs that make will issue at
+ the same time. Defaults to 1.],
+,)
+
AC_ARG_ENABLE(gtk,
[
--disable-gtk Disables gtk+ native widgets.],
@@ -589,16 +589,6 @@
AC_SUBST(ENABLE_CCACHE)
AC_SUBST(ENABLE_ICECREAM)
-ICECREAM_JOBS="10"
-if test "z$with_icecream_max_jobs" != "z"; then
- if test "$with_icecream_max_jobs" -gt "10"; then
- AC_MSG_WARN([dmake is limited to 10 jobs, using
--with-icecream-max-jobs=10 (instead of $with_num_jobs).])
- with_icecream_max_jobs="10"
- fi
- ICECREAM_JOBS="$with_icecream_max_jobs"
-fi
-AC_SUBST(ICECREAM_JOBS)
-
ICECREAM_BINDIR="/opt/icecream/bin"
if test "z$with_icecream_bindir" != "z"; then
ICECREAM_BINDIR="$with_icecream_bindir"
@@ -610,6 +600,16 @@
fi
AC_SUBST(ICECREAM_BINDIR)
+MAX_JOBS="1"
+if test "z$with_max_jobs" != "z"; then
+ if test "$with_max_jobs" -gt "10"; then
+ AC_MSG_WARN([dmake is limited to 10 jobs, using --with-max-jobs=10
(instead of $with_num_jobs).])
+ with_max_jobs="10"
+ fi
+ MAX_JOBS="$with_max_jobs"
+fi
+AC_SUBST(MAX_JOBS)
+
if test "z$with_distro" = "zKDE"; then
if test "z$enable_kde" = "z" ; then
enable_kde=true
@@ -1215,10 +1215,15 @@
ccache_message="no"
fi
if test "$ENABLE_ICECREAM" = "yes"; then
- icecream_message="yes, in '$ICECREAM_BINDIR'. Max number of jobs is
'$ICECREAM_JOBS'"
+ icecream_message="yes, in '$ICECREAM_BINDIR'."
else
icecream_message="no"
fi
+if test "$MAX_JOBS" -gt 1; then
+ max_job_message="'$MAX_JOBS'"
+else
+ max_job_message="'1'"
+fi
echo "
Building openoffice
@@ -1236,6 +1241,7 @@
ooo-install-dir: $OOOINSTALLDIRNAME
ccache: $ccache_message
icecream: $icecream_message
+ max jobs: $max_job_message
cairo: $cairo_enabled
build type: $build_product build
download mirror: $MIRROR
Modified: trunk/doc/intro.txt
==============================================================================
--- trunk/doc/intro.txt (original)
+++ trunk/doc/intro.txt Thu Jan 17 21:58:36 2008
@@ -52,7 +52,7 @@
--prefix
--with-installed-ooo-dirname
--with-binsuffix
- --with-icecream-max-jobs
+ --with-max-jobs
- enable/disable some optional features that are not yet configurable by
upstream, for example:
--enable-access (access import pieces via mdbtools)
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
