[Libreoffice-commits] .: 6 commits -

[Jan Holesovsky]

 0 files changed

New commits:
commit 7f68a802e78a96cc619f2f0de837668388a12ed9
Merge: ce421e6... 6713b11...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri May 27 21:18:05 2011 +0200

    Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-extern

commit ce421e6db0ae636dded30584c0722a3fa0e6fb1e
Merge: 6042d4a... ee795d2...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri May 27 20:54:44 2011 +0200

    Merge remote-tracking branch 'origin/integration/dev300_m106'
    
    Conflicts:
    	rhino/makefile.mk

commit ee795d21a843b573333d9fd1ed85de985e55fd94
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Apr 19 18:58:52 2011 +0200

    Version 3.3.99.2, tag libreoffice-3.3.99.2 (3.4.0-beta2)
commit be8507166f2c99be81a035245d7e8da04ad66639
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 11 10:27:21 2011 +0300

    chmod -x

diff --git a/rhino/README b/rhino/README
old mode 100755
new mode 100644
diff --git a/rhino/makefile.mk b/rhino/makefile.mk
old mode 100755
new mode 100644
commit df4637f4348e0b771266fd562b6e573a6f144e5f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 11 10:26:49 2011 +0300

    Fix rhino build on Windows

diff --git a/rhino/makefile.mk b/rhino/makefile.mk
index 094e110..d7888fc 100755
--- a/rhino/makefile.mk
+++ b/rhino/makefile.mk
@@ -49,12 +49,18 @@ PATCH_FILES=rhino1_5R5.patch \
     rhino1_5R5-find_swing.patch \
     rhino1_5R5-updateToolTip.patch
 
+.IF "$(OS)"=="WNT"
+FIXED_TARFILE_LOCATION=`cygpath -m -s "$(TARFILE_LOCATION)"`
+.ELSE
+FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION)
+.ENDIF
+
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
 BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar
+BUILD_ACTION=TARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" $(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar
 .ENDIF
 
 # --- Targets ------------------------------------------------------
commit 0260b870d124c9dbc229f303286d7623769f9a83
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Apr 11 17:52:58 2011 +0200

    Version 3.3.99.1, tag libreoffice-3.3.99.1 (3.4.0-beta1)