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

[strba svn gnome org]

Author: strba
Date: Tue Jan 29 12:07:57 2008
New Revision: 11438
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11438&view=rev

Log:
second iteration of the hsqldb patch

Modified:
   trunk/ChangeLog
   trunk/patches/src680/build-java-target-m3.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	Tue Jan 29 12:07:57 2008
@@ -323,120 +323,120 @@
 +--- misc/build/hsqldb/build/build.xml	2006-11-28 12:37:10.000000000 +0100
 +***************
 +*** 135,141 ****
-+  
-+      <target name="codeswitcher" depends="-prepare"
-+              description="uses +-JDBC2 +-JDBC2 +-JAVA2">
-+!       <javac destdir="classes">
-+           <src path="${src}"/>
-+           <include name="org/hsqldb/util/CodeSwitcher.java"/>
-+         </javac>
++  
++      <target name="codeswitcher" depends="-prepare"
++              description="uses +-JDBC2 +-JDBC2 +-JAVA2">
++!       <javac destdir="classes">
++           <src path="${src}"/>
++           <include name="org/hsqldb/util/CodeSwitcher.java"/>
++         </javac>
 +--- 135,141 ----
-+  
-+      <target name="codeswitcher" depends="-prepare"
-+              description="uses +-JDBC2 +-JDBC2 +-JAVA2">
-+!       <javac destdir="classes" source="${java.source.ver}" target="${java.target.ver}">
-+           <src path="${src}"/>
-+           <include name="org/hsqldb/util/CodeSwitcher.java"/>
-+         </javac>
++  
++      <target name="codeswitcher" depends="-prepare"
++              description="uses +-JDBC2 +-JDBC2 +-JAVA2">
++!       <javac destdir="classes" source="${java.source.ver}" target="${java.target.ver}">
++           <src path="${src}"/>
++           <include name="org/hsqldb/util/CodeSwitcher.java"/>
++         </javac>
 +***************
 +*** 268,273 ****
 +--- 268,275 ----
-+               destdir="classes"
-+                   debug="${build.debug}"
-+                   optimize="${build.optimize}"
-++              source="${java.source.ver}"
-++ 	     target="${java.target.ver}"
-+        >
-+           <include name="org/hsqldb/store/**"/>
-+        </javac>
++               destdir="classes"
++                   debug="${build.debug}"
++                   optimize="${build.optimize}"
+++              source="${java.source.ver}"
+++ 	     target="${java.target.ver}"
++        >
++           <include name="org/hsqldb/store/**"/>
++        </javac>
 +***************
 +*** 279,284 ****
 +--- 281,288 ----
-+               destdir="classes"
-+                   debug="${build.debug}"
-+                   optimize="${build.optimize}"
-++              source="${java.source.ver}"
-++ 	     target="${java.target.ver}"
-+        >
-+           <include name="org/hsqldb/lib/**"/>
-+           <include name="org/hsqldb/lib/java/**"/>
++               destdir="classes"
++                   debug="${build.debug}"
++                   optimize="${build.optimize}"
+++              source="${java.source.ver}"
+++ 	     target="${java.target.ver}"
++        >
++           <include name="org/hsqldb/lib/**"/>
++           <include name="org/hsqldb/lib/java/**"/>
 +***************
 +*** 291,296 ****
 +--- 295,302 ----
-+               destdir="classes"
-+                   debug="${build.debug}"
-+                   optimize="${build.optimize}"
-++              source="${java.source.ver}"
-++ 	     target="${java.target.ver}"
-+         >
-+           <classpath>
-+              <pathelement location="lib/servlet.jar"/>
++               destdir="classes"
++                   debug="${build.debug}"
++                   optimize="${build.optimize}"
+++              source="${java.source.ver}"
+++ 	     target="${java.target.ver}"
++         >
++           <classpath>
++              <pathelement location="lib/servlet.jar"/>
 +***************
 +*** 326,331 ****
 +--- 332,339 ----
-+               destdir="classes"
-+                   debug="${build.debug}"
-+                   optimize="${build.optimize}"
-++              source="${java.source.ver}"
-++ 	     target="${java.target.ver}"
-+         >
-+           <include name="org/hsqldb/jdbc/jdbcBlob.java"/>
-+           <include name="org/hsqldb/jdbc/jdbcClob.java"/>
++               destdir="classes"
++                   debug="${build.debug}"
++                   optimize="${build.optimize}"
+++              source="${java.source.ver}"
+++ 	     target="${java.target.ver}"
++         >
++           <include name="org/hsqldb/jdbc/jdbcBlob.java"/>
++           <include name="org/hsqldb/jdbc/jdbcClob.java"/>
 +***************
 +*** 338,343 ****
 +--- 346,353 ----
-+               destdir="classes"
-+                   debug="${build.debug}"
-+                   optimize="${build.optimize}"
-++              source="${java.source.ver}"
-++ 	     target="${java.target.ver}"
-+         >
-+        <include name="org/hsqldb/jdbc/jdbcDataSource*.java"/>
-+        <include name="org/hsqldb/jdbc/jdbcParameterMetaData.java"/>
++               destdir="classes"
++                   debug="${build.debug}"
++                   optimize="${build.optimize}"
+++              source="${java.source.ver}"
+++ 	     target="${java.target.ver}"
++         >
++        <include name="org/hsqldb/jdbc/jdbcDataSource*.java"/>
++        <include name="org/hsqldb/jdbc/jdbcParameterMetaData.java"/>
 +***************
 +*** 359,364 ****
 +--- 369,376 ----
-+               destdir="classes"
-+               debug="${build.debug}"
-+               optimize="${build.optimize}"
-++              source="${java.source.ver}"
-++ 	     target="${java.target.ver}"
-+               classpath="lib/junit.jar"
-+         >
-+            <include name="org/hsqldb/test/TestJDBCSavepoints.java"/>
++               destdir="classes"
++               debug="${build.debug}"
++               optimize="${build.optimize}"
+++              source="${java.source.ver}"
+++ 	     target="${java.target.ver}"
++               classpath="lib/junit.jar"
++         >
++            <include name="org/hsqldb/test/TestJDBCSavepoints.java"/>
 +***************
 +*** 373,378 ****
 +--- 385,392 ----
-+               destdir="classes"
-+                   debug="${build.debug}"
-+                   optimize="${build.optimize}"
-++              source="${java.source.ver}"
-++ 	     target="${java.target.ver}"
-+        >
-+           <include name="org/hsqldb/util/**"/>
-+           <exclude name="org/hsqldb/util/*Swing.java"/>
++               destdir="classes"
++                   debug="${build.debug}"
++                   optimize="${build.optimize}"
+++              source="${java.source.ver}"
+++ 	     target="${java.target.ver}"
++        >
++           <include name="org/hsqldb/util/**"/>
++           <exclude name="org/hsqldb/util/*Swing.java"/>
 +***************
 +*** 389,394 ****
 +--- 403,410 ----
-+               destdir="classes"
-+                   debug="${build.debug}"
-+                   optimize="${build.optimize}"
-++              source="${java.source.ver}"
-++ 	     target="${java.target.ver}"
-+         >
-+        <include name="org/hsqldb/util/*Swing.java"/>
-+        <include name="org/hsqldb/util/TableSorter.java"/>
++               destdir="classes"
++                   debug="${build.debug}"
++                   optimize="${build.optimize}"
+++              source="${java.source.ver}"
+++ 	     target="${java.target.ver}"
++         >
++        <include name="org/hsqldb/util/*Swing.java"/>
++        <include name="org/hsqldb/util/TableSorter.java"/>
 +***************
 +*** 404,409 ****
 +--- 420,427 ----
-+               destdir="classes"
-+                   debug="${build.debug}"
-+                   optimize="${build.optimize}"
-++              source="${java.source.ver}"
-++ 	     target="${java.target.ver}"
-+           >
-+           <classpath>
-+              <pathelement location="lib/junit.jar"/>
++               destdir="classes"
++                   debug="${build.debug}"
++                   optimize="${build.optimize}"
+++              source="${java.source.ver}"
+++ 	     target="${java.target.ver}"
++           >
++           <classpath>
++              <pathelement location="lib/junit.jar"/>
 dummy line to avoid confusing diff-mode
 --- 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