Kaydet (Commit) 9152c42a authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

submodules migration

Change-Id: Ib3e472a4b1abf880f695be7a6667393d6a82f10d
üst 074bb522
......@@ -101,12 +101,6 @@ TAGS
/external/*/*.msm
/moz/zipped/*.zip
# links to the other repositories
/binfilter
/dictionaries
/helpcontent2
/translations
# compiled python objects for gdb pretty printers
/solenv/gdb/libreoffice/*.py[co]
/solenv/gdb/libreoffice/util/*.py[co]
......
[submodule "binfilter"]
path = binfilter
url = git://gerrit.libreoffice.org/binfilter
revision = .
[submodule "dictionaries"]
path = dictionaries
url = git://gerrit.libreoffice.org/dictionaries
revision = .
[submodule "helpcontent2"]
path = helpcontent2
url = git://gerrit.libreoffice.org/help
revision = .
[submodule "translations"]
path = translations
url = git://gerrit.libreoffice.org/translations
revision = .
#!/usr/bin/env bash
BIN_DIR=$(dirname $0)
REPOS=$(cat ${BIN_DIR?}/repo-list)
cd ${BIN_DIR?}/..
BOOTSTRAP_DIR=$(pwd)
# with submodules we do not need links anymore
for repo in $REPOS ; do
for link in $(ls clone/${repo}) ; do
if [ ! -e "$link" ] ; then
echo "Creating missing link $link"
ln -s "clone/${repo}/$link" "$link"
fi
done
done
#BIN_DIR=$(dirname $0)
#REPOS=$(cat ${BIN_DIR?}/repo-list)
#cd ${BIN_DIR?}/..
#BOOTSTRAP_DIR=$(pwd)
#for repo in $REPOS ; do
# for link in $(ls clone/${repo}) ; do
# if [ ! -e "$link" ] ; then
# echo "Creating missing link $link"
# ln -s "clone/${repo}/$link" "$link"
# fi
# done
#done
binfilter @ 6501eb7a
Subproject commit 6501eb7a7f6ab7dba2223a5b8a721290ef1be627
......@@ -192,6 +192,7 @@ export GCONF_LIBS=@GCONF_LIBS@
export GIO_CFLAGS=@GIO_CFLAGS@
export GIO_LIBS=@GIO_LIBS@
export GIT_LINK_SRC=@GIT_LINK_SRC@
export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
export GIT_REPO_NAMES=@GIT_REPO_NAMES@
export GLIB_CFLAGS=@GLIB_CFLAGS@
export GLIB_LIBS=@GLIB_LIBS@
......
......@@ -11,6 +11,7 @@ save_CXX=$CXX
BUILD_TYPE="LibO"
SCPDEFS=""
GIT_REPO_NAMES=""
GIT_NEEDED_SUBMODULES=""
LO_PATH= # used by path_munge to construct a PATH variable
PathFormat()
......@@ -4347,6 +4348,7 @@ else
WITH_BINFILTER="YES"
BUILD_TYPE="$BUILD_TYPE BINFILTER"
GIT_REPO_NAMES="$GIT_REPO_NAMES binfilter"
GIT_NEEDED_SUBMODULES="binfilter $GIT_NEEDED_SUBMODULES"
AC_MSG_RESULT([yes])
fi
AC_SUBST(WITH_BINFILTER)
......@@ -4357,6 +4359,7 @@ if test "$with_help" != "no" -a $_os != iOS -a $_os != Android; then
BUILD_TYPE="$BUILD_TYPE HELP"
SCPDEFS="$SCPDEFS -DWITH_HELP"
GIT_REPO_NAMES="$GIT_REPO_NAMES help"
GIT_NEEDED_SUBMODULES="helcontent2 $GIT_NEEDED_SUBMODULES"
else
AC_MSG_RESULT([no])
fi
......@@ -4369,6 +4372,7 @@ if test -z "$with_myspell_dicts" -o "$with_myspell_dicts" = "yes"; then
WITH_MYSPELL_DICTS=YES
BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
GIT_REPO_NAMES="$GIT_REPO_NAMES dictionaries"
GIT_NEEDED_SUBMODULES="dictionaries $GIT_NEEDED_SUBMODULES"
else
AC_MSG_RESULT([no])
WITH_MYSPELL_DICTS=NO
......@@ -12185,6 +12189,7 @@ if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; then
else
AC_MSG_RESULT([$WITH_LANG])
GIT_REPO_NAMES="$GIT_REPO_NAMES translations"
GIT_NEEDED_SUBMODULES="translations $GIT_NEEDED_SUBMODULES"
fi
# check that the list is valid
for lang in $WITH_LANG; do
......@@ -12210,6 +12215,7 @@ AC_SUBST(ALL_LANGS)
AC_SUBST(WITH_LANG)
AC_SUBST(WITH_LANG_LIST)
AC_SUBST(GIT_REPO_NAMES)
AC_SUBST(GIT_NEEDED_SUBMODULES)
PathFormat "$SRC_ROOT/translations"
......
dictionaries @ 19dba715
Subproject commit 19dba715c843961a18bbc8871373e33be165c4ab
......@@ -52,17 +52,19 @@ if [ -d .git ] ; then
if [ -z "$GIT_LINK_SRC" ]; 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
# 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
fi
fi
......@@ -169,7 +171,7 @@ for i in $filelist ; do
# echo $i
if [ "$i" != `echo $i | sed "s/^http:\///"` ]; then
tarurl=$i
# TODO: check for comment
# TODO: check for comment
else
if [ "$tarurl" != "" ]; then
sum=`echo $i | sed "s/-.*//"`
......
This diff is collapsed.
helpcontent2 @ 4507e5f2
Subproject commit 4507e5f21836724cf768cf4e3ffbbf4ada6c87c3
translations @ 751ae9de
Subproject commit 751ae9de9563da8b26aef8e5c0f80ad502fbfe81
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment