mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

g: we are not, in fact, in the BUILDDIR

Browse Source 
For an out-of-tree build, "make fetch" poinlessly clones all git
submodules.

Change-Id: If4afb218946f49ba934f68b35806fd8143c39387
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135143
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
This commit is contained in:
Michael Stahl
2022-05-30 21:30:04 +02:00
parent 49f62ab95e
commit aa8ef74b47
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
g
View File

@@ -10,9 +10,9 @@ fi
SUBMODULES_ALL="dictionaries helpcontent2 translations" SUBMODULES_ALL="dictionaries helpcontent2 translations"
pushd $(dirname $0) > /dev/null pushd $(dirname $0) > /dev/null
if [ -f config_host.mk ] ; then if [ -f ${BUILDDIR}/config_host.mk ] ; then
# we are in the BUILDDIR # we are in the SRCDIR
SRC_ROOT=$(< config_host.mk grep -a SRC_ROOT | sed -e "s/.*=//") SRC_ROOT=$(< ${BUILDDIR}/config_host.mk grep -a SRC_ROOT | sed -e "s/.*=//")
else else
SRC_ROOT=$(pwd) SRC_ROOT=$(pwd)
fi fi
@@ -150,8 +150,8 @@ get_active_submodules()
get_configured_submodules() get_configured_submodules()
{ {
SUBMODULES_CONFIGURED="" SUBMODULES_CONFIGURED=""
if [ -f config_host.mk ] ; then if [ -f ${BUILDDIR}/config_host.mk ] ; then
SUBMODULES_CONFIGURED=$(< config_host.mk grep -a GIT_NEEDED_SUBMODULES | sed -e "s/.*=//") SUBMODULES_CONFIGURED=$(< ${BUILDDIR}/config_host.mk grep -a GIT_NEEDED_SUBMODULES | sed -e "s/.*=//")
else else
# if we need the configured submodule before the configuration is done. we assumed you want them all # if we need the configured submodule before the configuration is done. we assumed you want them all
SUBMODULES_CONFIGURED=${SUBMODULES_ALL?} SUBMODULES_CONFIGURED=${SUBMODULES_ALL?}
@@ -161,12 +161,12 @@ get_configured_submodules()
get_git_reference() get_git_reference()
{ {
REFERENCED_GIT="" REFERENCED_GIT=""
if [ -f config_host.mk ]; then if [ -f ${BUILDDIR}/config_host.mk ]; then
REFERENCED_GIT=$(< config_host.mk grep -a GIT_REFERENCE_SRC | sed -e "s/.*=//") REFERENCED_GIT=$(< ${BUILDDIR}/config_host.mk grep -a GIT_REFERENCE_SRC | sed -e "s/.*=//")
fi fi
LINKED_GIT="" LINKED_GIT=""
if [ -f config_host.mk ]; then if [ -f ${BUILDDIR}/config_host.mk ]; then
LINKED_GIT=$(< config_host.mk grep -a GIT_LINK_SRC | sed -e "s/.*=//") LINKED_GIT=$(< ${BUILDDIR}/config_host.mk grep -a GIT_LINK_SRC | sed -e "s/.*=//")
fi fi
} }