ooo-build r13310 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Sat Jul 19 08:05:04 2008
New Revision: 13310
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13310&view=rev

Log:
2008-07-19  Tor Lillqvist  <tml novell com>

	* patches/dev300/build-java-target.diff
	* patches/dev300/codec-patch-without-crs.diff
	* patches/dev300/codec-patch-with-crs.diff: Split out the patch to
	apache-commons/patches/codec.patch into two separate versions, one
	with CRs and the other without.

	* patches/dev300/apply: Use the codec.patch patch with CRs on
	Linux and the one without on Win32.



Added:
   trunk/patches/dev300/codec-patch-with-crs.diff
   trunk/patches/dev300/codec-patch-without-crs.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/build-java-target.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sat Jul 19 08:05:04 2008
@@ -1017,6 +1017,16 @@
 # even when it is built with JDK 1.5
 build-java-target.diff, pmladek
 
+[ LinuxOnly >= dev300-m22 < beb300-m0 ]
+# originally part of build-java-target.diff, but had to split out
+# because of CR problems
+codec-patch-with-crs.diff, pmladek
+
+[ Win32Only >= dev300-m22 < beb300-m0 ]
+# originally part of build-java-target.diff, but had to split out
+# because of CR problems
+codec-patch-without-crs.diff, pmladek
+
 [ BuildBits ]
 # fix the --enable-reportdesign configure check to work
 buildfix-enable-reportdesign-check.diff, i#87518, pmladek

Modified: trunk/patches/dev300/build-java-target.diff
==============================================================================
--- trunk/patches/dev300/build-java-target.diff	(original)
+++ trunk/patches/dev300/build-java-target.diff	Sat Jul 19 08:05:04 2008
@@ -29,25 +29,6 @@
  .ENDIF
  
  .ENDIF # $(SOLAR_JAVA)!= ""
---- apache-commons/patches/codec.patch.javatarget~	2008-02-04 10:02:07.000000000 +0100
-+++ apache-commons/patches/codec.patch	2008-07-07 20:04:44.670095301 +0200
-@@ -1,6 +1,15 @@
- --- misc/build/commons-codec-1.3/build.xml-old	2008-01-31 15:28:58.000000000 +0100
- +++ misc/build/commons-codec-1.3/build.xml	2008-01-31 15:29:21.000000000 +0100
--@@ -90,14 +90,12 @@
-+@@ -54,7 +54,7 @@ limitations under the License.
-+         </copy>
-+     </target>
-+     <target name="compile" depends="static" description="Compile shareable components">
-+-        <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
-++        <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" source="${java.source.ver}" target="${java.target.ver}" optimize="${compile.optimize}">
-+             <classpath refid="compile.classpath"/>
-+         </javac>
-+         <copy todir="${build.home}/classes" filtering="on">
-+@@ -90,14 +90,12 @@ limitations under the License.
-      </target>
-      <target name="dist" depends="compile,javadoc" description="Create binary distribution">
-          <mkdir dir="${dist.home}"/>
 --- apache-commons/patches/httpclient.patch.javatarget~	2008-07-07 20:04:44.672095625 +0200
 +++ apache-commons/patches/httpclient.patch	2008-07-07 20:04:44.672095625 +0200
 @@ -0,0 +1,29 @@

Added: trunk/patches/dev300/codec-patch-with-crs.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/codec-patch-with-crs.diff	Sat Jul 19 08:05:04 2008
@@ -0,0 +1,19 @@
+--- apache-commons/patches/codec.patch.javatarget~	2008-02-04 10:02:07.000000000 +0100
++++ apache-commons/patches/codec.patch	2008-07-07 20:04:44.670095301 +0200
+@@ -1,6 +1,15 @@
+ --- misc/build/commons-codec-1.3/build.xml-old	2008-01-31 15:28:58.000000000 +0100
+ +++ misc/build/commons-codec-1.3/build.xml	2008-01-31 15:29:21.000000000 +0100
+-@@ -90,14 +90,12 @@
++@@ -54,7 +54,7 @@ limitations under the License.
++         </copy>
++     </target>
++     <target name="compile" depends="static" description="Compile shareable components">
++-        <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
+++        <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" source="${java.source.ver}" target="${java.target.ver}" optimize="${compile.optimize}">
++             <classpath refid="compile.classpath"/>
++         </javac>
++         <copy todir="${build.home}/classes" filtering="on">
++@@ -90,14 +90,12 @@ limitations under the License.
+      </target>
+      <target name="dist" depends="compile,javadoc" description="Create binary distribution">
+          <mkdir dir="${dist.home}"/>

Added: trunk/patches/dev300/codec-patch-without-crs.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/codec-patch-without-crs.diff	Sat Jul 19 08:05:04 2008
@@ -0,0 +1,19 @@
+--- apache-commons/patches/codec.patch.javatarget~	2008-02-04 10:02:07.000000000 +0100
++++ apache-commons/patches/codec.patch	2008-07-07 20:04:44.670095301 +0200
+@@ -1,6 +1,15 @@
+ --- misc/build/commons-codec-1.3/build.xml-old	2008-01-31 15:28:58.000000000 +0100
+ +++ misc/build/commons-codec-1.3/build.xml	2008-01-31 15:29:21.000000000 +0100
+-@@ -90,14 +90,12 @@
++@@ -54,7 +54,7 @@ limitations under the License.
++         </copy>
++     </target>
++     <target name="compile" depends="static" description="Compile shareable components">
++-        <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
+++        <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" source="${java.source.ver}" target="${java.target.ver}" optimize="${compile.optimize}">
++             <classpath refid="compile.classpath"/>
++         </javac>
++         <copy todir="${build.home}/classes" filtering="on">
++@@ -90,14 +90,12 @@ limitations under the License.
+      </target>
+      <target name="dist" depends="compile,javadoc" description="Create binary distribution">
+          <mkdir dir="${dist.home}"/>