[ooo-build-commit] .: 2 commits - bin/g patches/dev300

[Cédric Bosdonnat]

 bin/g                |   20 ++++++++++++++++++++
 patches/dev300/apply |    2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 53c1a0093c0930c0a822207765cb7c6436f7093d
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Fri Aug 27 11:11:41 2010 +0200

    Make bin/g update the symlinks after a pull

diff --git a/bin/g b/bin/g
index 3d9fa15..05bf357 100755
--- a/bin/g
+++ b/bin/g
@@ -10,6 +10,7 @@ if [ "$#" -eq "0" ] ; then
 fi
 
 CLONEDIR=`readlink -e $0 | sed 's/\/bin\/g$/\/clone/'`
+RAWBUILDDIR=`readlink -e $0 | sed 's/\/bin\/g$/\/rawbuild/'`
 
 # extra params for some commands, like log
 EXTRA=
@@ -158,11 +159,30 @@ for DIR in * ; do
             # git status returns error in some versions; we want to continue
             [ "$COMMAND" = "status" ] && RETURN=0
 
+            if [ "$COMMAND" = "pull" ] ; then
+                for link in `ls` ; do
+                    if [ ! -e "$RAWBUILDDIR/$link" ] ; then
+                        echo "Creating missing link $link"
+                        ln -s "$CLONEDIR/$DIR/$link" "$RAWBUILDDIR/$link"
+                    fi
+                done
+            fi
+
             exit $RETURN
         ) || exit $?
     fi
 done
 
+# Cleanup the broken links
+if [ "$COMMAND" = "pull" ] ; then
+    for link in `ls $RAWBUILDDIR` ; do
+        if [ -h "$RAWBUILDDIR/$link" -a ! -e "$RAWBUILDDIR/$link" ]; then
+            echo "Removing broken link $link"
+            rm $RAWBUILDDIR/$link
+        fi
+    done
+fi
+
 # warn
 if [ "$COMMAND" = "apply" ] ; then
     echo
commit 559e752fcb60ff11a854be08eb998187dce19daa
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Thu Aug 26 12:20:47 2010 +0200

    Enabled writer-comparison help

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9d5155c..4a5a90d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3075,7 +3075,7 @@ SectionOwner => jholesov
 # Improved document comparison
 writer-doc-comparison.diff, tzvetelina
 # Help files for the document comparison
-#writer-doc-comparison-help.diff, tzvetelina
+writer-doc-comparison-help.diff, tzvetelina
 
 
 [ ExtensionFixes ]