Makefile.in | 8 --------
config_host.mk.in | 1 -
configure.ac | 19 -------------------
3 files changed, 28 deletions(-)
New commits:
commit f6251134c94c5424dac633a107e07a2403e3a56d
Author: Miklos Vajna <vmik...@suse.cz>
Date: Fri Feb 15 11:42:59 2013 +0100
configure: drop no longer working --with-linked-git option
--with-referenced-git works with submodules, --with-linked-git does not.
And I don't see a way to fix it, either.
Change-Id: Ib6cdb065a022665cd62e9fdc7fc37a9e916e50ad
Reviewed-on: https://gerrit.libreoffice.org/2165
Reviewed-by: Matúš Kukan <matus.ku...@gmail.com>
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Reviewed-by: Miklos Vajna <vmik...@suse.cz>
Tested-by: Miklos Vajna <vmik...@suse.cz>
diff --git a/Makefile.in b/Makefile.in
index 445daa0..8f87840 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -222,15 +222,7 @@ fetch: get-submodules
ifneq (,$(wildcard $(SRCDIR)/.git))
get-submodules:
ifneq ($(foreach i,$(GIT_NEEDED_SUBMODULES),$(i)/.git),$(wildcard $(foreach
i,$(GIT_NEEDED_SUBMODULES),$(i)/.git)))
-ifeq (,$(GIT_LINK_SRC))
cd $(SRCDIR) && ./g -f clone
-else # space-saving clone from another local workdir
- @echo "FIXME: GIT_LINK_SRC method is not yet implemented with
submodules" 1>&2
- true $(foreach i,$(GIT_NEEDED_SUBMODULES),\
- && rm -r $(i) && cp -R $(GIT_LINK_SRC)/$(i) $(i))
-# bin/git-new-workdir $GIT_LINK_SRC/$i $i
- git submodule update $(GIT_NEEDED_SUBMODULES)
-endif
endif
@cd $(SRCDIR) && ./g -z # make sure the git hooks are in place enen if
no submodules are needed
diff --git a/config_host.mk.in b/config_host.mk.in
index 803be08..b24ea7b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -188,7 +188,6 @@ export GCONF_CFLAGS=$(gb_SPACE)@GCONF_CFLAGS@
export GCONF_LIBS=$(gb_SPACE)@GCONF_LIBS@
export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@
export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
-export GIT_LINK_SRC=@GIT_LINK_SRC@
export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@
export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 1061507..e5a7e5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1194,14 +1194,6 @@ AC_ARG_WITH(solver-and-workdir-root,
[Specify path that contains SOLARVER and WORKDIR directories
manually.])
)
-AC_ARG_WITH(linked-git,
- AS_HELP_STRING([--with-linked-git=<OTHER_CLONE_DIR>],
- [Specify another checkout's clonedir to re-use. This makes use of
- git-new-workdir, and saves a lot of diskspace when having
multiple
- trees side-by-side.]),
- GIT_LINK_SRC=$withval ,
-)
-
AC_ARG_WITH(referenced-git,
AS_HELP_STRING([--with-referenced-git=<OTHER_CHECKOUT_DIR>],
[Specify another checkout directory to reference. This makes use of
@@ -11945,17 +11937,6 @@ fi
AC_SUBST(L10N_MODULE)
AC_SUBST(WITH_POOR_HELP_LOCALIZATIONS)
-dnl git-new-workdir
-dnl ===================================================================
-if test -n "${GIT_LINK_SRC}"; then
- for repo in ${GIT_NEEDED_SUBMODULES}; do
- if ! test -d "${GIT_LINK_SRC}"/${repo}; then
- AC_MSG_ERROR([linked git: required repository does not exist:
${GIT_LINK_SRC}/${repo}])
- fi
- done
-fi
-AC_SUBST(GIT_LINK_SRC)
-
dnl git submodule update --reference
dnl ===================================================================
if test -n "${GIT_REFERENCE_SRC}"; then
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
