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

[strba svn gnome org]

Author: strba
Date: Wed Jan 23 16:15:32 2008
New Revision: 11380
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11380&view=rev

Log:
make the build-java-target.diff apply everwhere but in hsqldb

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

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Wed Jan 23 16:15:32 2008
@@ -892,7 +892,7 @@
 
 # allow to define java target, so the build is usable with the JVM 1.4
 # even when it is built with JDK 1.5
-#FIXME src680: build-java-target.diff, pmladek
+build-java-target.diff, pmladek
 
 # don't include asm/sigcontext.h, see Debian Bug #442418
 buildfix-sal-system.h-no-asm-sigcontext.h.diff

Modified: trunk/patches/src680/build-java-target.diff
==============================================================================
--- trunk/patches/src680/build-java-target.diff	(original)
+++ trunk/patches/src680/build-java-target.diff	Wed Jan 23 16:15:32 2008
@@ -91,7 +91,7 @@
  AC_SUBST(JAVAAOTCOMPILER)
 --- config_office/set_soenv.in.old	2006-10-11 22:21:28.000000000 +0200
 +++ config_office/set_soenv.in	2006-10-11 22:21:34.000000000 +0200
-@@ -1694,6 +1694,7 @@
+@@ -1872,6 +1872,7 @@
  if ( $JDK ne "gcj" ) {
     ToFile( "CLASSPATH",         $CLASSPATH,         "e" );
     ToFile( "XCLASSPATH",        $XCLASSPATH,        "e" );
@@ -99,15 +99,15 @@
  }
  else {
     ToFile( "JAVACISGCJ",       '@JAVACISGCJ@',      "e" );
-@@ -1702,6 +1703,8 @@
+@@ -1882,6 +1883,8 @@
  if ( '@JDK@' ne '' )
  { 
     ToFile( "JDK",             "@JDK@",           "e" );
 +   ToFile( "JAVA_SOURCE_VER", "@JAVA_SOURCE_VER@","e" );
 +   ToFile( "JAVA_TARGET_VER", "@JAVA_TARGET_VER@","e" );
-    ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" );
-    ToFile( "JAVACOMPILER",    "@JAVACOMPILER@",  "e" );
-    ToFile( "JAVAAOTCOMPILER", "@JAVAAOTCOMPILER@","e" );
+    ToFile( "JAVAINTERPRETER", PathFormat("@JAVAINTERPRETER@"), "e" );
+    ToFile( "JAVACOMPILER",    PathFormat("@JAVACOMPILER@"), "e" );
+    ToFile( "JAVAAOTCOMPILER", PathFormat("@JAVAAOTCOMPILER@"), "e" );
 --- solenv/inc/antsettings.mk.old	2006-07-05 22:59:17.000000000 +0200
 +++ solenv/inc/antsettings.mk	2006-10-11 15:07:05.000000000 +0200
 @@ -53,6 +53,18 @@
@@ -222,8 +222,8 @@
  
  TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
 @@ -57,28 +55,23 @@
-         src/org/hsqldb/Expression.java
- PATCH_FILE_NAME=hsqldb_1_8_0
+ 
+ #PATCH_FILE_NAME=hsqldb_1_8_0
  
 +ADDITIONAL_FILES=makefile.mk
 +
@@ -258,9 +258,9 @@
 +        @echo java disabled
 +.ENDIF
 dummy line to avoid confusing diff-mode
---- hsqldb/hsqldb_1_8_0-old	2007-11-04 00:49:08.000000000 +0100
-+++ hsqldb/hsqldb_1_8_0	2007-11-04 00:49:18.000000000 +0100
-@@ -23077,3 +23077,176 @@
+#--- hsqldb/hsqldb_1_8_0-old	2007-11-04 00:49:08.000000000 +0100
+#+++ hsqldb/hsqldb_1_8_0	2007-11-04 00:49:18.000000000 +0100
+#@@ -23077,3 +23077,176 @@
  +  
  +          String msg;
  +  
@@ -446,7 +446,7 @@
  
    <!-- target for building the runner -->
    <target name="qadevOOo_runner_build">
--    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" encoding="utf-8" fork="true">
+-    <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}">
@@ -457,7 +457,7 @@
    
    <!-- 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}">
+-    <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}">