[Libreoffice-commits] .: 5 commits - configure.in download g solenv/gbuild
Michael Stahl
mst at kemper.freedesktop.org
Fri Nov 4 02:58:11 PDT 2011
configure.in | 15 +++-
download | 6 +
g | 156 ++++++++++++++++++++++----------------------
solenv/gbuild/LinkTarget.mk | 2
solenv/gbuild/gbuild.mk | 9 +-
5 files changed, 104 insertions(+), 84 deletions(-)
New commits:
commit 9635dab7ccdc629ff55e571ee1495573dca53aee
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 4 10:55:09 2011 +0100
download: do not annoy me by creating bogus git-hooks
diff --git a/download b/download
index 33e5151..ded21af 100755
--- a/download
+++ b/download
@@ -54,8 +54,10 @@ if [ -d .git ] ; then
mkdir clone
for i in $GIT_REPO_NAMES ; do
bin/git-new-workdir $GIT_LINK_SRC/$i clone/$i
- for i in clone/$i/* ; do
- ln -sfn $i $(basename $i)
+ for d in clone/$i/* ; do
+ if [ "${d}" != "clone/$i/git-hooks" ]; then
+ ln -sfn ${d} $(basename ${d})
+ fi
done
done
fi
commit 175f17b31e838056b733a1524e5f366efe7300d9
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 3 21:56:21 2011 +0100
'g': whitespace: expand tabs
diff --git a/g b/g
index bf65d65..a4f9af5 100755
--- a/g
+++ b/g
@@ -34,54 +34,54 @@ refresh_hooks()
{
repo=$1
case "$repo" in
- core)
- pushd $COREDIR > /dev/null
- for hook_name in $(ls -1 $COREDIR/git-hooks) ; do
- hook=".git/hooks/$hook_name"
- if [ ! -x "$hook" ] ; then
- rm -f "$hook"
- ln -sf "$COREDIR/git-hooks/$hook_name" "$hook"
- fi
- done
- popd > /dev/null
- ;;
- translations)
- if [ -d $COREDIR/clone/translations ] ; then
- pushd $COREDIR/clone/translations > /dev/null
- for hook_name in $(ls -1 $COREDIR/clone/translations/git-hooks) ; do
- hook=".git/hooks/$hook_name"
- if [ ! -x "$hook" ] ; then
- rm -f "$hook"
- ln -sf "$COREDIR/clone/translations/git-hooks/$hook_name" "$hook"
+ core)
+ pushd $COREDIR > /dev/null
+ for hook_name in $(ls -1 $COREDIR/git-hooks) ; do
+ hook=".git/hooks/$hook_name"
+ if [ ! -x "$hook" ] ; then
+ rm -f "$hook"
+ ln -sf "$COREDIR/git-hooks/$hook_name" "$hook"
+ fi
+ done
+ popd > /dev/null
+ ;;
+ translations)
+ if [ -d $COREDIR/clone/translations ] ; then
+ pushd $COREDIR/clone/translations > /dev/null
+ for hook_name in $(ls -1 $COREDIR/clone/translations/git-hooks); do
+ hook=".git/hooks/$hook_name"
+ if [ ! -x "$hook" ] ; then
+ rm -f "$hook"
+ ln -sf "$COREDIR/clone/translations/git-hooks/$hook_name" "$hook"
+ fi
+ done
+ # .gitattribute should be per-repo, avoid entangling repos
+ if [ -L .gitattributes ] ; then
+ rm -f .gitattributes
+ fi
+ popd > /dev/null
fi
- done
- # .gitattribute should be per-repo, avoid entangling repos
- if [ -L .gitattributes ] ; then
- rm -f .gitattributes
- fi
- popd > /dev/null
- fi
- ;;
- binfilter|help|dictionaries)
- if [ -d $COREDIR/clone/$repo ] ; then
- pushd $COREDIR/clone/$repo > /dev/null
- # fixme: we should really keep these per-repo to
- # keep the repos independant. since these two
- # are realy not independant yet, we keep using core's hooks
- for hook_name in $(ls -1 $COREDIR/git-hooks) ; do
- hook=".git/hooks/$hook_name"
- if [ ! -x "$hook" ] ; then
- rm -f "$hook"
- ln -sf "$COREDIR/git-hooks/$hook_name" "$hook"
+ ;;
+ binfilter|help|dictionaries)
+ if [ -d $COREDIR/clone/$repo ] ; then
+ pushd $COREDIR/clone/$repo > /dev/null
+ # fixme: we should really keep these per-repo to
+ # keep the repos independant. since these two
+ # are realy not independant yet, we keep using core's hooks
+ for hook_name in $(ls -1 $COREDIR/git-hooks) ; do
+ hook=".git/hooks/$hook_name"
+ if [ ! -x "$hook" ] ; then
+ rm -f "$hook"
+ ln -sf "$COREDIR/git-hooks/$hook_name" "$hook"
+ fi
+ done
+ # .gitattribute should be per-repo, avoid entangling repos
+ if [ -L .gitattributes ] ; then
+ rm -f .gitattributes
+ fi
+ popd > /dev/null
fi
- done
- # .gitattribute should be per-repo, avoid entangling repos
- if [ -L .gitattributes ] ; then
- rm -f .gitattributes
- fi
- popd > /dev/null
- fi
- ;;
+ ;;
esac
}
@@ -89,7 +89,7 @@ refresh_all_hooks()
{
repos="core $(cat "$COREDIR/bin/repo-list")"
for repo in $repos ; do
- refresh_hooks $repo
+ refresh_hooks $repo
done
}
@@ -97,7 +97,7 @@ postprocess()
{
rc=$1
if $DO_HOOK_REFRESH ; then
- refresh_all_hooks
+ refresh_all_hooks
fi
exit $rc;
@@ -128,22 +128,22 @@ while [ "${COMMAND:0:1}" = "-" ] ; do
;;
-s) REPORT_REPOS=0
;;
- -1) REPORT_COMPACT=1
+ -1) REPORT_COMPACT=1
+ ;;
+ --set-push-user)
+ shift
+ PUSH_USER="$1"
+ ;;
+ --last-working) LAST_WORKING=1
+ ;;
+ --set-last-working) SET_LAST_WORKING=1
+ ;;
+ --push-notes) PUSH_NOTES=1
+ ;;
+ -z)
+ DO_HOOK_REFRESH=true
+ postprocess 0
;;
- --set-push-user)
- shift
- PUSH_USER="$1"
- ;;
- --last-working) LAST_WORKING=1
- ;;
- --set-last-working) SET_LAST_WORKING=1
- ;;
- --push-notes) PUSH_NOTES=1
- ;;
- -z)
- DO_HOOK_REFRESH=true
- postprocess 0
- ;;
esac
shift
COMMAND="$1"
@@ -155,8 +155,8 @@ case "$COMMAND" in
RELATIVIZE=0
;;
clone|fetch|pull)
- DO_HOOK_REFRESH=true
- ;;
+ DO_HOOK_REFRESH=true
+ ;;
diff)
PAGER='--no-pager'
REPORT_REPOS=0
@@ -242,16 +242,16 @@ for REPO in $DIRS ; do
if [ -d "$DIR" -a "z$PUSH_USER" != "z" ]; then
echo "setting up push url for $DIR"
- (cd $DIR && git config remote.origin.pushurl "ssh://${PUSH_USER}@git.freedesktop.org/git/libreoffice/${REPO}")
+ (cd $DIR && git config remote.origin.pushurl "ssh://${PUSH_USER}@git.freedesktop.org/git/libreoffice/${REPO}")
elif [ -d "$DIR" -a "z$LAST_WORKING" != "z" ]; then
echo "fetching notes for $REPO ..."
(cd $DIR && git fetch origin 'refs/notes/*:refs/notes/*')
hash=`(cd $DIR && git log --pretty='%H %N' | grep 'win32 working build' | head -n1 | sed 's/ win32.*//')`
if test "z$hash" != "z"; then
- echo "update to $hash"
- (cd $DIR && git checkout $hash)
+ echo "update to $hash"
+ (cd $DIR && git checkout $hash)
else
- echo "Warning: missing known working note on repo $REPO"
+ echo "Warning: missing known working note on repo $REPO"
fi
elif [ -d "$DIR" -a "z$SET_LAST_WORKING" != "z" ]; then
echo "fetching notes for $REPO ..."
@@ -323,7 +323,7 @@ for REPO in $DIRS ; do
;;
clone)
EXTRA="$(git config remote.origin.url)"
- EXTRA=${EXTRA/core/${REPO}}
+ EXTRA=${EXTRA/core/${REPO}}
;;
esac
@@ -348,18 +348,18 @@ for REPO in $DIRS ; do
case "$COMMAND" in
pull|clone)
# update links
- if [ "$DIR" != "$COREDIR" ]; then
- for link in $(ls) ; do
- if [ ! -e "$COREDIR/$link" ] ; then
- if test -h "$COREDIR/$link"; then
- rm "$COREDIR/$link"
- echo -n "re-"
- fi
+ if [ "$DIR" != "$COREDIR" ]; then
+ for link in $(ls) ; do
+ if [ ! -e "$COREDIR/$link" ] ; then
+ if test -h "$COREDIR/$link"; then
+ rm "$COREDIR/$link"
+ echo -n "re-"
+ fi
echo "creating missing link $link"
ln -s "$DIR/$link" "$COREDIR/$link"
fi
done
- fi
+ fi
;;
status)
# git status returns error in some versions, clear that
commit a0eb50ac6c6d247e4ae7d1ade3c20300210df113
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 3 21:52:20 2011 +0100
'g': actually set up git hooks properly
diff --git a/g b/g
index f09caf0..bf65d65 100755
--- a/g
+++ b/g
@@ -37,11 +37,11 @@ refresh_hooks()
core)
pushd $COREDIR > /dev/null
for hook_name in $(ls -1 $COREDIR/git-hooks) ; do
- hook=".git/hooks/$hook_name"
- if [ ! -x "$hook" -a ! -L "$hook" ] ; then
- rm -f "$hook"
- ln -s "git-hooks/$hook_name" "$hook"
- fi
+ hook=".git/hooks/$hook_name"
+ if [ ! -x "$hook" ] ; then
+ rm -f "$hook"
+ ln -sf "$COREDIR/git-hooks/$hook_name" "$hook"
+ fi
done
popd > /dev/null
;;
@@ -50,8 +50,10 @@ refresh_hooks()
pushd $COREDIR/clone/translations > /dev/null
for hook_name in $(ls -1 $COREDIR/clone/translations/git-hooks) ; do
hook=".git/hooks/$hook_name"
- rm -f "$hook"
- ln -sf "git-hooks/$hook_name" "$hook"
+ if [ ! -x "$hook" ] ; then
+ rm -f "$hook"
+ ln -sf "$COREDIR/clone/translations/git-hooks/$hook_name" "$hook"
+ fi
done
# .gitattribute should be per-repo, avoid entangling repos
if [ -L .gitattributes ] ; then
@@ -60,7 +62,7 @@ refresh_hooks()
popd > /dev/null
fi
;;
- help|dictionaries)
+ binfilter|help|dictionaries)
if [ -d $COREDIR/clone/$repo ] ; then
pushd $COREDIR/clone/$repo > /dev/null
# fixme: we should really keep these per-repo to
@@ -68,8 +70,10 @@ refresh_hooks()
# are realy not independant yet, we keep using core's hooks
for hook_name in $(ls -1 $COREDIR/git-hooks) ; do
hook=".git/hooks/$hook_name"
- rm -f "$hook"
- ln -sf "$COREDIR/git-hooks/$hook_name" "$hook"
+ if [ ! -x "$hook" ] ; then
+ rm -f "$hook"
+ ln -sf "$COREDIR/git-hooks/$hook_name" "$hook"
+ fi
done
# .gitattribute should be per-repo, avoid entangling repos
if [ -L .gitattributes ] ; then
commit 0ad9f4028dec2b1d05619987599f7856d572f5e5
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 3 20:13:46 2011 +0100
gbuild: document more user defined variables
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 3e71c97..96d5cc7 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -27,9 +27,11 @@
#*************************************************************************
#the following user-defined variables are supported:
+# YACCFLAGS
# CPPFLAGS
# CFLAGS
# CXXFLAGS
+# OBJCFLAGS
# OBJCXXFLAGS
# LDFLAGS
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 530fd9f..4be10a4 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -433,8 +433,13 @@ INTERACTIVE VARIABLES:
extremely verbose). Levels > 2 are not used very much.
ENABLE_PCH If not empty, use precompiled headers (Windows only).
- CFLAGS Add as compiler flags for plain c compilation.
- CXXFLAGS Add as compiler flags for c++ compilation.
+ YACCFLAGS Add as flags for YACC parser generator invocation.
+ CPPFLAGS Add as preprocessor flags for C/C++/ObjC/ObjC++ compilation.
+ CFLAGS Add as compiler flags for plain C compilation.
+ CXXFLAGS Add as compiler flags for C++ compilation.
+ OBJCFLAGS Add as compiler flags for Objective C compilation.
+ OBJCXXFLAGS Add as compiler flags for Objective C++ compilation.
+ LDFLAGS Add as linker flags.
gb_FULLDEPS Generate and use dependencies (on by default, handle with care).
gb_COLOR Use ASCII color output.
gb_TITLES Show progress in terminal title.
commit 30a7608b6cb95c0ba6903116101314a02b82c1dd
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 3 20:10:28 2011 +0100
configure: --with-linked-git: check that clone repos exist
If you specify the directory of the core repo instead of the clones
subdirectory a huge mess results.
diff --git a/configure.in b/configure.in
index 808ec57..b71a0fe 100644
--- a/configure.in
+++ b/configure.in
@@ -2443,10 +2443,6 @@ fi
AC_SUBST(DO_FETCH_TARBALLS)
-dnl git-new-workdir
-dnl ===================================================================
-AC_SUBST(GIT_LINK_SRC)
-
dnl Disable legacy binary file formats filters
dnl ===================================================================
AC_MSG_CHECKING([whether to enable filters for legacy binary file formats (StarOffice 5.2)])
@@ -9091,6 +9087,17 @@ AC_SUBST(WITH_LANG)
AC_SUBST(WITH_LANG_LIST)
AC_SUBST(GIT_REPO_NAMES)
+dnl git-new-workdir
+dnl ===================================================================
+if test -n "${GIT_LINK_SRC}"; then
+ for repo in ${GIT_REPO_NAMES}; 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)
+
AC_MSG_CHECKING([for another 'intro' bitmap])
INTRO_BITMAP=
if test -z "$with_intro_bitmap" -o "$with_intro_bitmap" = "no" ; then
More information about the Libreoffice-commits
mailing list