diff options
| author | tnut <thierryn1 at hispeed dot ch> | 2010-03-04 07:26:50 +0100 |
|---|---|---|
| committer | tnut <thierryn1 at hispeed dot ch> | 2010-03-04 07:26:50 +0100 |
| commit | e06fa863719e767d4eb3d2035e6718d79952cbcc (patch) | |
| tree | 7be8aa6ddc6370ccefe2586ed1ce72debb93598b /test/openoffice/buildfix-openjdk-6-no-rhino.diff | |
| parent | d1f50a6ce0d3ad4540268c8077fde2c3dd9caacb (diff) | |
| download | nutyx-pakxe-e06fa863719e767d4eb3d2035e6718d79952cbcc.tar.gz nutyx-pakxe-e06fa863719e767d4eb3d2035e6718d79952cbcc.tar.bz2 nutyx-pakxe-e06fa863719e767d4eb3d2035e6718d79952cbcc.tar.xz nutyx-pakxe-e06fa863719e767d4eb3d2035e6718d79952cbcc.zip | |
Maj openoffice#3.2.0-
Diffstat (limited to 'test/openoffice/buildfix-openjdk-6-no-rhino.diff')
| -rwxr-xr-x | test/openoffice/buildfix-openjdk-6-no-rhino.diff | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/test/openoffice/buildfix-openjdk-6-no-rhino.diff b/test/openoffice/buildfix-openjdk-6-no-rhino.diff deleted file mode 100755 index 8aaa9aaeb..000000000 --- a/test/openoffice/buildfix-openjdk-6-no-rhino.diff +++ /dev/null @@ -1,42 +0,0 @@ -? unxlngx6.pro -Index: rhino1_5R5.patch -=================================================================== -RCS file: /cvs/external/rhino/rhino1_5R5.patch,v -retrieving revision 1.3 -diff -u -r1.3 rhino1_5R5.patch ---- rhino/rhino1_5R5.patch 11 Apr 2008 07:03:06 -0000 1.3 -+++ rhino/rhino1_5R5.patch 12 Aug 2008 20:08:16 -0000 -@@ -1174,3 +1174,14 @@ - PermissionCollection pc = Policy.getPolicy().getPermissions(cs); - return new ProtectionDomain(cs, pc); - } -+--- misc/rhino1_5R5/toolsrc/build.xml 2004-03-25 17:54:34.000000000 -0300 -++++ misc/build/rhino1_5R5/toolsrc/build.xml 2008-08-12 16:58:52.000000000 -0 -+va Fri Mar 28 17:24:23 2008 -+@@ -68,6 +32,7 @@ -+ includes="org/**/*.java" -+ deprecation="on" -+ debug="${debug}"> -++ <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/> -+ </javac> -+ <copy todir="${nest}/${classes}"> -+ <fileset dir="." includes="org/**/*.properties" /> -? unxlngx6.pro -Index: java/build.xml -=================================================================== -RCS file: /cvs/framework/scripting/java/build.xml,v -retrieving revision 1.36 -diff -u -r1.36 build.xml ---- scripting/java/build.xml 11 Apr 2008 09:46:13 -0000 1.36 -+++ scripting/java/build.xml 12 Aug 2008 23:20:31 -0000 -@@ -85,7 +85,9 @@ - <target name="compile" depends="prepare"> - <javac srcdir="com" destdir="${jardir}" - includes="**/*.java" classpathref="idlclasspath" -- debug="${debug}" optimize="${optimize}" deprecation="off"/> -+ debug="${debug}" optimize="${optimize}" deprecation="off"> -+ <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/> -+ </javac> - <javac srcdir="Framework/" destdir="${jardir}" - includes="**/*.java" classpathref="idlclasspath" debug="${debug}" - optimize="${optimize}" deprecation="off"> |