[Libreoffice-commits] .: bin/create_bootstrap_links bin/mkworkdir bin/repo-list.in config_host.mk.in configure.ac download Makefile Makefile.top
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Oct 31 09:29:32 PDT 2012
Makefile | 1
Makefile.top | 4 -
bin/create_bootstrap_links | 17 -------
bin/mkworkdir | 103 ---------------------------------------------
bin/repo-list.in | 1
config_host.mk.in | 1
configure.ac | 11 ----
download | 20 +++-----
8 files changed, 12 insertions(+), 146 deletions(-)
New commits:
commit 664012b313f3c3cd5666fc6f943fc8152e503e23
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Thu Oct 25 17:27:43 2012 +0200
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 at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/Makefile b/Makefile
index 3fdc86d..65be21f 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,6 @@ $(filter-out help,$(firstword $(MAKECMDGOALS))) : $(SRCDIR)/config_host.mk
# run configure in an environment not polluted by config_host.mk
$(SRCDIR)/config_host.mk : \
$(SRCDIR)/config_host.mk.in \
- $(SRCDIR)/bin/repo-list.in \
$(SRCDIR)/ooo.lst.in \
$(SRCDIR)/configure.ac \
$(SRCDIR)/autogen.lastrun
diff --git a/Makefile.top b/Makefile.top
index 47df97a..2838a7b 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -359,7 +359,7 @@ ifeq ($(BUILD_DMAKE),YES)
rm -f solenv/*/bin/dmake*
endif
rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \
- bin/repo-list config.log config.status configure \
+ config.log config.status configure \
ooo.lst post_download post_download.log \
config_host.mk.last set_soenv.stamp src.downloaded warn \
solenv/bin/concat-deps.exe solenv/bin/concat-deps
@@ -380,7 +380,7 @@ ifneq ($(filter-out clean distclean,$(MAKECMDGOALS)),)
#
fetch: src.downloaded
-src.downloaded : Makefile.top download ooo.lst bin/repo-list
+src.downloaded : Makefile.top download ooo.lst
ifeq ($(DO_FETCH_TARBALLS),YES)
@./download $(SRCDIR)/ooo.lst && touch $@
else
diff --git a/bin/create_bootstrap_links b/bin/create_bootstrap_links
deleted file mode 100755
index df813b2..0000000
--- a/bin/create_bootstrap_links
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-# with submodules we do not need links anymore
-
-#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
diff --git a/bin/mkworkdir b/bin/mkworkdir
deleted file mode 100755
index 9691ee1..0000000
--- a/bin/mkworkdir
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname $0)
-GIT_NEW_WORKDIR=`which git-new-workdir 2>/dev/null`
-if [ -z $GIT_NEW_WORKDIR ] ; then
- GIT_NEW_WORKDIR="$BASEDIR/git-new-workdir"
-fi
-
-print_help() {
- echo "Usage: $1 [-s | --source bootstrap_reference_repo_path] [ -d | --workdir-base-path path] [ --as alias_name] [branch name]"
- echo "--source is optional if you are currently in a bootstrap git repository, in which case that repository is used as source"
- echo "--workdir-base-path is optional if you have defined LO_BASE_WORKDIR in your environement"
- echo "--as is the name of the directory that will be the bootstrap of your new workdir ensemble. the default is the branch name used to create the workdir"
- echo "the branch name is optional, the default is 'master'"
-}
-
-die() {
- echo $1
- exit 1
-}
-
-BOOTSTRAP_DIR=
-DEST_DIR=${LO_BASE_WORKDIR:-}
-BRANCH="master"
-
-while [ "${1:-}" != "" ] ; do
- case $1 in
- -s | --source )
- shift
- BOOTSTRAP_DIR="$1"
- ;;
- -d | --workdir-base-path )
- shift
- DEST_DIR="$1"
- ;;
- --as )
- shift
- WKDIR_NAME="$1"
- ;;
- -h | --help )
- print_help $0
- exit 0
- ;;
- -* )
- die "invalid option $1"
- ;;
- *)
- if [ -z "$BRANCH" ] ; then
- BRANCH="$1"
- else
- die "Too many arguments"
- fi
- ;;
- esac
- shift
-done
-
-
-if [ -z "$BOOTSTRAP_DIR" ]; then
- BOOTSTRAP_DIR=$(git rev-parse --show-toplevel 2>/dev/null) || die "Cannot use the current working directory as implicit source: Not a git repository"
- if [ -n "$BOOTSTRAP_DIR" ] ; then
- if [ "$(basename $(git config remote.origin.url))" != "bootstrap" ] ; then
- die "Cannot use the current working directory as implicit source: Not a bootstrap git repository"
- fi
- fi
-fi
-if [ -z "$DEST_DIR" ]; then
- echo "destination directory is missing."
- print_help $0
- exit 1
-fi
-
-if [ -z "$WKDIR_NAME" ]; then
- WKDIR_NAME="$BRANCH"
-fi
-
-if [ -e "$DEST_DIR/$WKDIR_NAME" ]; then
- die "$DEST_DIR/$WKDIR_NAME already exists."
-fi
-
-echo "===== bootstrap ====="
-$GIT_NEW_WORKDIR $BOOTSTRAP_DIR "$DEST_DIR/$WKDIR_NAME" $BRANCH
-
-echo "creating directory $DEST_DIR/$WKDIR_NAME/clone"
-mkdir -p "$DEST_DIR/$WKDIR_NAME/clone" || die "failed to create $DEST_DIR/$WKDIR_NAME/clone"
-
-REPOS=$(cat ${BASEDIR}/repo-list)
-
-cd "$DEST_DIR/$WKDIR_NAME"
-
-for repo in $REPOS; do
- repo_path="${BOOTSTRAP_DIR}/clone/$repo"
- echo "===== $repo ====="
- $GIT_NEW_WORKDIR $repo_path "$DEST_DIR/$WKDIR_NAME/clone/$repo" $BRANCH
- for link in $(ls ./clone/$repo) ; do
- if [ ! -e "$link" ] ; then
- echo "Creating link $link"
- ln -s "./clone/$repo/$link" "$link"
- fi
- done
-
-done
-
diff --git a/bin/repo-list.in b/bin/repo-list.in
deleted file mode 100644
index 15bad77..0000000
--- a/bin/repo-list.in
+++ /dev/null
@@ -1 +0,0 @@
- at GIT_REPO_NAMES@
\ No newline at end of file
diff --git a/config_host.mk.in b/config_host.mk.in
index 105b672..0317bef 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -202,7 +202,6 @@ 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@
export PARALLELISM=@PARALLELISM@
diff --git a/configure.ac b/configure.ac
index 8910055..d1dc127 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,6 @@ save_CXX=$CXX
BUILD_TYPE="LibO"
SCPDEFS=""
-GIT_REPO_NAMES=""
GIT_NEEDED_SUBMODULES=""
LO_PATH= # used by path_munge to construct a PATH variable
@@ -4069,7 +4068,6 @@ if test "$cross_compiling" = "yes"; then
rm -rf CONF-FOR-BUILD config_build.mk
mkdir CONF-FOR-BUILD
tar cf - \
- bin/repo-list.in \
config.guess \
config_host.mk.in \
config_host.mk.source \
@@ -4366,7 +4364,6 @@ if test "$enable_binfilter" = "no"; then
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
@@ -4377,7 +4374,6 @@ if test "$with_help" != "no" -a $_os != iOS -a $_os != Android; then
AC_MSG_RESULT([yes])
BUILD_TYPE="$BUILD_TYPE HELP"
SCPDEFS="$SCPDEFS -DWITH_HELP"
- GIT_REPO_NAMES="$GIT_REPO_NAMES help"
GIT_NEEDED_SUBMODULES="helpcontent2 $GIT_NEEDED_SUBMODULES"
else
AC_MSG_RESULT([no])
@@ -4390,7 +4386,6 @@ if test -z "$with_myspell_dicts" -o "$with_myspell_dicts" = "yes"; then
AC_MSG_RESULT([yes])
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])
@@ -12134,7 +12129,6 @@ if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; then
AC_MSG_RESULT([en-US])
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
@@ -12160,7 +12154,6 @@ test -z "$WITH_LANG" || BUILD_TYPE="$BUILD_TYPE TRANSLATIONS"
AC_SUBST(ALL_LANGS)
AC_SUBST(WITH_LANG)
AC_SUBST(WITH_LANG_LIST)
-AC_SUBST(GIT_REPO_NAMES)
AC_SUBST(GIT_NEEDED_SUBMODULES)
@@ -12180,7 +12173,7 @@ AC_SUBST(WITH_POOR_HELP_LOCALIZATIONS)
dnl git-new-workdir
dnl ===================================================================
if test -n "${GIT_LINK_SRC}"; then
- for repo in ${GIT_REPO_NAMES}; do
+ 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
@@ -12807,7 +12800,7 @@ else
echo > config_host.mk.last
fi
-AC_CONFIG_FILES([config_host.mk ooo.lst bin/repo-list])
+AC_CONFIG_FILES([config_host.mk ooo.lst])
AC_OUTPUT
# touch the config timestamp file set_soenv.stamp
diff --git a/download b/download
index 0dc1d0f..c9e8739 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" ""
More information about the Libreoffice-commits
mailing list