ooo-build r11395 - in trunk: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Jan 24 09:20:04 2008
New Revision: 11395
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11395&view=rev

Log:
don't patch qadevOOo


Modified:
   trunk/ChangeLog
   trunk/patches/src680/build-java-target-m3.diff
   trunk/patches/src680/build-java-target.diff

Modified: trunk/patches/src680/build-java-target-m3.diff
==============================================================================
--- trunk/patches/src680/build-java-target-m3.diff	(original)
+++ trunk/patches/src680/build-java-target-m3.diff	Thu Jan 24 09:20:04 2008
@@ -438,30 +438,6 @@
 +           <classpath>
 +              <pathelement location="lib/junit.jar"/>
 dummy line to avoid confusing diff-mode
---- qadevOOo/build.xml.old	2006-10-10 21:48:45.000000000 +0200
-+++ qadevOOo/build.xml	2006-10-11 15:58:25.000000000 +0200
-@@ -19,7 +19,9 @@
- 
-   <!-- target for building the runner -->
-   <target name="qadevOOo_runner_build">
--    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}" encoding="utf-8" fork="true">
-+    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}"
-+		includes="**/*.java" debug="${debug}" encoding="utf-8" fork="true"
-+		source="${java.source.ver}" target="${java.target.ver}">
- 		<classpath>
- 		    <pathelement location="${qadevOOo.class}"/>
- 			<fileset dir="${qadevOOo.office_jars}">
-@@ -31,7 +33,9 @@
-   
-   <!-- target for building the tests -->
-   <target name="qadevOOo_tests_build" depends="qadevOOo_runner_build">
--    <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}">
-+    <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}"
-+		includes="**/*.java" debug="${debug}"
-+		source="${java.source.ver}" target="${java.target.ver}">
- 		<classpath>
- 		    <pathelement location="${qadevOOo.class}"/>
- 			<fileset dir="${qadevOOo.office_jars}">
 --- rhino/rhino1_5R4.patch.old	2006-08-17 09:09:37.000000000 +0200
 +++ rhino/rhino1_5R4.patch	2006-10-11 18:54:27.000000000 +0200
 @@ -2731,3 +2731,45 @@

Modified: trunk/patches/src680/build-java-target.diff
==============================================================================
--- trunk/patches/src680/build-java-target.diff	(original)
+++ trunk/patches/src680/build-java-target.diff	Thu Jan 24 09:20:04 2008
@@ -438,30 +438,6 @@
 +           <classpath>
 +              <pathelement location="lib/junit.jar"/>
 dummy line to avoid confusing diff-mode
---- qadevOOo/build.xml.old	2006-10-10 21:48:45.000000000 +0200
-+++ qadevOOo/build.xml	2006-10-11 15:58:25.000000000 +0200
-@@ -19,7 +19,9 @@
- 
-   <!-- target for building the runner -->
-   <target name="qadevOOo_runner_build">
--    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}" encoding="utf-8" fork="true">
-+    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}"
-+		includes="**/*.java" debug="${debug}" encoding="utf-8" fork="true"
-+		source="${java.source.ver}" target="${java.target.ver}">
- 		<classpath>
- 		    <pathelement location="${qadevOOo.class}"/>
- 			<fileset dir="${qadevOOo.office_jars}">
-@@ -31,7 +33,9 @@
-   
-   <!-- target for building the tests -->
-   <target name="qadevOOo_tests_build" depends="qadevOOo_runner_build">
--    <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}">
-+    <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}"
-+		includes="**/*.java" debug="${debug}"
-+		source="${java.source.ver}" target="${java.target.ver}">
- 		<classpath>
- 		    <pathelement location="${qadevOOo.class}"/>
- 			<fileset dir="${qadevOOo.office_jars}">
 --- rhino/rhino1_5R4.patch.old	2006-08-17 09:09:37.000000000 +0200
 +++ rhino/rhino1_5R4.patch	2006-10-11 18:54:27.000000000 +0200
 @@ -2731,3 +2731,45 @@