ooo-build r14374 - in trunk: . bin

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Tue Oct 21 16:36:36 2008
New Revision: 14374
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14374&view=rev

Log:
2008-10-21  Jan Holesovsky  <kendy suse cz>

        * bin/cws-extract: Implement -s as in cws-extract-cvs (don't ignore
          whitespace changes).


Modified:
   trunk/ChangeLog
   trunk/bin/cws-extract

Modified: trunk/bin/cws-extract
==============================================================================
--- trunk/bin/cws-extract	(original)
+++ trunk/bin/cws-extract	Tue Oct 21 16:36:36 2008
@@ -1,14 +1,29 @@
 #!/bin/bash
 
 usage() {
-    echo "cws-extract cws_name"
+    echo 1>&2 << EOF
+cws-extract [-s] cws_name
+Create a patch from an up-stream CWS suitable for ooo-build.
+
+  -s            Don't ignore changes in whitespace.
+EOF
     exit 1;
 }
 
 echo "Warning!  This is the SVN version of cws-extract, use
 cws-extract-cvs for the older OOo CWSes."
 
-CWS="$1"
+CWS=""
+DIFFPARAMS="-ubwp"
+while [ -n "$1" ] ; do
+    case "$1" in
+        -s) DIFFPARAMS="-up"
+            ;;
+        *)  CWS="$1"
+            ;;
+    esac
+    shift
+done
 
 [ -n "$CWS" ] || usage
 
@@ -21,7 +36,7 @@
             grep '^r' | tail -n 1 | sed 's/^r\([0-9]*\)[^0-9].*/\1/'`
 
 if [ -n "$MERGE_BASE" ] ; then
-    svn diff -r $MERGE_BASE "svn+ssh://svn svn services openoffice org/ooo/cws/$CWS" > "cws-$CWS.diff"
+    svn diff -r "$MERGE_BASE" -x "$DIFFPARAMS" "svn+ssh://svn svn services openoffice org/ooo/cws/$CWS" > "cws-$CWS.diff"
 fi
 
 rm "$LOG"