diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:04 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:04 +0200 |
commit | ca907e02205e8e99e28608ddfe7bdaca24f23aa4 (patch) | |
tree | afdf8fb6a8aef6920ad0f658bdad85c419e0c43e /download | |
parent | accumulate the output of modules in error in build_error.log (diff) | |
parent | Update .gitignore with the new modules. (diff) | |
download | core-ca907e02205e8e99e28608ddfe7bdaca24f23aa4.tar.gz core-ca907e02205e8e99e28608ddfe7bdaca24f23aa4.zip |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
Makefile.in
Repository.mk
autogen.sh
bin/lo-commit-stat
configure.in
distro-configs/LibreOfficeOpenBSD.conf
distro-configs/LibreOfficeWin32.conf
instsetoo_native/util/openoffice.lst
ooo.lst.in
scp2/source/ooo/module_langpack.ulf
set_soenv.in
solenv/bin/ooinstall
solenv/gbuild/CppunitTest.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/unxgcc.mk
solenv/gbuild/platform/windows.mk
solenv/inc/minor.mk
solenv/inc/settings.mk
tail_build/prj/makefile.mk
Diffstat (limited to 'download')
-rwxr-xr-x | download | 23 |
1 files changed, 22 insertions, 1 deletions
@@ -140,7 +140,7 @@ downloaditem() failed="$failed $2" wret=0 fi - if [ -f $2 -a -n "$md5sum" ]; then + if [ -f $2 -a -n "$3" -a -n "$md5sum" ]; then sum=`$md5sum $md5special $2 | sed "s/ .*//"` if [ "$sum" != "$3" ]; then echo checksum failure for $2 2>&1 | tee -a $logfile @@ -189,6 +189,27 @@ if [ "$COM" = "MSC" ]; then fi +if [ -f $start_dir/bootstrap.ver -a ! -d $start_dir/.git ] ; then + # bootstrap is from sources, so get the other source tarballs + . $start_dir/bootstrap.ver + lo_src_dir="$start_dir/src" + mkdir -p "$lo_src_dir" + for piece in `cat $start_dir/bin/repo-list` ; do + tarname="libreoffice-$piece-$lo_bootstrap_ver" + if [ ! -f "$TARFILE_LOCATION/$tarname.tar.bz2" ] ; then + downloaditem "http://download.documentfoundation.org/libreoffice/src/" "$tarname.tar.bz2" "" + fi + if [ ! -d $lo_src_dir/$tarname ] ; then + echo "Unpacking $tarname.tar.bz2..." + tar -xf "$TARFILE_LOCATION/$tarname.tar.bz2" -C "$lo_src_dir" + fi + # create symlinks + for dir in `find "$lo_src_dir/$tarname" -mindepth 1 -maxdepth 1 -type d` ; do + ln -sf "$dir" "$start_dir" + done + done +fi + rm $TARFILE_LOCATION/tmp/*-* cd $start_dir |