[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - rhino/makefile.mk rhino/README

[Tor Lillqvist]

 rhino/makefile.mk |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
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 ------------------------------------------------------