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

[rengelhard svn gnome org]

Author: rengelhard
Date: Sun Aug 10 01:52:44 2008
New Revision: 13506
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13506&view=rev

Log:
        * patches/dev300/apply,
          patches/dev300/build-java-target-m1.diff,
          patches/dev300/build-java-target.diff: ooo300-m2 support (and
          dev300-m30 part, assuming xsltfilter10 will be in there, too)


Added:
   trunk/patches/dev300/build-java-target-m1.diff
      - copied unchanged from r13494, /trunk/patches/dev300/build-java-target.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	Sun Aug 10 01:52:44 2008
@@ -335,13 +335,14 @@
 [ GCJ ]
 # gij/libgcj paths...
 jvmfwk-gij-paths.diff, rengelha
-# Seems that bug #69026 is back
-gcj-workaround-serializer.diff
 
 # Fix up Javac error, known to happen with gcj, probably happens for other
 # JDKs too
 buildfix-qadevOOo-java-encoding.diff, brosenk
 
+[ GCJ < ooo300-m2 < dev300-m30 ]
+# Seems that bug #69026 is back
+gcj-workaround-serializer.diff
 
 # Fixes that were not accepted up-stream, but are still useful
 [ FixesNotForUpstream ]
@@ -957,7 +958,10 @@
 
 # allow to define java target, so the build is usable with the JVM 1.4
 # even when it is built with JDK 1.5
+[ BuildBits >= dev300-m30 >= ooo300-m2 ]
 build-java-target.diff, pmladek
+[ BuildBits < dev300m30 < ooo300-m2 ]
+build-java-target-m1.diff, pmladek
 
 [ BuildBits ]
 # do not create '.' subdirectories
@@ -1127,11 +1131,12 @@
 sfx2-badscript.diff, i#67976
 
 
-[ BuildBits ]
+[ BuildBits < ooo300-m2 < dev300-m30 ]
 # add automatical detection of serializer.jar into the configure
 # add it to classpath on one more place
 xalan-serializer-jar-more.diff, pmladek
 
+[ BuildBits ]
 # work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392
 svx-customshapes-NOOPTFILES.diff, martink
 

Modified: trunk/patches/dev300/build-java-target.diff
==============================================================================
--- trunk/patches/dev300/build-java-target.diff	(original)
+++ trunk/patches/dev300/build-java-target.diff	Sun Aug 10 01:52:44 2008
@@ -117,11 +117,11 @@
  
  AC_SUBST(JAVA_HOME)
  AC_SUBST(JDK)
+ AC_SUBST(JAVAFLAGS)
 +AC_SUBST(JAVA_SOURCE_VER)
 +AC_SUBST(JAVA_TARGET_VER)
  AC_SUBST(JAVAINTERPRETER)
  AC_SUBST(JAVACOMPILER)
- AC_SUBST(JAVAAOTCOMPILER)
 --- config_office/set_soenv.in.javatarget~	2008-07-07 19:57:41.109846862 +0200
 +++ config_office/set_soenv.in	2008-07-07 20:04:44.665095643 +0200
 @@ -1842,6 +1842,7 @@ ToFile( "DMAKEROOT",         $DMAKEROOT,
@@ -136,11 +136,11 @@
  if ( '@JDK@' ne '' )
  { 
     ToFile( "JDK",             "@JDK@",           "e" );
+    ToFile( "JAVAFLAGS",             "@JAVAFLAGS@",           "e" );
 +   ToFile( "JAVA_SOURCE_VER", "@JAVA_SOURCE_VER@","e" );
 +   ToFile( "JAVA_TARGET_VER", "@JAVA_TARGET_VER@","e" );
     ToFile( "JAVAINTERPRETER", PathFormat("@JAVAINTERPRETER@"), "e" );
     ToFile( "JAVACOMPILER",    PathFormat("@JAVACOMPILER@"), "e" );
-    ToFile( "JAVAAOTCOMPILER", PathFormat("@JAVAAOTCOMPILER@"), "e" );
 --- hsqldb/makefile.mk.javatarget~	2008-05-14 11:31:19.000000000 +0200
 +++ hsqldb/makefile.mk	2008-07-07 20:04:44.674097276 +0200
 @@ -34,18 +34,12 @@ PRJ=.