ooo-build r15351 - in trunk: . bin patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Tue Feb 17 12:31:24 2009
New Revision: 15351
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15351&view=rev

Log:
2009-02-17  Petr Mladek <pmladek suse cz>

	* patches/dev300/build-java-1.4-no-Xbootclasspath.diff:
	* patches/dev300/apply: Sun Java 1.4 does not support -Xbootclasspath;
	  the diff is applied only on old SUSE-distros

	* patches/dev300/build-prebuilt-stax.diff: update for moved configure
	  into the top dir

	* bin/unpack, download.in: update ooo-cli-prebuilt to version 3.1



Added:
   trunk/patches/dev300/build-java-1.4-no-Xbootclasspath.diff
Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/download.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/build-prebuilt-stax.diff

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Feb 17 12:31:24 2009
@@ -275,7 +275,7 @@
 
 # copy in misc Mono related dlls if we need to
 # we can't build them on Unix.
-OOO_CLI_PREBUILT_ARCHIVE=ooo-cli-prebuilt-3.0.tar.bz2
+OOO_CLI_PREBUILT_ARCHIVE=ooo-cli-prebuilt-3.1.tar.bz2
 if test "z$PIECE" = "z"; then
 if test -f "$SRCDIR/$OOO_CLI_PREBUILT_ARCHIVE"; then
     mkdir -p $OOBUILDDIR/external/cli

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Tue Feb 17 12:31:24 2009
@@ -261,7 +261,7 @@
 else
 {
     if ('@ENABLE_MONO@' ne 'FALSE') {
-	push @files, ( 'ooo-cli-prebuilt-3.0.tar.bz2' );
+	push @files, ( 'ooo-cli-prebuilt-3.1.tar.bz2' );
     }
     if ( $download_all ) {
     	push @files, ( "apache-ant-1.7.0-bin.tar.gz" );

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Feb 17 12:31:24 2009
@@ -1126,6 +1126,8 @@
 build-java-1.4-enable.diff, i#12345, pmladek
 # disable optional @Override; can't go upstream
 build-java-1.4-filter.diff, i#12345, pmladek
+# Sun Java 1.4 does not know the -Xbootclasspath option, will not go upstream
+build-java-1.4-no-Xbootclasspath.diff, i#12345, pmladek
 # another fallback to load libhsqldb with JRE 1.4
 connectivity-load-libhsqldb-with-jre-1.4.diff, n#431360, pmladek
 

Added: trunk/patches/dev300/build-java-1.4-no-Xbootclasspath.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/build-java-1.4-no-Xbootclasspath.diff	Tue Feb 17 12:31:24 2009
@@ -0,0 +1,32 @@
+--- scripting/java/build.xml.old	2009-02-12 14:50:55.000000000 +0100
++++ scripting/java/build.xml	2009-02-17 11:18:50.000000000 +0100
+@@ -103,12 +103,10 @@
+     <javac srcdir="com" destdir="${jardir}"
+          includes="**/*.java" classpathref="idlclasspath"
+          debug="${debug}" optimize="${optimize}" deprecation="off">
+-      <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
+     </javac>
+     <javac srcdir="Framework/" destdir="${jardir}"
+          includes="**/*.java" classpathref="idlclasspath" debug="${debug}" 
+          optimize="${optimize}" deprecation="off">
+-     <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
+     </javac>
+   </target>
+ 
+--- rhino/rhino1_5R5.patch.old	2009-02-12 14:52:07.000000000 +0100
++++ rhino/rhino1_5R5.patch	2009-02-17 11:11:36.000000000 +0100
+@@ -181,14 +181,6 @@
+    </target>
+  
+    <target name="compile" depends="properties,get-swing-ex">
+-@@ -68,6 +50,7 @@
+-            includes="org/**/*.java"
+-            deprecation="on"
+-            debug="${debug}">
+-+      <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
+-     </javac>
+-     <copy todir="${nest}/${classes}">
+-       <fileset dir="." includes="org/**/*.properties" />
+ --- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java	2004-03-25 21:54:34.000000000 +0100
+ +++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java	2009-01-17 20:44:22.000000000 +0100
+ @@ -470,15 +470,21 @@

Modified: trunk/patches/dev300/build-prebuilt-stax.diff
==============================================================================
--- trunk/patches/dev300/build-prebuilt-stax.diff	(original)
+++ trunk/patches/dev300/build-prebuilt-stax.diff	Tue Feb 17 12:31:24 2009
@@ -7,7 +7,7 @@
 +dnl Check for building stax
 +dnl ===================================================================
 +AC_MSG_CHECKING([whether to build the stax])
-+if test -f "../external/StAX/jsr173_1.0_api.jar"; then
++if test -f "external/StAX/jsr173_1.0_api.jar"; then
 +   BUILD_STAX=NO
 +   AC_MSG_RESULT([no, will use the prebuilt external/StAX/jsr173_1.0_api.jar])
 +else