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

[Jan Holesovsky]

 bin/g                          |   30 ++++++++++++++----
 patches/dev300/apply           |    3 -
 patches/dev300/fix-linkoo.diff |   68 -----------------------------------------
 3 files changed, 24 insertions(+), 77 deletions(-)

New commits:
commit cbb9d49c60b6cec1377f1fdf6007b221c8e00da3
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Aug 24 13:58:08 2010 +0200

    Moved fix-linkoo.diff to the appropriate repos.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 91a8bd5..3109db6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -241,9 +241,6 @@ sal-strintern-speed-char-upper.diff, kohei
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20624
 warning-return-values-stlport.diff, jholesov
 
-# Fix linkoo, the ultimate hacker tool
-fix-linkoo.diff, i#83548, jholesov
-
 # fix a11y bug
 fix-gtk-a11y.diff, i#98533, michael
 
diff --git a/patches/dev300/fix-linkoo.diff b/patches/dev300/fix-linkoo.diff
deleted file mode 100644
index 2ba7a95..0000000
--- a/patches/dev300/fix-linkoo.diff
+++ /dev/null
@@ -1,68 +0,0 @@
----
- sal/osl/unx/file_url.cxx |   30 ++++++++++++++++++++++++++++--
- solenv/bin/linkoo        |    1 +
- 2 files changed, 29 insertions(+), 2 deletions(-)
-
-diff --git sal/osl/unx/file_url.cxx sal/osl/unx/file_url.cxx
-index 2253e8a..53f27b3 100644
---- sal/osl/unx/file_url.cxx
-+++ sal/osl/unx/file_url.cxx
-@@ -692,6 +692,7 @@ oslFileError osl_getAbsoluteFileURL(rtl_uString*  ustrBaseDirURL, rtl_uString* u
- {
-     FileBase::RC  rc;
-     rtl::OUString unresolved_path;    
-+    static char *allow_symlinks = getenv( "SAL_ALLOW_LINKOO_SYMLINKS" );
-     
-     rc = FileBase::getSystemPathFromFileURL(rtl::OUString(ustrRelativeURL), unresolved_path);
-     
-@@ -712,8 +713,33 @@ oslFileError osl_getAbsoluteFileURL(rtl_uString*  ustrBaseDirURL, rtl_uString* u
-         unresolved_path = abs_path;        
-     }
- 
--    rtl::OUString resolved_path;	  
--    rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
-+    rtl::OUString resolved_path;
-+
-+    if (!allow_symlinks)
-+    {
-+        rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
-+    }
-+    else
-+    {
-+        // SAL_ALLOW_LINKOO_SYMLINKS environment variable:
-+        // for linkoo to work, we need to let the symlinks to the libraries untouched
-+        rtl::OUString base;
-+        sal_Int32 last_slash = unresolved_path.lastIndexOf( UNICHAR_SLASH );
-+
-+        if (last_slash >= 0 && last_slash + 1 < unresolved_path.getLength())
-+        {
-+            base = unresolved_path.copy(last_slash+1);
-+            unresolved_path = unresolved_path.copy(0, last_slash);
-+        }
-+
-+        rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
-+
-+        if (base.getLength() > 0)
-+        {
-+            resolved_path += rtl::OUString( UNICHAR_SLASH );
-+            resolved_path += base;
-+        }
-+    }
-         
-     if (FileBase::E_None == rc)
-     {
-diff --git solenv/bin/linkoo solenv/bin/linkoo
-index ee9d745..3284522 100755
---- solenv/bin/linkoo
-+++ solenv/bin/linkoo
-@@ -48,6 +48,7 @@ export STAR_RESOURCEPATH=`pwd`/resource
- export OOO_FORCE_SYSALLOC=1
- export MALLOC_CHECK_=2
- export OOO_DISABLE_RECOVERY=1
-+export SAL_ALLOW_LINKOO_SYMLINKS=1
- ';
- 
- $program_dir = 'program';
--- 
-1.7.0.1
-
commit 6ae5d6503c2e1f7192917d07e0030cc216c9db24
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Aug 24 13:57:31 2010 +0200

    Fix handling of -m in g commit.

diff --git a/bin/g b/bin/g
index 7e5cb3d..d943b16 100755
--- a/bin/g
+++ b/bin/g
@@ -37,21 +37,39 @@ while shift ; do
         #ignore
         :
     elif [ "${PARAM:0:1}" = "-" ] ; then
-        FILES[$FILESNUM]="$1"
-        FILESNUM=$(($FILESNUM+1))
+        if [ "$COMMAND" = "commit" ] ; then
+            # special handling of -m
+            case "$PARAM" in
+                -m)
+                    shift
+                    FILES[$FILESNUM]="--message=$1"
+                    FILESNUM=$(($FILESNUM+1))
+                    ;;
+                -am)
+                    FILES[$FILESNUM]="-a"
+                    FILESNUM=$(($FILESNUM+1))
+                    shift
+                    FILES[$FILESNUM]="--message=$1"
+                    FILESNUM=$(($FILESNUM+1))
+                    ;;
+            esac
+        else
+            FILES[$FILESNUM]="$PARAM"
+            FILESNUM=$(($FILESNUM+1))
+        fi
     else
         if [ "$COMMAND" = "apply" ] ; then
-            grep -qs $'^+ *\t' "$1" && {
-                echo "Patch '$1' introduces tabs in indentation, aborting."
+            grep -qs $'^+ *\t' "$PARAM" && {
+                echo "Patch '$PARAM' introduces tabs in indentation, aborting."
                 echo
                 echo "Please fix the patch (something like s/^\(+ *\)\t/\1    /) and try again."
                 echo
                 exit 1
             }
         fi
-        FILES[$FILESNUM]=`readlink -n -e "$1"`
+        FILES[$FILESNUM]=`readlink -n -e "$PARAM"`
         if [ -z "${FILES[$FILESNUM]}" ] ; then
-            echo "'$1' not found in `pwd`."
+            echo "'$PARAM' not found in `pwd`."
             exit 1
         fi
         FILESNUM=$(($FILESNUM+1))