Kaydet (Commit) fe6ed1e8 authored tarafından Thorsten Behrens's avatar Thorsten Behrens

Add with-linked-git and make repo list configurable

* adds --with-linked-git config option, that internally uses
  git-new-workdir
* consolidates various repo lists into bin/repo-list, and use
  that to dynamically add l10n repo
üst f9eb714c
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
# autoconf generated stuff # autoconf generated stuff
/aclocal.m4 /aclocal.m4
/autom4te.cache /autom4te.cache
/autogen.lastrun
/bootstrap /bootstrap
/ChangeLog /ChangeLog
/config.log /config.log
...@@ -30,6 +31,7 @@ ...@@ -30,6 +31,7 @@
/set_soenv /set_soenv
/visibility.cxx /visibility.cxx
/post_download /post_download
/bin/repo-list
# misc # misc
/set_soenv.last /set_soenv.last
......
artwork base calc components extensions extras filters help impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing ure writer
@GIT_REPO_NAMES@
\ No newline at end of file
...@@ -582,6 +582,14 @@ AC_ARG_WITH(external-tar, ...@@ -582,6 +582,14 @@ AC_ARG_WITH(external-tar,
TARFILE_LOCATION=$withval , TARFILE_LOCATION=$withval ,
) )
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(openldap, AC_ARG_WITH(openldap,
AS_HELP_STRING([--with-openldap], AS_HELP_STRING([--with-openldap],
[Enables the use of the OpenLDAP LDAP SDK instead of the Netscape/Mozilla one.]), [Enables the use of the OpenLDAP LDAP SDK instead of the Netscape/Mozilla one.]),
...@@ -1888,6 +1896,11 @@ if test -z "$enable_fetch_external" || test "$enable_fetch_external" = "yes" \ ...@@ -1888,6 +1896,11 @@ if test -z "$enable_fetch_external" || test "$enable_fetch_external" = "yes" \
fi fi
AC_SUBST(DO_FETCH_TARBALLS) AC_SUBST(DO_FETCH_TARBALLS)
dnl ===================================================================
dnl git-new-workdir
dnl ===================================================================
AC_SUBST(GIT_LINK_SRC)
dnl =================================================================== dnl ===================================================================
dnl Disable legacy binary file formats filters dnl Disable legacy binary file formats filters
dnl =================================================================== dnl ===================================================================
...@@ -7857,14 +7870,22 @@ location (/usr/share/java), specify its pathname via ...@@ -7857,14 +7870,22 @@ location (/usr/share/java), specify its pathname via
fi fi
AC_SUBST(OOO_JUNIT_JAR) AC_SUBST(OOO_JUNIT_JAR)
dnl ===================================================================
dnl Dealing with l10n options
dnl ===================================================================
GIT_REPO_NAMES="artwork base calc components extensions extras filters
help impress libs-core libs-extern libs-extern-sys libs-gui
postprocess sdk testing ure writer"
AC_MSG_CHECKING([which languages to be built]) AC_MSG_CHECKING([which languages to be built])
WITH_LANG="$with_lang" WITH_LANG="$with_lang"
if test -z "$WITH_LANG"; then if test -z "$WITH_LANG"; then
AC_MSG_RESULT([en-US]) AC_MSG_RESULT([en-US])
else else
AC_MSG_RESULT([$WITH_LANG]) AC_MSG_RESULT([$WITH_LANG])
GIT_REPO_NAMES="$GIT_REPO_NAMES l10n"
fi fi
AC_SUBST(WITH_LANG) AC_SUBST(WITH_LANG)
AC_SUBST(GIT_REPO_NAMES)
AC_MSG_CHECKING([which languages have poor help localizations]) AC_MSG_CHECKING([which languages have poor help localizations])
WITH_POOR_HELP_LOCALIZATIONS="$with_poor_help_localizations" WITH_POOR_HELP_LOCALIZATIONS="$with_poor_help_localizations"
...@@ -8085,7 +8106,7 @@ else ...@@ -8085,7 +8106,7 @@ else
echo > set_soenv.last echo > set_soenv.last
fi fi
AC_OUTPUT([set_soenv Makefile]) AC_OUTPUT([set_soenv Makefile bin/repo-list])
# touch the config timestamp file set_soenv.stamp # touch the config timestamp file set_soenv.stamp
if test ! -f set_soenv.stamp; then if test ! -f set_soenv.stamp; then
......
...@@ -26,14 +26,24 @@ ...@@ -26,14 +26,24 @@
# #
#************************************************************************* #*************************************************************************
# environment setup yet?
if [ -z "$TARFILE_LOCATION" ]; then
. ./*[Ee]nv.[Ss]et.sh
fi
# we want to clone if we are in the bootstrap git repo and clone does not exist yet # we want to clone if we are in the bootstrap git repo and clone does not exist yet
# we need to test for a .git in order not to clone after rsync if we are called in # we need to test for a .git in order not to clone after rsync if we are called in
# the inner autogen of the buid-repo based build # the inner autogen of the buid-repo based build
if [ ! -d clone -a -d .git ] ; then if [ ! -d clone -a -d .git ] ; then
./g clone if [ -z "$GIT_LINK_SRC" ]; then
fi ./g clone
if [ -z "$TARFILE_LOCATION" ]; then else
. ./*[Ee]nv.[Ss]et.sh # space-saving clone from another local workdir
mkdir clone
for i in $GIT_REPO_NAMES ; do
bin/git-new-workdir $GIT_LINK_SRC/$i clone/$i
done
fi
fi fi
if [ ! -d "$TARFILE_LOCATION" ]; then if [ ! -d "$TARFILE_LOCATION" ]; then
......
...@@ -126,9 +126,7 @@ done ...@@ -126,9 +126,7 @@ done
# do it! # do it!
DIRS="bootstrap `(cd $CLONEDIR ; ls)`" DIRS="bootstrap `(cd $CLONEDIR ; ls)`"
if [ "$COMMAND" = "clone" ] ; then if [ "$COMMAND" = "clone" ] ; then
DIRS="artwork base calc components extensions extras filters DIRS=`cat bin/repo-list`
help impress libs-core libs-extern libs-extern-sys libs-gui
postprocess sdk testing ure writer"
# update hooks in the main repo too # update hooks in the main repo too
( cd "$RAWBUILDDIR" ; update_hooks "../../git-hooks" ) ( cd "$RAWBUILDDIR" ; update_hooks "../../git-hooks" )
fi fi
......
...@@ -1721,6 +1721,9 @@ ToFile( "MKDEPENDSOLVER", "TRUE", "e" ); ...@@ -1721,6 +1721,9 @@ ToFile( "MKDEPENDSOLVER", "TRUE", "e" );
ToFile( "nodep", "@nodep@", "e" ); ToFile( "nodep", "@nodep@", "e" );
ToFile( "TARFILE_LOCATION", $TARFILE_LOCATION, "e" ); ToFile( "TARFILE_LOCATION", $TARFILE_LOCATION, "e" );
ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@", "e" ); ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@", "e" );
ToFile( "GIT_LINK_SRC", "@GIT_LINK_SRC@", "e" );
ToFile( "GIT_REPO_NAMES", "@GIT_REPO_NAMES@", "e" );
# #
# Writing the platform dependent constant values to file. # Writing the platform dependent constant values to file.
# (c = comment, e = environment variable, a = alias ) # (c = comment, e = environment variable, a = alias )
......
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