ooo-build r13670 - in trunk: . bin distro-configs patches/dev300 po
- From: pmladek svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13670 - in trunk: . bin distro-configs patches/dev300 po
- Date: Mon, 25 Aug 2008 18:41:40 +0000 (UTC)
Author: pmladek
Date: Mon Aug 25 18:41:40 2008
New Revision: 13670
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13670&view=rev
Log:
2008-08-25 Petr Mladek <pmladek suse cz>
* patches/dev300/build-java-target.diff:
* patches/dev300/build-java-target-swext.diff: needed again for
openSUSE-11.1; update to use the global properties
ant.build.javac.source and ant.build.javac.target (ant-1.7 feature)
=> the patch is cleaner => try to get it upstream (i#93115)
* patches/dev300/build-java-target-codec-patch-without-crs.diff:
* patches/dev300/build-java-target-codec-patch-with-crs.diff:
* patches/dev300/build-java-target-m1.diff: bin obsolete pieces
* patches/dev300/build-ibm-java-enable.diff: enable build with
IBM Java 1.6.0 (i#93114)
* patches/dev300/bean-ibm-java.diff: fix build with IBM Java 1.6.0
in the bean module (i#93113)
* bin/unpack, patches/dev300/build-prebuilt-stax.diff: allow to use the
prebuilt jsr173_1.0_api.jar (i#93116)
* patches/dev300/apply: update for all the above changes
* distro-configs/SUSE-10.3.conf.in:
* distro-configs/SUSE-10.2.conf.in: add --without-system-poppler;
there is too old available :-(
* distro-configs/SUSE-10.1.conf.in: add --without-system-poppler
(there was too lodl available); bin the system saxon again
(it was not available on SLED10 DVDs at all)
* bin/po2sdf, po/Makefile.am: mention the upstream issue:
http://bugs.locamotion.org/show_bug.cgi?id=487";
Added:
trunk/patches/dev300/bean-ibm-java.diff
trunk/patches/dev300/build-ibm-java-enable.diff
trunk/patches/dev300/build-prebuilt-stax.diff
Removed:
trunk/patches/dev300/build-java-target-codec-patch-with-crs.diff
trunk/patches/dev300/build-java-target-codec-patch-without-crs.diff
trunk/patches/dev300/build-java-target-m1.diff
Modified:
trunk/ChangeLog
trunk/bin/po2sdf
trunk/bin/unpack
trunk/distro-configs/SUSE-10.1.conf.in
trunk/distro-configs/SUSE-10.2.conf.in
trunk/distro-configs/SUSE-10.3.conf.in
trunk/patches/dev300/apply
trunk/patches/dev300/build-java-target-swext.diff
trunk/patches/dev300/build-java-target.diff
trunk/po/Makefile.am
Modified: trunk/bin/po2sdf
==============================================================================
--- trunk/bin/po2sdf (original)
+++ trunk/bin/po2sdf Mon Aug 25 18:41:40 2008
@@ -13,6 +13,10 @@
echo " the .pot file"
echo " po_file: input .po file"
echo " sdf_file: output .sdf file"
+ echo
+ echo "IMPORTANT: this is only a temporary solution until"
+ echo " http://bugs.locamotion.org/show_bug.cgi?id=487";
+ echo " is fixed"
}
if test -z "$1" -o "$1" = "--help" ; then
@@ -34,8 +38,8 @@
exit 1;
fi
-# Crazy hack
-#
+# Crazy hack until http://bugs.locamotion.org/show_bug.cgi?id=487"; is fixed"
+
# translate-toolkit-1.1.1 is not able to convert it in
# the--multifile=onefile format, so we need to split the .po file
# to get the --multifile=toplevel format
Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack (original)
+++ trunk/bin/unpack Mon Aug 25 18:41:40 2008
@@ -250,6 +250,16 @@
fi
fi
+# copy in the prebuilt jsr173_1.0_api.jar if available
+# allows to build with JDK 1.4
+JSR_API_JAR=jsr173_1.0_api.jar
+if test "z$PIECE" = "z"; then
+if test -f "$SRCDIR/$JSR_API_JAR"; then
+ mkdir -p $OOBUILDDIR/external/StAX
+ $GNUCP -af $SRCDIR/$JSR_API_JAR $OOBUILDDIR/external/StAX
+fi
+fi
+
# copy in misc Mono related dlls if we need to
# we can't build them on Unix.
CLI_TYPES=cli_uretypes.dll
Modified: trunk/distro-configs/SUSE-10.1.conf.in
==============================================================================
--- trunk/distro-configs/SUSE-10.1.conf.in (original)
+++ trunk/distro-configs/SUSE-10.1.conf.in Mon Aug 25 18:41:40 2008
@@ -19,7 +19,6 @@
--with-system-mozilla=xulrunner
--with-system-neon
--with-system-odbc-headers
---with-system-saxon
---with-saxon-jar=/usr/share/saxon/saxon.jar
--with-xulrunner
--without-myspell-dicts
+--without-system-poppler
Modified: trunk/distro-configs/SUSE-10.2.conf.in
==============================================================================
--- trunk/distro-configs/SUSE-10.2.conf.in (original)
+++ trunk/distro-configs/SUSE-10.2.conf.in Mon Aug 25 18:41:40 2008
@@ -27,3 +27,4 @@
--with-system-xml-apis
--with-xulrunner
--without-myspell-dicts
+--without-system-poppler
Modified: trunk/distro-configs/SUSE-10.3.conf.in
==============================================================================
--- trunk/distro-configs/SUSE-10.3.conf.in (original)
+++ trunk/distro-configs/SUSE-10.3.conf.in Mon Aug 25 18:41:40 2008
@@ -31,3 +31,4 @@
--with-system-xrender-headers
--with-xulrunner
--without-myspell-dicts
+--without-system-poppler
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Mon Aug 25 18:41:40 2008
@@ -364,18 +364,7 @@
[ swextFixes ]
wiki-publisher-no-license.diff
-
-#build-java-target-swext.diff
-
-[ Linux32OnlySwextFixes ]
-# originally part of build-java-target.diff, but had to split out
-# because of CR problems
-# build-java-target-codec-patch-with-crs.diff, pmladek
-
-[ Win32OnlySwextFixes ]
-# originally part of build-java-target.diff, but had to split out
-# because of CR problems
-# build-java-target-codec-patch-without-crs.diff, pmladek
+build-java-target-swext.diff, i#93115, pmladek
[ NovellOnlySwextFixes ]
# allow build with ant-1.6
@@ -387,7 +376,6 @@
# IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
build-ant-1.6.diff, i#90830, pmladek
-
# FIXME: Was fixed in m1 as masterfix. I'd bet it will be in m30, too, but...
[ Fixes >= dev300-m30 >= ooo300-m1 ]
# more intelligent nsplugin seeking
@@ -980,14 +968,10 @@
[ BuildBits ]
novell-win32-agfa-monotype-fonts.diff, tml
-# 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
+# allow to define java target, so the build is usable with the JVM 1.5
+# even when it is built with JDK 1.6
+build-java-target.diff, i#93115, pmladek
-[ BuildBits ]
# do not create '.' subdirectories
# omit './' in paths
solenv-installer-cleaner-paths.diff, pmladek
@@ -1003,6 +987,15 @@
# even worse, the direcotry had the rights 444
installer-get-path-correctly.diff, pmladek
+# enable build with IBM Java 1.6.0
+build-ibm-java-enable.diff, i#93114, pmladek
+
+# fixed build with IBM Java 1.6.0
+bean-ibm-java.diff, i#93113, pmladek
+
+# allow to use the prebuilt jsr173_1.0_api.jar
+build-prebuilt-stax.diff, i#93116, pmladek
+
[ Gcc43 ]
# gcc 4.3 requires #include <string.h> for strdup, memcmp etc.
buildfix-bridges-strdup-header.diff, i#89762, kohei
Added: trunk/patches/dev300/bean-ibm-java.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/bean-ibm-java.diff Mon Aug 25 18:41:40 2008
@@ -0,0 +1,30 @@
+--- bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c.old 2008-04-10 18:21:42.000000000 +0200
++++ bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c 2008-08-22 19:39:59.469966813 +0200
+@@ -33,6 +33,12 @@
+ #include <X11/Intrinsic.h>
+
+ #include "jni.h"
++
++// Workaround for problematic IBM JDK 1.6.0 on ppc
++#ifndef _JNI_IMPORT_OR_EXPORT_
++#define _JNI_IMPORT_OR_EXPORT_
++#endif
++
+ #include "jawt_md.h"
+ #include "jawt.h"
+
+--- bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c.old 2008-04-10 18:21:58.000000000 +0200
++++ bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c 2008-08-22 19:40:17.120161386 +0200
+@@ -33,6 +33,12 @@
+ #include <X11/Intrinsic.h>
+
+ #include "jni.h"
++
++// Workaround for problematic IBM JDK 1.6.0 on ppc
++#ifndef _JNI_IMPORT_OR_EXPORT_
++#define _JNI_IMPORT_OR_EXPORT_
++#endif
++
+ #include "jawt_md.h"
+ #include "jawt.h"
+
Added: trunk/patches/dev300/build-ibm-java-enable.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/build-ibm-java-enable.diff Mon Aug 25 18:41:40 2008
@@ -0,0 +1,72 @@
+--- config_office/configure.in.old 2008-08-21 14:12:56.000000000 +0200
++++ config_office/configure.in 2008-08-21 14:32:41.747947642 +0200
+@@ -2791,25 +2791,24 @@ if test "$SOLAR_JAVA" != ""; then
+ # JAVA_HOME=$with_jdk_home
+ #
+ elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "IBM"` -gt 0; then
+- AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
+-# JDK=ibm
+-#
+-# dnl IBM JDK specific tests
+-# _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
+-# _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
+-#
+-# if test "$_jdk_ver" -lt 10301; then
+-# AC_MSG_ERROR([IBM JDK is too old, you need at least 1.3.1])
+-# fi
+-#
+-# AC_MSG_RESULT([checked (IBM JDK $_jdk)])
+-#
+-# if test "$with_jdk_home" = ""; then
+-# AC_MSG_ERROR([In order to successfully build OpenOffice.org using the IBM JDK,
+-#you must use the "--with-jdk-home" configure option explicitly])
+-# fi
+-#
+-# JAVA_HOME=$with_jdk_home
++ JDK=ibm
++
++ dnl IBM JDK specific tests
++ _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
++ _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
++
++ if test "$_jdk_ver" -lt 10600; then
++ AC_MSG_ERROR([IBM JDK is too old, you need at least 1.6])
++ fi
++
++ AC_MSG_RESULT([checked (IBM JDK $_jdk)])
++
++ if test "$with_jdk_home" = ""; then
++ AC_MSG_ERROR([In order to successfully build OpenOffice.org using the IBM JDK,
++you must use the "--with-jdk-home" configure option explicitly])
++ fi
++
++ JAVA_HOME=$with_jdk_home
+
+ else
+ JDK=sun
+--- config_office/set_soenv.in.old 2008-08-22 10:33:51.000000000 +0200
++++ config_office/set_soenv.in 2008-08-22 20:41:23.990263078 +0200
+@@ -473,17 +473,17 @@ elsif ( $platform =~ m/linux/ )
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; }
+ elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
+- { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."bin";
+- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
+- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."bin";
+- $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."xawt";
++ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
++ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
++ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
++ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
+ }
+ }
+
+ $CPU = "P";
+
+-# the "standard" ppc j2sdk is IBMJava2-ppc-142
+- if ( $JDK ne "gcj" ) {
++ # fallback
++ if ( "$JRELIBDIR" eq "" ) {
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."bin";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."bin";
Modified: trunk/patches/dev300/build-java-target-swext.diff
==============================================================================
--- trunk/patches/dev300/build-java-target-swext.diff (original)
+++ trunk/patches/dev300/build-java-target-swext.diff Mon Aug 25 18:41:40 2008
@@ -1,123 +1,37 @@
---- apache-commons/java/codec/makefile.mk.javatarget~ 2008-04-11 13:13:47.000000000 +0200
-+++ apache-commons/java/codec/makefile.mk 2008-07-07 20:04:44.670095301 +0200
+--- apache-commons/java/codec/makefile.mk.old 2008-07-17 15:39:27.000000000 +0200
++++ apache-commons/java/codec/makefile.mk 2008-08-25 16:28:13.000000000 +0200
@@ -61,7 +61,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-+BUILD_ACTION=$(ANT) $(ANT_JAVA_VER_FLAGS) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
++BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
---- apache-commons/java/httpclient/makefile.mk.javatarget~ 2008-04-11 13:14:05.000000000 +0200
-+++ apache-commons/java/httpclient/makefile.mk 2008-07-07 20:04:44.671097733 +0200
+--- apache-commons/java/httpclient/makefile.mk.old 2008-07-17 15:39:42.000000000 +0200
++++ apache-commons/java/httpclient/makefile.mk 2008-08-25 16:30:51.000000000 +0200
@@ -64,7 +64,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
-+BUILD_ACTION=$(ANT) $(ANT_JAVA_VER_FLAGS) -Dbuild.label="build-$(RSCREVISION)" -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
++BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) dist
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
---- 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 @@
-+--- misc/build/commons-httpclient-3.1/build.xml.old 2007-08-18 11:02:14.000000000 +0200
-++++ misc/build/commons-httpclient-3.1/build.xml 2008-07-02 15:51:48.000000000 +0200
-+@@ -181,6 +181,8 @@
-+ 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>
-+@@ -188,6 +190,8 @@
-+ destdir ="${build.home}/examples"
-+ debug ="${compile.debug}"
-+ deprecation ="${compile.deprecation}"
-++ source ="${java.source.ver}"
-++ target ="${java.target.ver}"
-+ optimize ="${compile.optimize}">
-+ <classpath refid="compile.classpath"/>
-+ </javac>
-+@@ -199,6 +203,8 @@
-+ destdir ="${build.home}/tests"
-+ debug ="${compile.debug}"
-+ deprecation ="${compile.deprecation}"
-++ source ="${java.source.ver}"
-++ target ="${java.target.ver}"
-+ optimize ="${compile.optimize}">
-+ <classpath refid="test.classpath"/>
-+ </javac>
---- tomcat/makefile.mk.javatarget~ 2008-06-24 12:13:43.000000000 +0200
-+++ tomcat/makefile.mk 2008-07-07 20:04:44.688096262 +0200
-@@ -52,7 +52,7 @@ ADDITIONAL_FILES = jakarta-servletapi-5/
+--- tomcat/makefile.mk.old 2008-06-24 12:13:43.000000000 +0200
++++ tomcat/makefile.mk 2008-08-25 16:21:06.000000000 +0200
+@@ -52,7 +52,12 @@ ADDITIONAL_FILES = jakarta-servletapi-5/
PATCH_FILE_NAME=tomcat.patch
BUILD_DIR=jakarta-servletapi-5
--BUILD_ACTION=$(ANT)
-+BUILD_ACTION=$(ANT) $(ANT_JAVA_VER_FLAGS)
++
++.IF "$(JAVACISGCJ)"=="yes"
+ BUILD_ACTION=$(ANT)
++.ELSE
++BUILD_ACTION=$(ANT) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER)
++.ENDIF
# --- Targets ------------------------------------------------------
---- tomcat/tomcat.patch.javatarget~ 2008-06-24 12:14:12.000000000 +0200
-+++ tomcat/tomcat.patch 2008-07-07 20:06:21.247846314 +0200
-@@ -33,3 +33,55 @@
- + </target>
- +
- +</project>
-+--- misc/build/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/build.xml.old 2004-11-24 17:54:57.000000000 +0100
-++++ misc/build/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/build.xml 2008-07-02 16:03:57.000000000 +0200
-+@@ -69,6 +69,7 @@
-+ <!-- Java classes -->
-+ <javac srcdir="src/share" destdir="${jsp-api.build}/classes"
-+ debug="${compile.debug}" deprecation="${compile.deprecation}"
-++ source="${java.source.ver}" target="${java.target.ver}"
-+ optimize="${compile.optimize}"
-+ classpath="${servlet-api.jar}" />
-+
-+@@ -112,6 +113,7 @@
-+ <javac srcdir="src/ant" destdir="${jsp-api.build}/ant"
-+ debug="${compile.debug}" deprecation="${compile.deprecation}"
-+ optimize="${compile.optimize}"
-++ source="${java.source.ver}" target="${java.target.ver}"
-+ classpath="${ant.home}/lib/ant.jar" />
-+ <taskdef name="txt2html" classname="task.Txt2Html"
-+ classpath="${jsp-api.build}/ant" />
-+@@ -202,6 +204,7 @@
-+ <javac srcdir="examples/WEB-INF/classes"
-+ destdir="${jsp-api.build}/examples/WEB-INF/classes"
-+ debug="${compile.debug}" deprecation="${compile.deprecation}"
-++ source="${java.source.ver}" target="${java.target.ver}"
-+ optimize="${compile.optimize}"
-+ excludes="**/CVS/**">
-+ <classpath refid="examples.classpath" />
-+@@ -210,6 +213,7 @@
-+ <javac srcdir="examples/plugin/applet"
-+ destdir="${jsp-api.build}/examples/plugin/applet"
-+ debug="${compile.debug}" deprecation="${compile.deprecation}"
-++ source="${java.source.ver}" target="${java.target.ver}"
-+ optimize="${compile.optimize}"
-+ excludes="**/CVS/**">
-+ <classpath refid="examples.classpath" />
-+--- misc/build/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr154/build.xml.old 2004-11-24 17:55:01.000000000 +0100
-++++ misc/build/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr154/build.xml 2008-07-02 16:10:05.000000000 +0200
-+@@ -64,6 +64,7 @@
-+ <!-- Java classes -->
-+ <javac srcdir="src/share" destdir="${servlet-api.build}/classes"
-+ debug="${compile.debug}" deprecation="${compile.deprecation}"
-++ source="${java.source.ver}" target="${java.target.ver}"
-+ optimize="${compile.optimize}"/>
-+
-+ <!-- Associated property files -->
-+@@ -110,6 +111,7 @@
-+ <javac srcdir="examples/WEB-INF/classes"
-+ destdir="${servlet-api.build}/examples/WEB-INF/classes"
-+ debug="${compile.debug}" deprecation="${compile.deprecation}"
-++ source="${java.source.ver}" target="${java.target.ver}"
-+ optimize="${compile.optimize}"
-+ excludes="**/CVS/**">
-+ <classpath refid="examples.classpath" />
Modified: trunk/patches/dev300/build-java-target.diff
==============================================================================
--- trunk/patches/dev300/build-java-target.diff (original)
+++ trunk/patches/dev300/build-java-target.diff Mon Aug 25 18:41:40 2008
@@ -1,35 +1,3 @@
---- beanshell/bsh-2.0b1-src.patch.javatarget~ 2008-04-11 09:44:49.000000000 +0200
-+++ beanshell/bsh-2.0b1-src.patch 2008-07-07 20:04:44.673096241 +0200
-@@ -19,16 +19,25 @@
- <!-- Uncomment to build without the ASM class generator code.
- <property name="exclude-classgen"
- value="bsh/org/objectweb/asm/**,bsh/ClassGeneratorImpl.java,bsh/ClassGeneratorUtil.java,bsh/DelayedEvalBshMethod.java"/>
--@@ -80,6 +83,9 @@
-- <property name="exclude-servlet"
-+@@ -81,6 +84,9 @@
- value="bsh/servlet/*"/>
- -->
--+
-+
- + <property name="exclude-servlet"
- + value="bsh/servlet/*"/>
--
-++
- <!-- Legacy excludes. Comment this *out* to build these legacy items -->
- <property name="legacy-excludes"
-+ value="bsh/JThis.java"/>
-+@@ -165,6 +171,8 @@
-+ deprecation="${deprecation}"
-+ optimize="on"
-+ debug="off"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
-+ includes="**/*.java"
-+ excludes="${excludes},**/bak/**"
-+ >
- --- misc/BeanShell/makefile.mk Fri Mar 28 15:56:40 2008
- +++ misc/build/BeanShell/makefile.mk Fri Mar 28 15:56:06 2008
- @@ -1 +1,39 @@
--- config_office/configure.in.javatarget~ 2008-07-07 19:58:06.108847292 +0200
+++ config_office/configure.in 2008-07-07 20:04:44.662095262 +0200
@@ -559,6 +559,17 @@ AC_ARG_WITH(java,
@@ -141,647 +109,8 @@
+ ToFile( "JAVA_TARGET_VER", "@JAVA_TARGET_VER@","e" );
ToFile( "JAVAINTERPRETER", PathFormat("@JAVAINTERPRETER@"), "e" );
ToFile( "JAVACOMPILER", PathFormat("@JAVACOMPILER@"), "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=.
- PRJNAME=hsqldb
- TARGET=so_hsqldb
-
-+.IF "$(SOLAR_JAVA)" != ""
- # --- Settings -----------------------------------------------------
-
- .INCLUDE : settings.mk
--
--# override buildfile
--ANT_BUILDFILE=build$/build.xml
--
--.INCLUDE : antsettings.mk
--
- .INCLUDE : version.mk
-
--.IF "$(SOLAR_JAVA)" != ""
- # --- Files --------------------------------------------------------
-
- TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
-@@ -56,28 +50,24 @@ CONVERTFILES=build$/build.xml
-
- PATCH_FILE_NAME=patches$/accumulated_patches.patch
-
-+ADDITIONAL_FILES=makefile.mk
-+
- # ADDITIONAL_FILES= src$/org$/hsqldb$/Collation.java \
- # src$/org$/hsqldb$/TxManager.java \
- # src$/org$/hsqldb$/lib$/LongKeyIntValueHashMap.java \
- # src$/org$/hsqldb$/persist$/ScaledRAFileInJar.java \
- # src$/org$/hsqldb$/test$/TestCollation.java
-
--.IF "$(JAVACISGCJ)"=="yes"
--JAVA_HOME=
--.EXPORT : JAVA_HOME
--BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
--.ELSE
--BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
--.ENDIF
--
--.ENDIF # $(SOLAR_JAVA)!= ""
-+BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-
- # --- Targets ------------------------------------------------------
-
- .INCLUDE : set_ext.mk
- .INCLUDE : target.mk
-
--.IF "$(SOLAR_JAVA)" != ""
- .INCLUDE : tg_ext.mk
--.ENDIF
-
-+.ELSE
-+ all:
-+ @echo java disabled
-+.ENDIF
---- hsqldb/patches/accumulated_patches.patch.javatarget~ 2008-05-14 11:31:32.000000000 +0200
-+++ hsqldb/patches/accumulated_patches.patch 2008-07-07 20:04:44.676095644 +0200
-@@ -1315,3 +1315,176 @@ Files misc/hsqldb/lib/hsqldb.jar and mis
-
- return false;
- }
-+diff -crN misc/hsqldb/makefile.mk misc/build/hsqldb/makefile.mk
-+*** misc/hsqldb/makefile.mk 2006-11-28 12:45:49.000000000 +0100
-+--- misc/build/hsqldb/makefile.mk 2006-11-28 12:31:12.000000000 +0100
-+***************
-+*** 1 ****
-+! dummy
-+--- 1,47 ----
-+! #*************************************************************************
-+! #
-+! # OpenOffice.org - a multi-platform office productivity suite
-+! #
-+! # $RCSfile$
-+! #
-+! # $Revision$
-+! #
-+! # last change: $Author$ $Date$
-+! #
-+! # The Contents of this file are made available subject to
-+! # the terms of GNU Lesser General Public License Version 2.1.
-+! #
-+! #
-+! # GNU Lesser General Public License Version 2.1
-+! # =============================================
-+! # Copyright 2005 by Sun Microsystems, Inc.
-+! # 901 San Antonio Road, Palo Alto, CA 94303, USA
-+! #
-+! # This library is free software; you can redistribute it and/or
-+! # modify it under the terms of the GNU Lesser General Public
-+! # License version 2.1, as published by the Free Software Foundation.
-+! #
-+! # This library is distributed in the hope that it will be useful,
-+! # but WITHOUT ANY WARRANTY; without even the implied warranty of
-+! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+! # Lesser General Public License for more details.
-+! #
-+! # You should have received a copy of the GNU Lesser General Public
-+! # License along with this library; if not, write to the Free Software
-+! # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+! # MA 02111-1307 USA
-+! #
-+! #*************************************************************************
-+!
-+! PRJ=..$/..$/..$/..
-+! PRJNAME=so_hsqldb
-+! TARGET=so_hsqldb
-+!
-+! # buildfile is in a subdirectory
-+! ANT_BUILDFILE=build$/build.xml
-+!
-+! .INCLUDE : ant.mk
-+!
-+! ANT_FLAGS+=-Dbuild.label="build-$(RSCREVISION)" jar
-+!
-+! ALLTAR : ANTBUILD
-+diff -crN misc/hsqldb/build/build.xml misc/build/hsqldb/build/build.xml
-+*** misc/hsqldb/build/build.xml.orig 2007-10-22 16:17:31.000000000 +0200
-+--- misc/build/hsqldb/build/build.xml 2008-01-29 12:10:02.000000000 +0100
-+***************
-+*** 132,138 ****
-+
-+ <target name="codeswitcher" depends="-prepare"
-+ description="uses +-JDBC2 +-JDBC2 +-JAVA2 +-JDBC4">
-+! <javac destdir="classes">
-+ <src path="${src}"/>
-+ <include name="org/hsqldb/util/CodeSwitcher.java"/>
-+ </javac>
-+--- 132,138 ----
-+
-+ <target name="codeswitcher" depends="-prepare"
-+ description="uses +-JDBC2 +-JDBC2 +-JAVA2 +-JDBC4">
-+! <javac destdir="classes" source="${java.source.ver}" target="${java.target.ver}">
-+ <src path="${src}"/>
-+ <include name="org/hsqldb/util/CodeSwitcher.java"/>
-+ </javac>
-+***************
-+*** 258,263 ****
-+--- 258,265 ----
-+ description="compiles the /store folder">
-+ <javac srcdir="${src}"
-+ destdir="classes"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
-+ debug="${build.debug}"
-+ optimize="${build.optimize}"
-+ >
-+***************
-+*** 269,274 ****
-+--- 271,278 ----
-+ description="compiles the /lib folder">
-+ <javac srcdir="${src}"
-+ destdir="classes"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
-+ debug="${build.debug}"
-+ optimize="${build.optimize}"
-+ >
-+***************
-+*** 281,286 ****
-+--- 285,292 ----
-+ description="compiles all the classes">
-+ <javac srcdir="${src}"
-+ destdir="classes"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
-+ debug="${build.debug}"
-+ optimize="${build.optimize}"
-+ >
-+***************
-+*** 315,320 ****
-+--- 321,328 ----
-+ description="compiles 1.2 specific classes">
-+ <javac srcdir="${src}"
-+ destdir="classes"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
-+ debug="${build.debug}"
-+ optimize="${build.optimize}"
-+ >
-+***************
-+*** 327,332 ****
-+--- 335,342 ----
-+ description="compiles 1.4 specific classes">
-+ <javac srcdir="${src}"
-+ destdir="classes"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
-+ debug="${build.debug}"
-+ optimize="${build.optimize}"
-+ >
-+***************
-+*** 343,348 ****
-+--- 353,360 ----
-+ description="compiles 1.4-specific test classes">
-+ <javac srcdir="${src}"
-+ destdir="classes"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
-+ debug="${build.debug}"
-+ optimize="${build.optimize}"
-+ classpath="lib/junit.jar"
-+***************
-+*** 357,362 ****
-+--- 369,376 ----
-+ description="compiles the /util folder">
-+ <javac srcdir="${src}"
-+ destdir="classes"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
-+ debug="${build.debug}"
-+ optimize="${build.optimize}"
-+ >
-+***************
-+*** 373,378 ****
-+--- 387,394 ----
-+ description="compiles the swing based classes in the /util folder">
-+ <javac srcdir="${src}"
-+ destdir="classes"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
-+ debug="${build.debug}"
-+ optimize="${build.optimize}"
-+ >
-+***************
-+*** 388,393 ****
-+--- 404,411 ----
-+ message="'junit.jar' must reside in the /lib directory in order to use this target"/>
-+ <javac srcdir="${src}"
-+ destdir="classes"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
-+ debug="${build.debug}"
-+ optimize="${build.optimize}"
-+ >
---- jfreereport/java/sac/makefile.mk.javatarget~ 2008-04-11 09:26:01.000000000 +0200
-+++ jfreereport/java/sac/makefile.mk 2008-07-07 20:04:44.679095537 +0200
-@@ -34,16 +34,12 @@ PRJ=..$/..
- PRJNAME=jfreereport
- TARGET=sac-1.3
-
-+.IF "$(SOLAR_JAVA)" != ""
-+
- # --- Settings -----------------------------------------------------
-
- .INCLUDE : settings.mk
-
--# override buildfile
--ANT_BUILDFILE=build.xml
--
--.INCLUDE : antsettings.mk
--
--.IF "$(SOLAR_JAVA)" != ""
- # --- Files --------------------------------------------------------
-
- TARFILE_NAME=sacjava-1.3
-@@ -52,31 +48,26 @@ TARFILE_ROOTDIR=$(TARGET)
-
- PATCH_FILE_NAME=patches$/sac.patch
-
--ADDITIONAL_FILES=build.xml
-+ADDITIONAL_FILES=build.xml \
-+ makefile.mk
-
- # CONVERTFILES=build.xml
-
--.IF "$(JAVACISGCJ)"=="yes"
--JAVA_HOME=
--.EXPORT : JAVA_HOME
--BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
--.ELSE
--BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
--.ENDIF
--
--.ENDIF # $(SOLAR_JAVA)!= ""
-+BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-
- # --- Targets ------------------------------------------------------
-
- .INCLUDE : set_ext.mk
- .INCLUDE : target.mk
-
--.IF "$(SOLAR_JAVA)" != ""
- .INCLUDE : tg_ext.mk
-
- ALLTAR : $(CLASSDIR)$/sac.jar
-
- $(CLASSDIR)$/sac.jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
- $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/sac.jar $(CLASSDIR)$/sac.jar
--.ENDIF
-
-+.ELSE
-+ all:
-+ @echo java disabled
-+.ENDIF
---- jfreereport/patches/sac.patch.javatarget~ 2008-01-14 16:33:06.000000000 +0100
-+++ jfreereport/patches/sac.patch 2008-07-07 20:04:44.679095537 +0200
-@@ -1,3 +1,56 @@
-+*** misc/sac-1.3/makefile.mk.dummy 2008-01-29 14:31:39.000000000 +0100
-+--- misc/build/sac-1.3/makefile.mk 2008-01-29 17:35:10.000000000 +0100
-+***************
-+*** 1 ****
-+! dummy
-+--- 1,47 ----
-+! #*************************************************************************
-+! #
-+! # OpenOffice.org - a multi-platform office productivity suite
-+! #
-+! # $RCSfile$
-+! #
-+! # $Revision$
-+! #
-+! # last change: $Author$ $Date$
-+! #
-+! # The Contents of this file are made available subject to
-+! # the terms of GNU Lesser General Public License Version 2.1.
-+! #
-+! #
-+! # GNU Lesser General Public License Version 2.1
-+! # =============================================
-+! # Copyright 2005 by Sun Microsystems, Inc.
-+! # 901 San Antonio Road, Palo Alto, CA 94303, USA
-+! #
-+! # This library is free software; you can redistribute it and/or
-+! # modify it under the terms of the GNU Lesser General Public
-+! # License version 2.1, as published by the Free Software Foundation.
-+! #
-+! # This library is distributed in the hope that it will be useful,
-+! # but WITHOUT ANY WARRANTY; without even the implied warranty of
-+! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+! # Lesser General Public License for more details.
-+! #
-+! # You should have received a copy of the GNU Lesser General Public
-+! # License along with this library; if not, write to the Free Software
-+! # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+! # MA 02111-1307 USA
-+! #
-+! #*************************************************************************
-+!
-+! PRJ=..$/..$/..$/..
-+! PRJNAME=jfreereport
-+! TARGET=sac-1.3
-+!
-+! # buildfile is in a subdirectory
-+! ANT_BUILDFILE=build.xml
-+!
-+! .INCLUDE : ant.mk
-+!
-+! ANT_FLAGS+=-Dbuild.label="build-$(RSCREVISION)" jar
-+!
-+! ALLTAR : ANTBUILD
- *** misc/sac-1.3/build.xml Thu Oct 18 09:22:24 2007
- --- misc/build/sac-1.3/build.xml Thu Oct 18 08:53:59 2007
- ***************
-@@ -40,7 +93,7 @@
- !
- ! <!-- Build classes -->
- ! <target name="classes" depends="prepare">
--! <javac srcdir="${src}" destdir="${build.classes}" debug="off" optimize="on"/>
-+! <javac srcdir="${src}" destdir="${build.classes}" source="${java.source.ver}" target="${java.target.ver}" debug="off" optimize="on"/>
- ! <copy todir="${build.classes}">
- ! <fileset dir="${src}">
- ! <include name="**/*.properties"/>
---- rhino/makefile.mk.javatarget~ 2008-04-11 09:01:54.000000000 +0200
-+++ rhino/makefile.mk 2008-07-07 20:04:44.680095454 +0200
-@@ -38,7 +38,6 @@ TARGET=ooo_rhino
- # --- Settings -----------------------------------------------------
-
- .INCLUDE : settings.mk
--.INCLUDE : antsettings.mk
-
- # --- Files --------------------------------------------------------
-
-@@ -46,17 +45,12 @@ TARFILE_NAME=rhino1_5R5
- TARFILE_ROOTDIR=rhino1_5R5
-
- ADDITIONAL_FILES= \
-+ makefile.mk \
- toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java
-
- PATCH_FILE_NAME=rhino1_5R5.patch
-
--.IF "$(JAVACISGCJ)"=="yes"
--JAVA_HOME=
--.EXPORT : JAVA_HOME
--BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar
--.ELSE
--BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" jar
--.ENDIF
-+BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-
- # --- Targets ------------------------------------------------------
-
---- rhino/rhino1_5R5.patch.javatarget~ 2008-04-11 09:03:06.000000000 +0200
-+++ rhino/rhino1_5R5.patch 2008-07-07 20:04:44.683095626 +0200
-@@ -1,3 +1,82 @@
-+*** misc/rhino1_5R5//makefile.mk.old 2008-01-29 12:32:48.000000000 +0100
-+--- misc/build/rhino1_5R5//makefile.mk 2008-01-29 12:33:22.000000000 +0100
-+***************
-+*** 1 ****
-+! dummy
-+--- 1,47 ----
-+! #*************************************************************************
-+! #
-+! # OpenOffice.org - a multi-platform office productivity suite
-+! #
-+! # $RCSfile$
-+! #
-+! # $Revision$
-+! #
-+! # last change: $Author$ $Date$
-+! #
-+! # The Contents of this file are made available subject to
-+! # the terms of GNU Lesser General Public License Version 2.1.
-+! #
-+! #
-+! # GNU Lesser General Public License Version 2.1
-+! # =============================================
-+! # Copyright 2005 by Sun Microsystems, Inc.
-+! # 901 San Antonio Road, Palo Alto, CA 94303, USA
-+! #
-+! # This library is free software; you can redistribute it and/or
-+! # modify it under the terms of the GNU Lesser General Public
-+! # License version 2.1, as published by the Free Software Foundation.
-+! #
-+! # This library is distributed in the hope that it will be useful,
-+! # but WITHOUT ANY WARRANTY; without even the implied warranty of
-+! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+! # Lesser General Public License for more details.
-+! #
-+! # You should have received a copy of the GNU Lesser General Public
-+! # License along with this library; if not, write to the Free Software
-+! # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+! # MA 02111-1307 USA
-+! #
-+! #*************************************************************************
-+!
-+! PRJ=..$/..$/..$/..
-+! PRJNAME=ooo_rhino
-+! TARGET=ooo_rhino
-+!
-+! # buildfile is in a subdirectory
-+! ANT_BUILDFILE=build.xml
-+!
-+! .INCLUDE : ant.mk
-+!
-+! ANT_FLAGS+=-Dbuild.label="build-$(RSCREVISION)" jar
-+!
-+! ALLTAR : ANTBUILD
-+*** misc/rhino1_5R5/src/build.xml.old 2004-03-25 21:54:34.000000000 +0100
-+--- misc/build/rhino1_5R5/src/build.xml 2008-01-29 12:18:05.000000000 +0100
-+***************
-+*** 17,22 ****
-+--- 17,24 ----
-+ destdir="${nest}/${classes}"
-+ includes="org/**/*.java"
-+ deprecation="on"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
-+ debug="${debug}">
-+ </javac>
-+ <copy todir="${nest}/${classes}">
-+*** misc/rhino1_5R5/toolsrc/build.xml.old 2008-01-29 10:51:54.000000000 +0100
-+--- misc/build/rhino1_5R5/toolsrc/build.xml 2008-01-29 12:21:10.000000000 +0100
-+***************
-+*** 31,36 ****
-+--- 31,38 ----
-+ destdir="${nest}/${classes}"
-+ includes="org/**/*.java"
-+ deprecation="on"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
-+ debug="${debug}">
-+ </javac>
-+ <copy todir="${nest}/${classes}">
- --- misc/rhino1_5R5/src/org/mozilla/javascript/DefiningClassLoader.java Thu Mar 25 21:54:34 2004
- +++ misc/build/rhino1_5R5/src/org/mozilla/javascript/DefiningClassLoader.java Fri Mar 28 17:24:23 2008
- @@ -38,6 +38,7 @@
---- scripting/examples/java/build.xml.javatarget~ 2008-04-11 11:44:50.000000000 +0200
-+++ scripting/examples/java/build.xml 2008-07-07 20:04:44.684096103 +0200
-@@ -51,7 +51,8 @@
-
- <javac srcdir="HelloWorld" destdir="${outdir}/HelloWorld"
- includes="**/*.java" classpathref="idlclasspath"
-- debug="${debug}" optimize="${optimize}" deprecation="on"/>
-+ debug="${debug}" optimize="${optimize}" deprecation="on"
-+ source="${java.source.ver}" target="${java.target.ver}"/>
-
- <copy file="HelloWorld/HelloWorld.java" todir="${outdir}/HelloWorld"/>
- <copy file="HelloWorld/parcel-descriptor.xml" todir="${outdir}/HelloWorld"/>
-@@ -73,7 +74,8 @@
-
- <javac srcdir="Highlight" destdir="${outdir}/Highlight"
- includes="**/*.java" classpathref="idlclasspath"
-- debug="${debug}" optimize="${optimize}" deprecation="on"/>
-+ debug="${debug}" optimize="${optimize}" deprecation="on"
-+ source="${java.source.ver}" target="${java.target.ver}"/>
-
- <copy file="Highlight/HighlightText.java" todir="${outdir}/Highlight"/>
- <copy file="Highlight/parcel-descriptor.xml" todir="${outdir}/Highlight"/>
-@@ -95,7 +97,8 @@
-
- <javac srcdir="MemoryUsage" destdir="${outdir}/MemoryUsage"
- includes="**/*.java" classpathref="idlclasspath"
-- debug="${debug}" optimize="${optimize}" deprecation="on"/>
-+ debug="${debug}" optimize="${optimize}" deprecation="on"
-+ source="${java.source.ver}" target="${java.target.ver}"/>
-
- <copy file="MemoryUsage/MemoryUsage.java" todir="${outdir}/MemoryUsage"/>
- <copy file="MemoryUsage/parcel-descriptor.xml" todir="${outdir}/MemoryUsage"/>
-@@ -117,7 +120,8 @@
-
- <javac srcdir="selector" destdir="${outdir}/selector"
- includes="**/*.java" classpathref="idlclasspath"
-- debug="${debug}" optimize="${optimize}" deprecation="on"/>
-+ debug="${debug}" optimize="${optimize}" deprecation="on"
-+ source="${java.source.ver}" target="${java.target.ver}"/>
-
- <copy todir="${outdir}/selector">
- <fileset dir="selector">
---- scripting/java/build.xml.javatarget~ 2008-04-11 11:46:13.000000000 +0200
-+++ scripting/java/build.xml 2008-07-07 20:04:44.685095322 +0200
-@@ -85,16 +85,19 @@
- <target name="compile" depends="prepare">
- <javac srcdir="com" destdir="${jardir}"
- includes="**/*.java" classpathref="idlclasspath"
-- debug="${debug}" optimize="${optimize}" deprecation="off"/>
-+ debug="${debug}" optimize="${optimize}" deprecation="off"
-+ source="${java.source.ver}" target="${java.target.ver}"/>
- <javac srcdir="Framework/" destdir="${jardir}"
- includes="**/*.java" classpathref="idlclasspath" debug="${debug}"
-- optimize="${optimize}" deprecation="off">
-+ optimize="${optimize}" deprecation="off"
-+ source="${java.source.ver}" target="${java.target.ver}">
- </javac>
- </target>
-
- <target name="idesupport.compile" depends="compile, prepare">
- <javac srcdir="." destdir="${jardir}"
-- debug="${debug}" deprecation="on">
-+ debug="${debug}" deprecation="on"
-+ source="${java.source.ver}" target="${java.target.ver}">
- <classpath refid="idesupport.class.path"/>
- <exclude name="${idesupport.dir}/**/.*/*"/>
- <exclude name="${idesupport.dir}/localoffice/**/*"/>
-@@ -106,7 +109,8 @@
-
- <target name="localoffice.compile" depends="prepare">
- <javac srcdir="." destdir="${jardir}"
-- debug="${debug}" deprecation="on">
-+ debug="${debug}" deprecation="on"
-+ source="${java.source.ver}" target="${java.target.ver}">
- <classpath refid="idlclasspath"/>
- <exclude name="${idesupport.dir}/localoffice/.*/*"/>
- <include name="${idesupport.dir}/localoffice/*.java"/>
-@@ -115,7 +119,8 @@
-
- <target name="netbeans.compile" depends="idesupport.compile, prepare">
- <javac srcdir="." destdir="${jardir}"
-- debug="${debug}" deprecation="on">
-+ debug="${debug}" deprecation="on"
-+ source="${java.source.ver}" target="${java.target.ver}">
- <classpath refid="openide.class.path"/>
- <exclude name="${netbeans.dir}/**/.*/*"/>
- <include name="${netbeans.dir}/**/*.java"/>
-@@ -124,7 +129,8 @@
-
- <target name="netbeans.editor.support" depends="prepare">
- <javac srcdir="." destdir="${jardir}"
-- debug="${debug}" deprecation="on">
-+ debug="${debug}" deprecation="on"
-+ source="${java.source.ver}" target="${java.target.ver}">
- <classpath refid="netbeans.editor.support.classpath"/>
- <include name="org/openoffice/netbeans/editor/*.java"/>
- </javac>
---- scripting/workben/build.xml.javatarget~ 2008-04-11 12:52:33.000000000 +0200
-+++ scripting/workben/build.xml 2008-07-07 20:04:44.687095436 +0200
-@@ -113,7 +113,8 @@
- destdir="${out}/class/examples/java/debugger"
- includes="*.java"
- classpathref="debuggerclasspath"
-- debug="${debug}" optimize="${optimize}" deprecation="on"/>
-+ debug="${debug}" optimize="${optimize}" deprecation="on"
-+ source="${java.source.ver}" target="${java.target.ver}"/>
-
- <copy todir="${out}/class/examples/java/debugger">
- <fileset dir="${prj}/examples/java/debugger">
-@@ -137,7 +138,8 @@
- <mkdir dir="${out}/class/examples/java/Highlight"/>
- <javac srcdir="${prj}/examples/java/" destdir="${out}/class/examples/java/Highlight/"
- includes="**/Highlight*.java" classpathref="idlclasspath"
-- debug="${debug}" optimize="${optimize}" deprecation="on"/>
-+ debug="${debug}" optimize="${optimize}" deprecation="on"
-+ source="${java.source.ver}" target="${java.target.ver}"/>
- <copy todir="${out}/class/examples/java/Highlight/">
- <fileset dir="${prj}/examples/java/">
- <include name="**/Highlight*.java"/>
-@@ -156,7 +158,8 @@
- <mkdir dir="${out}/class/examples/java/MemoryUsage"/>
- <javac srcdir="${prj}/examples/java/" destdir="${out}/class/examples/java/MemoryUsage/"
- includes="**/MemoryUsage.java" classpathref="idlclasspath"
-- debug="${debug}" optimize="${optimize}" deprecation="on"/>
-+ debug="${debug}" optimize="${optimize}" deprecation="on"
-+ source="${java.source.ver}" target="${java.target.ver}"/>
- <copy file="${prj}/examples/java/MemoryUsage.java" todir="${out}/class/examples/java/MemoryUsage/"/>
- <copy file="${prj}/examples/java/MemoryUsageParcel.xml" tofile="${out}/class/examples/java/MemoryUsage/parcel-descriptor.xml"/>
- <copy file="${prj}/examples/java/MemoryUsage.java" todir="${out}/class/examples/java/MemoryUsage/"/>
-@@ -165,7 +168,8 @@
- <mkdir dir="${out}/class/examples/java/ScriptFrmwrkHelper"/>
- <javac srcdir="${prj}/examples/java/" destdir="${out}/class/examples/java/ScriptFrmwrkHelper/"
- includes="**/ScriptFrmwrkHelper.java" classpathref="scriptexampleclasspath"
-- debug="${debug}" optimize="${optimize}" deprecation="on"/>
-+ debug="${debug}" optimize="${optimize}" deprecation="on"
-+ source="${java.source.ver}" target="${java.target.ver}"/>
- <copy todir="${out}/class/examples/java/ScriptFrmwrkHelper/">
- <fileset dir="${prj}/examples/java/">
- <include name="**/ScriptFrmwrkHelper.java"/>
-@@ -315,7 +319,8 @@
- <javac srcdir="${prj}/examples/java/debugger"
- destdir="${out}/class/jsruntimetmp"
- includes="rhino/Main.java" classpathref="debuggerclasspath"
-- debug="${debug}" optimize="${optimize}" deprecation="on"/>
-+ debug="${debug}" optimize="${optimize}" deprecation="on"
-+ source="${java.source.ver}" target="${java.target.ver}"/>
-
- <zip destfile="${out}/class/jsruntime/skip_registration/js.jar"
- basedir="${out}/class/jsruntimetmp" includes="**"/>
-@@ -373,7 +378,8 @@
- <mkdir dir="${installerclasses}"/>
- <javac srcdir="installer/" destdir="${installerclasses}"
- includes="**/*.java" classpathref="idlclasspath"
-- debug="${debug}" optimize="${optimize}" deprecation="on"/>
-+ debug="${debug}" optimize="${optimize}" deprecation="on"
-+ source="${java.source.ver}" target="${java.target.ver}"/>
- <copy file="installer/sidebar.jpg" todir="${out}/class/sframeworkinstall/installer"/>
- </target>
-
---- solenv/inc/antsettings.mk.javatarget~ 2008-04-10 19:33:24.000000000 +0200
-+++ solenv/inc/antsettings.mk 2008-07-07 20:04:44.666095630 +0200
+--- solenv/inc/antsettings.mk.old 2008-04-10 19:33:24.000000000 +0200
++++ solenv/inc/antsettings.mk 2008-08-25 13:52:31.000000000 +0200
@@ -44,6 +44,18 @@ PATH!:=$(ANT_HOME)$/bin$(PATH_SEPERATOR)
ANT*:=$(ANT_HOME)$/bin$/ant
ANT_BUILDFILE*=build.xml
@@ -794,7 +123,7 @@
+
+.IF "$(ANT_JAVA_VER_FLAGS)"==""
+.IF "$(JAVACISGCJ)" != "yes" && $(JAVACISKAFFE) != "yes"
-+ANT_JAVA_VER_FLAGS=-Djava.source.ver=$(JAVA_SOURCE_VER) -Djava.target.ver=$(JAVA_TARGET_VER)
++ANT_JAVA_VER_FLAGS=-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER)
+.ENDIF
+.ENDIF
+
@@ -843,415 +172,36 @@
#classpath and response
.IF "$(JDK)" == "J++"
---- transex3/java/l10nconv/build.xml.javatarget~ 2008-04-10 11:30:33.000000000 +0200
-+++ transex3/java/l10nconv/build.xml 2008-07-07 20:04:44.690096167 +0200
-@@ -129,6 +129,8 @@
- debug="${debug}"
- deprecation="${deprication}"
- optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}"
- classpathref="classpath">
- <src path="${java.dir}"/>
- <include name="**/*.java"/>
---- transex3/java/receditor/build.xml.javatarget~ 2008-04-10 11:37:42.000000000 +0200
-+++ transex3/java/receditor/build.xml 2008-07-07 20:04:44.691095665 +0200
-@@ -127,6 +127,8 @@
- debug="${debug}"
- deprecation="${deprication}"
- optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}"
- classpathref="classpath">
- <src path="${java.dir}"/>
- <include name="**/*.java"/>
---- xmerge/java/org/openoffice/xmerge/build.xml.javatarget~ 2008-04-10 19:19:50.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/build.xml 2008-07-07 20:04:44.692095094 +0200
-@@ -109,7 +109,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/Convert.java"/>
- <include name="${package}/ConverterCapabilities.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/dom/build.xml.javatarget~ 2008-04-10 19:20:59.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/dom/build.xml 2008-07-07 20:04:44.693096199 +0200
-@@ -110,7 +110,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/DOMDocument.java"/>
- </javac>
---- xmerge/java/org/openoffice/xmerge/converter/palm/build.xml.javatarget~ 2008-04-10 19:24:54.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/palm/build.xml 2008-07-07 20:04:44.733095975 +0200
-@@ -107,7 +107,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/PalmDB.java"/>
- <include name="${package}/PdbDecoder.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/build.xml.javatarget~ 2008-04-10 19:46:58.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/build.xml 2008-07-07 20:04:44.734095404 +0200
-@@ -110,7 +110,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/EmbeddedObject.java"/>
- <include name="${package}/EmbeddedBinaryObject.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/build.xml.javatarget~ 2008-04-10 19:53:14.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/build.xml 2008-07-07 20:04:44.739096598 +0200
-@@ -110,7 +110,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/CellStyle.java"/>
- <include name="${package}/ColumnStyle.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/build.xml.javatarget~ 2008-04-10 19:56:05.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/build.xml 2008-07-07 20:04:44.739096598 +0200
-@@ -111,7 +111,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/MinicalcConstants.java"/>
- <include name="${package}/MinicalcDecoder.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/build.xml.javatarget~ 2008-04-10 20:00:04.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/build.xml 2008-07-07 20:04:44.740096097 +0200
-@@ -109,7 +109,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/PocketExcelConstants.java"/>
- <include name="${package}/PocketExcelDecoder.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/build.xml.javatarget~ 2008-04-10 20:09:43.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/build.xml 2008-07-07 20:04:44.743096199 +0200
-@@ -109,7 +109,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/BIFFRecord.java"/>
- <include name="${package}/CellValue.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/build.xml.javatarget~ 2008-04-10 20:15:25.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/build.xml 2008-07-07 20:04:44.744096186 +0200
-@@ -109,7 +109,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/FormulaCompiler.java"/>
- <include name="${package}/FormulaHelper.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/build.xml.javatarget~ 2008-04-10 20:20:42.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/build.xml 2008-07-07 20:04:44.749096542 +0200
-@@ -110,7 +110,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/DocConstants.java"/>
- <include name="${package}/DocDecoder.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/build.xml.javatarget~ 2008-04-10 20:16:46.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/build.xml 2008-07-07 20:04:44.750096041 +0200
-@@ -110,7 +110,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/SxwDocument.java"/>
- <include name="${package}/SxwPluginFactory.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/build.xml.javatarget~ 2008-04-10 20:24:46.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/build.xml 2008-07-07 20:04:44.751095819 +0200
-@@ -110,7 +110,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/DocumentDescriptor.java"/>
- <include name="${package}/DocumentDeserializerImpl.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/build.xml.javatarget~ 2008-04-10 20:29:37.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/build.xml 2008-07-07 20:04:44.752096086 +0200
-@@ -109,7 +109,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/DOCConstants.java"/>
- <include name="${package}/textRecord.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/xslt/build.xml.javatarget~ 2008-04-10 20:33:06.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/xslt/build.xml 2008-07-07 20:04:44.759095788 +0200
-@@ -111,7 +111,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/DocumentDeserializerImpl.java"/>
- <include name="${package}/DocumentSerializerImpl.java"/>
---- xmerge/java/org/openoffice/xmerge/merger/build.xml.javatarget~ 2008-04-10 20:38:16.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/merger/build.xml 2008-07-07 20:04:44.760096264 +0200
-@@ -110,7 +110,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/DiffAlgorithm.java"/>
- <include name="${package}/Difference.java"/>
---- xmerge/java/org/openoffice/xmerge/merger/diff/build.xml.javatarget~ 2008-04-10 20:42:41.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/merger/diff/build.xml 2008-07-07 20:04:44.761096182 +0200
-@@ -110,7 +110,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/CharacterParser.java"/>
- <include name="${package}/CharArrayLCSAlgorithm.java"/>
---- xmerge/java/org/openoffice/xmerge/merger/merge/build.xml.javatarget~ 2008-04-10 20:45:01.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/merger/merge/build.xml 2008-07-07 20:04:44.761096182 +0200
-@@ -110,7 +110,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/CharacterBaseParagraphMerge.java"/>
- <include name="${package}/PositionBaseRowMerge.java"/>
---- xmerge/java/org/openoffice/xmerge/test/build.xml.javatarget~ 2008-04-10 20:46:42.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/test/build.xml 2008-07-07 20:04:44.762095331 +0200
-@@ -109,7 +109,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/ConverterInfoList.java"/>
- <include name="${package}/Driver.java"/>
---- xmerge/java/org/openoffice/xmerge/util/build.xml.javatarget~ 2008-04-10 20:50:18.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/util/build.xml 2008-07-07 20:04:44.763095458 +0200
-@@ -109,7 +109,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/IntArrayList.java"/>
- <include name="${package}/Resources.java"/>
---- xmerge/java/org/openoffice/xmerge/util/registry/build.xml.javatarget~ 2008-04-10 20:52:45.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/util/registry/build.xml 2008-07-07 20:04:44.764095795 +0200
-@@ -109,7 +109,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/ConverterInfo.java"/>
- <include name="${package}/ConverterInfoMgr.java"/>
---- xmerge/source/aportisdoc/build.xml.javatarget~ 2008-04-10 20:58:07.000000000 +0200
-+++ xmerge/source/aportisdoc/build.xml 2008-07-07 20:04:44.764095795 +0200
-@@ -51,7 +51,9 @@
- destdir="${target.dir}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- </javac>
- </target>
---- xmerge/source/bridge/build.xml.javatarget~ 2008-04-10 21:01:33.000000000 +0200
-+++ xmerge/source/bridge/build.xml 2008-07-07 20:04:44.766096189 +0200
-@@ -58,7 +58,9 @@
- destdir="${target.dir}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- </javac>
- </target>
---- xmerge/source/minicalc/build.xml.javatarget~ 2008-04-10 21:03:59.000000000 +0200
-+++ xmerge/source/minicalc/build.xml 2008-07-07 20:04:44.767096176 +0200
-@@ -51,7 +51,9 @@
- destdir="${target.dir}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- </javac>
- </target>
---- xmerge/source/pexcel/build.xml.javatarget~ 2008-04-10 21:23:00.000000000 +0200
-+++ xmerge/source/pexcel/build.xml 2008-07-07 20:04:44.773095263 +0200
-@@ -51,7 +51,9 @@
- destdir="${target.dir}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- </javac>
- </target>
---- xmerge/source/pocketword/build.xml.javatarget~ 2008-04-10 21:40:00.000000000 +0200
-+++ xmerge/source/pocketword/build.xml 2008-07-07 20:04:44.773095263 +0200
-@@ -51,7 +51,9 @@
- destdir="${target.dir}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- </javac>
- </target>
---- xmerge/source/wordsmith/build.xml.javatarget~ 2008-04-10 21:44:28.000000000 +0200
-+++ xmerge/source/wordsmith/build.xml 2008-07-07 20:04:44.774095320 +0200
-@@ -51,7 +51,9 @@
- destdir="${target.dir}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- </javac>
- </target>
---- xmerge/source/writer2latex/build.xml.javatarget~ 2006-07-13 11:16:05.000000000 +0200
-+++ xmerge/source/writer2latex/build.xml 2008-07-07 20:04:44.775095447 +0200
-@@ -85,7 +85,9 @@
- destdir="${target.dir}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- </javac>
- </target>
---- xmerge/source/xmerge/build.xml.javatarget~ 2008-04-10 21:50:03.000000000 +0200
-+++ xmerge/source/xmerge/build.xml 2008-07-07 20:04:44.776096273 +0200
-@@ -60,7 +60,9 @@
- destdir="${target.dir}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- </javac>
- </target>
---- xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml.javatarget~ 2008-04-10 22:22:10.000000000 +0200
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml 2008-07-07 20:04:44.777096749 +0200
-@@ -114,7 +114,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="${package}/ConverterInfo.java"/>
- <include name="${package}/ConverterInfoMgr.java"/>
---- xmerge/workben/build.xml.javatarget~ 2008-04-10 22:23:44.000000000 +0200
-+++ xmerge/workben/build.xml 2008-07-07 20:04:44.780096991 +0200
-@@ -112,7 +112,9 @@
- destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
-- optimize="${optimize}">
-+ optimize="${optimize}"
-+ source="${java.source.ver}"
-+ target="${java.target.ver}">
- <classpath refid="classpath"/>
- <include name="XmlDiff.java"/>
- </javac>
+--- hsqldb/makefile.mk.old 2008-05-14 11:31:19.000000000 +0200
++++ hsqldb/makefile.mk 2008-08-25 16:11:36.000000000 +0200
+@@ -67,7 +67,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+ .ELSE
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
++BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+ .ENDIF
+
+ .ENDIF # $(SOLAR_JAVA)!= ""
+--- rhino/makefile.mk.old 2008-04-11 09:01:54.000000000 +0200
++++ rhino/makefile.mk 2008-08-25 16:15:08.000000000 +0200
+@@ -55,7 +55,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar
+ .ELSE
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" jar
++BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar
+ .ENDIF
+
+ # --- Targets ------------------------------------------------------
+--- jfreereport/java/sac/makefile.mk.old 2008-07-17 15:36:54.000000000 +0200
++++ jfreereport/java/sac/makefile.mk 2008-08-25 16:25:41.000000000 +0200
+@@ -61,7 +61,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
+ .ELSE
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
++BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all
+ .ENDIF
+
+ .ENDIF # $(SOLAR_JAVA)!= ""
Added: trunk/patches/dev300/build-prebuilt-stax.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/build-prebuilt-stax.diff Mon Aug 25 18:41:40 2008
@@ -0,0 +1,55 @@
+--- config_office/configure.in.old 2008-08-22 12:07:03.000000000 +0200
++++ config_office/configure.in 2008-08-22 17:34:05.000000000 +0200
+@@ -3387,6 +3387,19 @@ else
+ fi
+
+ dnl ===================================================================
++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
++ BUILD_STAX=NO
++ AC_MSG_RESULT([no, will use the prebuilt external/StAX/jsr173_1.0_api.jar])
++else
++ BUILD_STAX=YES
++ AC_MSG_RESULT([yes])
++fi
++AC_SUBST(BUILD_STAX)
++
++dnl ===================================================================
+ dnl Check for building ODK
+ dnl ===================================================================
+ AC_MSG_CHECKING([whether to build the ODK])
+--- config_office/set_soenv.in.old 2008-08-22 12:07:03.000000000 +0200
++++ config_office/set_soenv.in 2008-08-22 17:35:07.000000000 +0200
+@@ -2070,6 +2070,7 @@ ToFile( "ENABLE_AGG", "@ENABLE_AG
+ ToFile( "SYSTEM_AGG", "@SYSTEM_AGG@", "e" );
+ ToFile( "AGG_VERSION", "@AGG_VERSION@", "e" );
+ ToFile( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" );
++ToFile( "BUILD_STAX", "@BUILD_STAX@", "e" );
+ ToFile( "BUILD_UNOWINREG", "@BUILD_UNOWINREG@", "e" );
+ ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" );
+ ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@", "e" );
+--- stax/makefile.mk.old 2008-07-28 13:59:31.000000000 +0200
++++ stax/makefile.mk 2008-08-22 17:40:53.000000000 +0200
+@@ -51,6 +51,15 @@ all:
+ @echo "Therefore the files provided here does not need to be built in addition."
+ .ENDIF
+
++EXTERNAL_DIR=$(PRJ)$/..$/external/StAX
++
++.IF "$(BUILD_STAX)" != "YES"
++
++$(OUT)$/class$/jsr173_1.0_api.jar : $(EXTERNAL_DIR)$/jsr173_1.0_api.jar
++ +$(COPY) $< $@
++
++.ELSE # "$(BUILD_STAX)" != "YES"
++
+ # --- Files --------------------------------------------------------
+ TARFILE_NAME=stax-api-1.0-2-sources
+ TARFILE_ROOTDIR=src
+@@ -66,3 +75,4 @@ OUT2CLASS=jsr173_1.0_api.jar
+ .INCLUDE : target.mk
+ .INCLUDE : tg_ext.mk
+
++.ENDIF # "$(BUILD_STAX)" != "YES"
Modified: trunk/po/Makefile.am
==============================================================================
--- trunk/po/Makefile.am (original)
+++ trunk/po/Makefile.am Mon Aug 25 18:41:40 2008
@@ -16,6 +16,8 @@
pot2po -t $@ -i ooo-build.pot -o $ new
mv $ new $@
+# ../bin/po2sdf is a crazy hack until
+# http://bugs.locamotion.org/show_bug.cgi?id=487"; is fixed"
ooo-build-%.sdf: ooo-build-%.po ooo-build.sdf /usr/bin/po2oo ../bin/po2sdf
../bin/po2sdf $* ooo-build.sdf $< $@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
