summaryrefslogtreecommitdiff
path: root/download
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2012-10-25 17:27:43 +0200
committerCaolán McNamara <caolanm@redhat.com>2012-10-31 16:29:12 +0000
commit664012b313f3c3cd5666fc6f943fc8152e503e23 (patch)
tree97e6b9c1dc080dbdf651f7c907e1ea60a4d7d560 /download
parent2a088faa707657cbeb21c2c7ed2ac201d1318718 (diff)
remove GIT_REPO_NAMES (duplicated by GIT_NEEDED_SUBMODULES)
use plain copy instead of git-new-workdir when using --with-linked-git configure switch (point it to your master copy of the core-repo) also remove obsolete bin/create_bootstrap_links, bin/mkworkdir and bin/repo-list[.in] Change-Id: I37028badf2c46a24a3d628e80476efe4dd365d06 Reviewed-on: https://gerrit.libreoffice.org/912 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'download')
-rwxr-xr-xdownload20
1 files changed, 8 insertions, 12 deletions
diff --git a/download b/download
index 0dc1d0f84939..c9e873965929 100755
--- a/download
+++ b/download
@@ -53,18 +53,13 @@ if [ -d .git ] ; then
./g -f clone
else
echo "FIXME: GIT_LINK_SRC method is not yet implemented with submodules" 1>&2
- exit 1;
# space-saving clone from another local workdir
-# mkdir clone
-# branch=$(git symbolic-ref HEAD | cut -d"/" -f 3)
-# for i in $GIT_REPO_NAMES ; do
-# bin/git-new-workdir $GIT_LINK_SRC/$i clone/$i $branch
-# for d in clone/$i/* ; do
-# if [ "${d}" != "clone/$i/git-hooks" ]; then
-# ln -sfn ${d} $(basename ${d})
-# fi
-# done
-# done
+ for i in $GIT_NEEDED_SUBMODULES ; do
+ rm -r $i
+ cp -R $GIT_LINK_SRC/$i $i
+# bin/git-new-workdir $GIT_LINK_SRC/$i $i
+ done
+ git submodule update $GIT_NEEDED_SUBMODULES
fi
fi
@@ -191,7 +186,8 @@ if [ -f $start_dir/sources.ver -a ! -d $start_dir/.git ] ; then
lo_bugfix_release_sources_ver=`echo $lo_sources_ver | sed -e "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/"`
lo_src_dir="$start_dir/src"
mkdir -p "$lo_src_dir"
- for piece in `cat $start_dir/bin/repo-list` ; do
+ for piece in $GIT_NEEDED_SUBMODULES ; do
+ if [ "helpcontent2" = "$piece" ] ; then piece="help"; fi
tarname="libreoffice-$piece-$lo_sources_ver"
if [ ! -f "$TARFILE_LOCATION/$tarname.tar.xz" ] ; then
downloaditem "http://download.documentfoundation.org/libreoffice/src/$lo_bugfix_release_sources_ver" "$tarname.tar.xz" ""