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

1 files changed, 22 insertions, 1 deletions

diff --git a/download b/download
index c74e00ed3e93..c337fd2d0826 100755
--- a/download
+++ b/download
@@ -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