Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.1
OpenOffice_org-bootstrap
ooo-build-3.0.0.9-buildfix-openjdk-6-no-rhino.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File ooo-build-3.0.0.9-buildfix-openjdk-6-no-rhino.diff of Package OpenOffice_org-bootstrap
--- patches/dev300/buildfix-openjdk-6-no-rhino.diff.old 2008-09-24 21:35:03.000000000 +0200 +++ patches/dev300/buildfix-openjdk-6-no-rhino.diff 2008-12-03 20:24:22.000000000 +0100 @@ -1,41 +1,62 @@ -? 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 @@ +--- rhino/rhino1_5R5.patch.old 2008-12-03 20:22:39.000000000 +0100 ++++ rhino/rhino1_5R5.patch 2008-12-03 20:22:30.000000000 +0100 +@@ -1174,3 +1174,30 @@ 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 @@ ++--- misc/rhino1_5R5/toolsrc/build.xml 2008-12-03 20:20:21.000000000 +0100 +++++ misc/build/rhino1_5R5/toolsrc/build.xml 2008-12-03 20:19:28.000000000 +0100 ++@@ -6,6 +6,16 @@ Requires Ant version 1.2 ++ --> ++ <project name="toolsrc" default="compile" basedir="."> ++ +++ <!-- rhino.jar from OpenJDK breaks build --> +++ <path id="my.bootstrap.classpath"> +++ <fileset dir="${java.home}/"> +++ <include name="jre/lib/*.jar"/> +++ <include name="lib/*.jar"/> +++ <exclude name="jre/lib/rhino.jar"/> +++ <exclude name="lib/rhino.jar"/> +++ </fileset> +++ </path> +++ ++ <target name="properties"> ++ <property name="nest" value=".."/> ++ <property name="build.dir" value="./build"/> ++@@ -32,6 +42,7 @@ Requires Ant version 1.2 + includes="org/**/*.java" + deprecation="on" + debug="${debug}"> -++ <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/> +++ <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/> + </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 @@ +--- scripting/java/build.xml.old.orig 2008-12-03 20:08:19.000000000 +0100 ++++ scripting/java/build.xml 2008-12-03 20:12:57.000000000 +0100 +@@ -85,6 +85,16 @@ + <pathelement path="${jardir}"/> + <pathelement path="${netbeans.install.path}/modules/ext/nb-editor.jar"/> + </path> ++ ++ <!-- rhino.jar from OpenJDK breaks build --> ++ <path id="my.bootstrap.classpath"> ++ <fileset dir="${java.home}/"> ++ <include name="jre/lib/*.jar"/> ++ <include name="lib/*.jar"/> ++ <exclude name="jre/lib/rhino.jar"/> ++ <exclude name="lib/rhino.jar"/> ++ </fileset> ++ </path> + + <!-- ===================== Prepare Directories ========================= --> + <target name="prepare"> +@@ -95,7 +105,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"/> ++ <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/> + </javac> <javac srcdir="Framework/" destdir="${jardir}" includes="**/*.java" classpathref="idlclasspath" debug="${debug}"
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor