[Libreoffice-commits] .: bootstrap
bootstrap |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 547249832d5cde98c2973fd5eb31bd30cddb63b9
Author: David Tardon dtar...@redhat.com
Date: Fri Mar 23 08:45:49 2012 +0100
allow leading space
diff --git a/bootstrap b/bootstrap
index 3d1bc88..073f69a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,12 +2,12 @@
if test -z ${SRC_ROOT}; then
if test -f ./config_build.mk ; then
-sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/' config_build.mk
config_build.mk.sh
+sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/' config_build.mk
config_build.mk.sh
. ./config_build.mk.sh
rm config_build.mk.sh
else
if test -f ./config_host.mk ; then
-sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/' config_host.mk
config_host.mk.sh
+sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/'
config_host.mk config_host.mk.sh
. ./config_host.mk.sh
rm config_host.mk.sh
fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bootstrap configure.in .gitignore solenv/bin solenv/gbuild
.gitignore |3 +++
bootstrap |4
configure.in|2 +-
solenv/bin/concat-deps.c|5 ++---
solenv/gbuild/LinkTarget.mk |2 +-
5 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit e3e94f141e15f5501ed81402a70beb10b85ccd6f
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sat Dec 17 10:54:24 2011 -0600
use a c-version of concat-deps.pl
This touch configure.in with a trivial space removal to force a
./bootstrap on the tinderboxes
This make ./bootstrap build a 'build-side' executable concat-deps
and modify LinkTarget.mk to use it instead of concat-deps.pl
The impact is a conservative x10 times improvement in both elapsed and
cpu time in overhead due to DEP generations.
time make -sr build in tail_build after removing
workdir/$INPATH/Dep/LinkTarget/Library/*
(all on Intel X3360, 2.83GHz, 4-core)
before:
elapsed: 116.5 cpu: 115.9
after
elapsed: 24.3 cpu: 23.9
base (no dep processing, i.e no rm of Dep/...)
elapsed: 17.5 cpu: 17.4
overhead ratio:
elapsed: 14.5x cpu: 15x
same with -j6
before:
elapsed: 47 cpu: 116
after:
elapsed: 20.8 cpu: 24
base:
elapsed: 17.5 cpu: 17.5
overhead ratio:
elapsed: 9x cpu: 15x
Note: for now the executable is generated directly in the source tree
(in solevn/bin ). That is not ideal. It and other similar polution
should be moved, to workdir most likely..
For now we just hide the mess under the .gitignore carpet
diff --git a/.gitignore b/.gitignore
index 3929c67..af084f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,6 +108,9 @@ TAGS
/solenv/gdb/libreoffice/*.py[co]
/solenv/gdb/libreoffice/util/*.py[co]
+# botstrap generated tool
+/solenv/bin/concat-deps
+
# test output files
test/user-template/user/psprint/pspfontcache
diff --git a/bootstrap b/bootstrap
index 1bf5068..da1192c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -74,6 +74,10 @@ if test $BUILD_DMAKE != NO; then
echo dmake copied to $SOLARENV/$OUTPATH_FOR_BUILD/bin/dmake$EXEEXT
fi
+# build concat-deps
+echo building concat-deps
+$CC_FOR_BUILD -O2 $SOLARENV/bin/concat-deps.c -o $SOLARENV/bin/concat-deps
|| exit
+
#make sure build.pl is executable
chmod +x $SRC_ROOT/solenv/bin/build.pl
diff --git a/configure.in b/configure.in
index 433c523..1772116 100644
--- a/configure.in
+++ b/configure.in
@@ -1899,7 +1899,7 @@ fi
dnl ===
dnl Extra check for Windows. Cygwin builds need gcc to build dmake
-dnl although MSVC is used to build other build-time tools and
+dnl although MSVC is used to build other build-time tools and
dnl LibreOffice itself.
dnl ===
if test $build_os = cygwin ; then
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index f3ecdef..6cf9192 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -3,8 +3,8 @@
*License: GPLv3
*/
-//* define to activate stats reporting on hash usage
-#define HASH_STAT
+/* define to activate stats reporting on hash usage*/
+/* #define HASH_STAT */
/* ===
* Set-up: defines to identify the system and system related properties
@@ -566,7 +566,6 @@ int cost = 0;
{
hash-collisions += 1;
hash-cost += cost;
-//fprintf(stderr, key colision %s and %s\n, key,
hash_elem-next-key);
}
#endif
hash-array[hashed] = hash_elem;
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 4a7833c..eec7612 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -338,7 +338,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(8),$(call
gb_GenCObject_get_dep_target,$(object))) \
$(foreach object,$(9),$(call
gb_GenCxxObject_get_dep_target,$(object))) \
) \
- $(SOLARENV)/bin/concat-deps.pl $${RESPONSEFILE} $(1)) \
+ $(SOLARENV)/bin/concat-deps $${RESPONSEFILE} $(1)) \
rm -f $${RESPONSEFILE}
endef
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bootstrap bootstrap.1 configure.in .gitignore set_soenv.in
.gitignore |1
bootstrap| 89 +++
bootstrap.1 | 88 --
configure.in |1
set_soenv.in | 17 ---
5 files changed, 89 insertions(+), 107 deletions(-)
New commits:
commit aa09a9b77d10145ecc0dc0111c7235d869a428a8
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Fri Oct 7 14:10:10 2011 -0500
bootstrap.1 is not usefull anymore use bootsrap directly
diff --git a/.gitignore b/.gitignore
index 8c0f62a..57cd362 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,6 @@
/aclocal.m4
/autom4te.cache
/autogen.lastrun
-/bootstrap
/ChangeLog
/config.guess
/config.log
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 000..1bf5068
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+if test -z ${SOLARENV}; then
+if test -f ./Env.Build.sh ; then
+. ./Env.Build.sh
+else
+if test -f ./Env.Host.sh ; then
+. ./Env.Host.sh
+fi
+fi
+fi
+if test -z ${SOLARENV}; then
+echo bootstrap: No environment set!
+exit 1
+fi
+
+# remove aliases set by Env.Host.sh
+unalias mkout2 /dev/null
+unalias deliver 2 /dev/null
+unalias build2 /dev/null
+unalias zipdep 2 /dev/null
+
+# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
+# Use spawn instead of fork when building dmake on cygwin.
+if test $GUI_FOR_BUILD = WNT; then
+EXEEXT=.exe
+DMAKE_CONF=--enable-spawn
+else
+EXEEXT=
+DMAKE_CONF=
+fi
+export EXEEXT
+
+#
--
+# Build dmake
+
+if test $BUILD_DMAKE != NO; then
+if test ! -x $SRC_ROOT/dmake/dmake$EXEEXT; then
+cd $SRC_ROOT/dmake || exit
+
+# If cross-compiling then don't use the cross compilers to build dmake.
+if test $GUI_FOR_BUILD = WNT; then
+# Let the Cygwin gcc be found
+unset CC CXX AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
+elif test $CROSS_COMPILING = YES; then
+export CC=$CC_FOR_BUILD
+export CXX=$CXX_FOR_BUILD
+unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
+fi
+
+# For normal unixy systems
+if test -f Makefile ; then
+$GNUMAKE distclean || exit
+fi
+
+./configure $DMAKE_CONF || exit
+
+## invoke the gnu make command set by configure.
+$GNUMAKE || exit
+
+echo
+echo dmake has been successfully built
+
+cd ..
+else
+echo dmake/dmake already built
+fi
+fi
+
+mkdir -p $SOLARENV/$OUTPATH_FOR_BUILD/bin
+if test $BUILD_DMAKE != NO; then
+cp -f $SRC_ROOT/dmake/dmake$EXEEXT $SOLARENV/$OUTPATH_FOR_BUILD/bin ||
exit
+echo
+echo dmake copied to $SOLARENV/$OUTPATH_FOR_BUILD/bin/dmake$EXEEXT
+fi
+
+#make sure build.pl is executable
+
+chmod +x $SRC_ROOT/solenv/bin/build.pl
+chmod +x $SRC_ROOT/solenv/bin/zipdep.pl
+chmod +x $SRC_ROOT/solenv/bin/gccinstlib.pl
+
+# Local Variables:
+# mode: shell-script
+# tab-width: 4
+# indent-tabs-mode: nil
+# End:
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/bootstrap.1 b/bootstrap.1
deleted file mode 100755
index 933b2db..000
--- a/bootstrap.1
+++ /dev/null
@@ -1,88 +0,0 @@
-
-if test -z ${SOLARENV}; then
-if test -f ./Env.Build.sh ; then
-. ./Env.Build.sh
-else
-if test -f ./Env.Host.sh ; then
-. ./Env.Host.sh
-fi
-fi
-fi
-if test -z ${SOLARENV}; then
-echo bootstrap: No environment set!
-exit 1
-fi
-
-# remove aliases set by Env.Host.sh
-unalias mkout2 /dev/null
-unalias deliver 2 /dev/null
-unalias build2 /dev/null
-unalias zipdep 2 /dev/null
-
-# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
-# Use spawn instead of fork when building dmake on cygwin.
-if test $GUI_FOR_BUILD = WNT; then
-EXEEXT=.exe
-DMAKE_CONF=--enable-spawn
-else
-EXEEXT=
-DMAKE_CONF=
-fi
-export EXEEXT
-
-#
--
-# Build dmake
-
-if test $BUILD_DMAKE != NO; then
-if test ! -x $SRC_ROOT/dmake/dmake$EXEEXT; then
-cd $SRC_ROOT/dmake || exit
-
-# If cross-compiling then don't use the cross compilers to build dmake.
-if test $GUI_FOR_BUILD = WNT; then
-# Let the Cygwin gcc be found
-unset CC CXX AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
-elif test $CROSS_COMPILING = YES; then
-export CC=$CC_FOR_BUILD
-export CXX=$CXX_FOR_BUILD
-unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
-fi
-
-# For normal unixy systems
-if test -f Makefile ; then
-$GNUMAKE distclean || exit
-fi
-
-./configure $DMAKE_CONF || exit
-
-## invoke the gnu make command set by configure.
-$GNUMAKE || exit
-
-echo
-echo dmake
