ooo-build r13092 - in trunk: . patches/dev300
- From: brosenk svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13092 - in trunk: . patches/dev300
- Date: Mon, 7 Jul 2008 18:13:06 +0000 (UTC)
Author: brosenk
Date: Mon Jul 7 18:13:05 2008
New Revision: 13092
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13092&view=rev
Log:
Make build-java-target.diff apply on dev300-m22
Added:
trunk/patches/dev300/build-java-target-m21.diff
- copied unchanged from r13091, /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 Mon Jul 7 18:13:05 2008
@@ -941,10 +941,17 @@
[ BuildBits ]
novell-win32-agfa-monotype-fonts.diff, tml
+[ BuildBits <= dev300-m21 ]
+# allow to define java target, so the build is usable with the JVM 1.4
+# even when it is built with JDK 1.5
+build-java-target-m21.diff, pmladek
+
+[ BuildBits >= dev300-m22 ]
# allow to define java target, so the build is usable with the JVM 1.4
# even when it is built with JDK 1.5
build-java-target.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 Mon Jul 7 18:13:05 2008
@@ -1,6 +1,120 @@
---- config_office/configure.in.old 2006-10-10 21:48:52.000000000 +0200
-+++ config_office/configure.in 2006-10-11 22:43:50.000000000 +0200
-@@ -573,6 +573,17 @@ AC_ARG_WITH(java,
+--- 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
+@@ -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
+ .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
+@@ -50,7 +50,7 @@ TARFILE_NAME=commons-httpclient-3.1-src
+
+ TARFILE_ROOTDIR=commons-httpclient-3.1
+
+-#PATCH_FILE_NAME=patches$/httpclient.patch
++PATCH_FILE_NAME=patches$/httpclient.patch
+
+ #CONVERTFILES=build.xml
+
+@@ -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
+ .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 @@
++--- 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>
+--- 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,
no support for Java components, applets, accessibility
or XML filters.
], if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi, WITH_JAVA=java)
@@ -18,7 +132,7 @@
AC_ARG_ENABLE(gcjaot,
[ --enable-gcjaot Build with[[out]] using Ahead of Time java compilation
support to speed up buildsi by compiling the jars also
-@@ -2308,6 +2319,44 @@
+@@ -2730,6 +2741,44 @@ else
JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
fi
@@ -63,7 +177,7 @@
dnl ===================================================================
dnl Checks for javac
dnl ===================================================================
-@@ -2349,6 +2397,17 @@
+@@ -2788,6 +2837,17 @@ if test "$SOLAR_JAVA" != ""; then
fi
AC_SUBST(JAVACISGCJ)
@@ -81,7 +195,7 @@
dnl ===================================================================
dnl Checks for javadoc
dnl ===================================================================
-@@ -2465,6 +2524,8 @@
+@@ -2998,6 +3058,8 @@ fi
AC_SUBST(JAVA_HOME)
AC_SUBST(JDK)
@@ -90,9 +204,9 @@
AC_SUBST(JAVAINTERPRETER)
AC_SUBST(JAVACOMPILER)
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
-@@ -1872,6 +1872,7 @@
+--- 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,
if ( $JDK ne "gcj" ) {
ToFile( "CLASSPATH", $CLASSPATH, "e" );
ToFile( "XCLASSPATH", $XCLASSPATH, "e" );
@@ -100,7 +214,7 @@
}
else {
ToFile( "JAVACISGCJ", '@JAVACISGCJ@', "e" );
-@@ -1882,6 +1883,8 @@
+@@ -1852,6 +1853,8 @@ if ( $GUI eq "UNX" ) {
if ( '@JDK@' ne '' )
{
ToFile( "JDK", "@JDK@", "e" );
@@ -109,186 +223,9 @@
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 @@
- ANT*:=$(ANT_HOME)$/bin$/ant
- ANT_BUILDFILE*=build.xml
-
-+.IF "$(ANT_COMPILER_FLAGS)"==""
-+.IF "$(JAVACISGCJ)" == "yes"
-+ANT_COMPILER_FLAGS=-Dbuild.compiler=gcj
-+.ENDIF
-+.ENDIF
-+
-+.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)
-+.ENDIF
-+.ENDIF
-+
- .IF "$(ANT_DEBUG)"==""
- .IF "$(debug)"==""
- ANT_DEBUG=off
-@@ -74,24 +86,14 @@
- .EXPORT : JAVA_HOME
- .ENDIF
-
--.IF "$(JAVACISGCJ)" == "yes"
--ANT_FLAGS!:=-Dbuild.compiler=gcj -Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) \
-- -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) \
-- -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) \
-- -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
-+ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=$(PRJ) -Dprjname=$(PRJNAME) $(ANT_JAVA_VER_FLAGS) \
-+ -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on \
-+ -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
-+ -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
- -Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \
- -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
--.ELSE
--ANT_FLAGS!:=-Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) \
-- -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" \
-- -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) \
-- -Dcommon.jar=$(SOLARCOMMONBINDIR) -Dcommon.doc=$(SOLARCOMMONDOCDIR) \
-- -Dsolar.sourceversion=$(SOURCEVERSION) -Dsolar.lastminor=$(LAST_MINOR) \
-- -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
--.ENDIF
-+
- .ELSE # No java
- ANT=
- ANT_FLAGS=
- .ENDIF
--
--
---- solenv/inc/settings.mk.old 2006-10-11 19:08:41.000000000 +0200
-+++ solenv/inc/settings.mk 2006-10-11 19:11:35.000000000 +0200
-@@ -169,6 +169,9 @@
- .IF "$(JAVACISGCJ)" == "yes"
- JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
- .ENDIF
-+.IF "$(JAVACISGCJ)" != "yes" && $(JAVACISKAFFE) != "yes"
-+JAVAC+=-source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER)
-+.ENDIF
-
- #classpath and response
- .IF "$(JDK)" == "J++"
---- apache-commons/java/codec/makefile.mk.old 2008-04-11 13:13:47.000000000 +0200
-+++ apache-commons/java/codec/makefile.mk 2008-07-02 15:31:43.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
- .ENDIF
-
- .ENDIF # $(SOLAR_JAVA)!= ""
---- apache-commons/patches/codec.patch.old 2008-02-04 10:02:07.000000000 +0100
-+++ apache-commons/patches/codec.patch 2008-07-02 15:52:20.000000000 +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/java/httpclient/makefile.mk.old 2008-04-11 13:14:05.000000000 +0200
-+++ apache-commons/java/httpclient/makefile.mk 2008-07-02 15:56:02.000000000 +0200
-@@ -50,7 +50,7 @@ TARFILE_NAME=commons-httpclient-3.1-src
-
- TARFILE_ROOTDIR=commons-httpclient-3.1
-
--#PATCH_FILE_NAME=patches$/httpclient.patch
-+PATCH_FILE_NAME=patches$/httpclient.patch
-
- #CONVERTFILES=build.xml
-
-@@ -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
- .ENDIF
-
- .ENDIF # $(SOLAR_JAVA)!= ""
---- /dev/null 2007-09-21 21:12:45.000000000 +0200
-+++ apache-commons/patches/httpclient.patch 2008-07-02 15:52:59.000000000 +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>
---- beanshell/bsh-2.0b1-src.patch.old 2008-04-11 09:44:49.000000000 +0200
-+++ beanshell/bsh-2.0b1-src.patch 2008-07-01 22:19:43.000000000 +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 @@
---- hsqldb/makefile.mk.old 2006-07-10 21:01:25.000000000 +0200
-+++ hsqldb/makefile.mk 2006-10-11 20:42:14.000000000 +0200
-@@ -38,18 +38,12 @@
+--- 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
@@ -308,7 +245,7 @@
# --- Files --------------------------------------------------------
TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
-@@ -60,28 +60,24 @@
+@@ -56,28 +50,24 @@ CONVERTFILES=build$/build.xml
PATCH_FILE_NAME=patches$/accumulated_patches.patch
@@ -344,10 +281,9 @@
+ all:
+ @echo java disabled
+.ENDIF
-dummy line to avoid confusing diff-mode
---- hsqldb/patches/accumulated_patches.patch 2008-01-29 12:13:28.000000000 +0100
-+++ hsqldb/patches/accumulated_patches.patch 2008-01-29 12:11:22.000000000 +0100
-@@ -1315,3 +1315,176 @@
+--- 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;
}
@@ -524,10 +460,9 @@
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ >
-dummy line to avoid confusing diff-mode
---- jfreereport/java/sac/makefile.mk.old 2008-01-11 09:27:31.000000000 +0100
-+++ jfreereport/java/sac/makefile.mk 2008-01-29 17:56:18.000000000 +0100
-@@ -38,16 +38,12 @@ PRJ=..$/..
+--- 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
@@ -546,7 +481,7 @@
# --- Files --------------------------------------------------------
TARFILE_NAME=sacjava-1.3
-@@ -56,31 +52,26 @@ TARFILE_ROOTDIR=$(TARGET)
+@@ -52,31 +48,26 @@ TARFILE_ROOTDIR=$(TARGET)
PATCH_FILE_NAME=patches$/sac.patch
@@ -585,9 +520,8 @@
+ all:
+ @echo java disabled
+.ENDIF
-dummy line to avoid confusing diff-mode
---- jfreereport/patches/sac.patch.old 2008-01-11 09:30:07.000000000 +0100
-+++ jfreereport/patches/sac.patch 2008-01-29 17:58:23.000000000 +0100
+--- 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
@@ -654,10 +588,9 @@
! <copy todir="${build.classes}">
! <fileset dir="${src}">
! <include name="**/*.properties"/>
-dummy line to avoid confusing diff-mode
---- rhino/makefile.mk.old 2008-01-04 13:29:01.000000000 +0100
-+++ rhino/makefile.mk 2008-01-29 12:34:37.000000000 +0100
-@@ -42,7 +42,6 @@ TARGET=ooo_rhino
+--- 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
@@ -665,7 +598,7 @@
# --- Files --------------------------------------------------------
-@@ -50,17 +49,12 @@ TARFILE_NAME=rhino1_5R5
+@@ -46,17 +45,12 @@ TARFILE_NAME=rhino1_5R5
TARFILE_ROOTDIR=rhino1_5R5
ADDITIONAL_FILES= \
@@ -685,9 +618,8 @@
# --- Targets ------------------------------------------------------
-dummy line to avoid confusing diff-mode
---- rhino/rhino1_5R5.patch.old 2008-01-02 15:51:18.000000000 +0100
-+++ rhino/rhino1_5R5.patch 2008-01-29 12:34:05.000000000 +0100
+--- 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
@@ -771,10 +703,9 @@
--- 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 @@
-dummy line to avoid confusing diff-mode
---- scripting/examples/java/build.xml.old 2005-09-09 03:53:51.000000000 +0200
-+++ scripting/examples/java/build.xml 2006-10-11 15:30:17.000000000 +0200
-@@ -55,7 +55,8 @@
+--- 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"
@@ -784,7 +715,7 @@
<copy file="HelloWorld/HelloWorld.java" todir="${outdir}/HelloWorld"/>
<copy file="HelloWorld/parcel-descriptor.xml" todir="${outdir}/HelloWorld"/>
-@@ -77,7 +78,8 @@
+@@ -73,7 +74,8 @@
<javac srcdir="Highlight" destdir="${outdir}/Highlight"
includes="**/*.java" classpathref="idlclasspath"
@@ -794,7 +725,7 @@
<copy file="Highlight/HighlightText.java" todir="${outdir}/Highlight"/>
<copy file="Highlight/parcel-descriptor.xml" todir="${outdir}/Highlight"/>
-@@ -99,7 +101,8 @@
+@@ -95,7 +97,8 @@
<javac srcdir="MemoryUsage" destdir="${outdir}/MemoryUsage"
includes="**/*.java" classpathref="idlclasspath"
@@ -804,7 +735,7 @@
<copy file="MemoryUsage/MemoryUsage.java" todir="${outdir}/MemoryUsage"/>
<copy file="MemoryUsage/parcel-descriptor.xml" todir="${outdir}/MemoryUsage"/>
-@@ -121,7 +124,8 @@
+@@ -117,7 +120,8 @@
<javac srcdir="selector" destdir="${outdir}/selector"
includes="**/*.java" classpathref="idlclasspath"
@@ -814,9 +745,9 @@
<copy todir="${outdir}/selector">
<fileset dir="selector">
---- scripting/java/build.xml.old 2006-04-19 17:06:54.000000000 +0200
-+++ scripting/java/build.xml 2006-10-11 15:32:20.000000000 +0200
-@@ -89,16 +89,19 @@
+--- 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"
@@ -839,7 +770,7 @@
<classpath refid="idesupport.class.path"/>
<exclude name="${idesupport.dir}/**/.*/*"/>
<exclude name="${idesupport.dir}/localoffice/**/*"/>
-@@ -110,7 +113,8 @@
+@@ -106,7 +109,8 @@
<target name="localoffice.compile" depends="prepare">
<javac srcdir="." destdir="${jardir}"
@@ -849,7 +780,7 @@
<classpath refid="idlclasspath"/>
<exclude name="${idesupport.dir}/localoffice/.*/*"/>
<include name="${idesupport.dir}/localoffice/*.java"/>
-@@ -119,7 +123,8 @@
+@@ -115,7 +119,8 @@
<target name="netbeans.compile" depends="idesupport.compile, prepare">
<javac srcdir="." destdir="${jardir}"
@@ -859,7 +790,7 @@
<classpath refid="openide.class.path"/>
<exclude name="${netbeans.dir}/**/.*/*"/>
<include name="${netbeans.dir}/**/*.java"/>
-@@ -128,7 +133,8 @@
+@@ -124,7 +129,8 @@
<target name="netbeans.editor.support" depends="prepare">
<javac srcdir="." destdir="${jardir}"
@@ -869,9 +800,9 @@
<classpath refid="netbeans.editor.support.classpath"/>
<include name="org/openoffice/netbeans/editor/*.java"/>
</javac>
---- scripting/workben/build.xml.old 2005-09-09 04:41:02.000000000 +0200
-+++ scripting/workben/build.xml 2006-10-11 15:18:44.000000000 +0200
-@@ -117,7 +117,8 @@
+--- 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"
@@ -881,7 +812,7 @@
<copy todir="${out}/class/examples/java/debugger">
<fileset dir="${prj}/examples/java/debugger">
-@@ -141,7 +142,8 @@
+@@ -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"
@@ -891,7 +822,7 @@
<copy todir="${out}/class/examples/java/Highlight/">
<fileset dir="${prj}/examples/java/">
<include name="**/Highlight*.java"/>
-@@ -160,7 +162,8 @@
+@@ -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"
@@ -901,7 +832,7 @@
<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/"/>
-@@ -169,7 +172,8 @@
+@@ -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"
@@ -911,7 +842,7 @@
<copy todir="${out}/class/examples/java/ScriptFrmwrkHelper/">
<fileset dir="${prj}/examples/java/">
<include name="**/ScriptFrmwrkHelper.java"/>
-@@ -319,7 +323,8 @@
+@@ -315,7 +319,8 @@
<javac srcdir="${prj}/examples/java/debugger"
destdir="${out}/class/jsruntimetmp"
includes="rhino/Main.java" classpathref="debuggerclasspath"
@@ -921,7 +852,7 @@
<zip destfile="${out}/class/jsruntime/skip_registration/js.jar"
basedir="${out}/class/jsruntimetmp" includes="**"/>
-@@ -377,7 +382,8 @@
+@@ -373,7 +378,8 @@
<mkdir dir="${installerclasses}"/>
<javac srcdir="installer/" destdir="${installerclasses}"
includes="**/*.java" classpathref="idlclasspath"
@@ -931,9 +862,72 @@
<copy file="installer/sidebar.jpg" todir="${out}/class/sframeworkinstall/installer"/>
</target>
---- tomcat/makefile.mk.old 2008-04-11 12:04:08.000000000 +0200
-+++ tomcat/makefile.mk 2008-07-02 16:13:43.000000000 +0200
-@@ -51,7 +51,7 @@ TARFILE_ROOTDIR=jakarta-tomcat-5.0.30-sr
+--- 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
+@@ -44,6 +44,18 @@ PATH!:=$(ANT_HOME)$/bin$(PATH_SEPERATOR)
+ ANT*:=$(ANT_HOME)$/bin$/ant
+ ANT_BUILDFILE*=build.xml
+
++.IF "$(ANT_COMPILER_FLAGS)"==""
++.IF "$(JAVACISGCJ)" == "yes"
++ANT_COMPILER_FLAGS=-Dbuild.compiler=gcj
++.ENDIF
++.ENDIF
++
++.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)
++.ENDIF
++.ENDIF
++
+ .IF "$(ANT_DEBUG)"==""
+ .IF "$(debug)"==""
+ ANT_DEBUG=off
+@@ -65,24 +77,14 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ .ENDIF
+
+-.IF "$(JAVACISGCJ)" == "yes"
+-ANT_FLAGS!:=-Dbuild.compiler=gcj -Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) \
+- -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) \
+- -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) \
+- -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
++ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=$(PRJ) -Dprjname=$(PRJNAME) $(ANT_JAVA_VER_FLAGS) \
++ -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on \
++ -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
++ -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
+ -Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \
+ -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
+-.ELSE
+-ANT_FLAGS!:=-Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) \
+- -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" \
+- -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) \
+- -Dcommon.jar=$(SOLARCOMMONBINDIR) -Dcommon.doc=$(SOLARCOMMONDOCDIR) \
+- -Dsolar.sourceversion=$(SOURCEVERSION) -Dsolar.lastminor=$(LAST_MINOR) \
+- -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
+-.ENDIF
++
+ .ELSE # No java
+ ANT=
+ ANT_FLAGS=
+ .ENDIF
+-
+-
+--- solenv/inc/settings.mk.javatarget~ 2008-07-07 19:57:31.071845803 +0200
++++ solenv/inc/settings.mk 2008-07-07 20:04:44.669096361 +0200
+@@ -157,6 +157,9 @@ JAVAI:=$(JAVAINTERPRETER)
+ .IF "$(JAVACISGCJ)" == "yes"
+ JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
+ .ENDIF
++.IF "$(JAVACISGCJ)" != "yes" && $(JAVACISKAFFE) != "yes"
++JAVAC+=-source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER)
++.ENDIF
+
+ #classpath and response
+ .IF "$(JDK)" == "J++"
+--- 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/
PATCH_FILE_NAME=tomcat.patch
BUILD_DIR=jakarta-servletapi-5
@@ -942,12 +936,12 @@
# --- Targets ------------------------------------------------------
---- tomcat/tomcat.patch.old 2008-07-02 16:11:08.000000000 +0200
-+++ tomcat/tomcat.patch 2008-07-02 16:10:55.000000000 +0200
-@@ -34,3 +34,55 @@
- + </target>
- +
- + </project>
+--- 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 @@
@@ -1000,9 +994,9 @@
+ optimize="${compile.optimize}"
+ excludes="**/CVS/**">
+ <classpath refid="examples.classpath" />
---- transex3/java/l10nconv/build.xml.old 2007-05-11 11:06:43.000000000 +0200
-+++ transex3/java/l10nconv/build.xml 2007-07-17 11:58:03.000000000 +0200
-@@ -133,6 +133,8 @@
+--- 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}"
@@ -1011,9 +1005,9 @@
classpathref="classpath">
<src path="${java.dir}"/>
<include name="**/*.java"/>
---- transex3/java/receditor/build.xml.old 2007-07-10 17:42:10.000000000 +0200
-+++ transex3/java/receditor/build.xml 2007-07-18 11:40:17.000000000 +0200
-@@ -131,6 +131,8 @@
+--- 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}"
@@ -1022,9 +1016,9 @@
classpathref="classpath">
<src path="${java.dir}"/>
<include name="**/*.java"/>
---- xmerge/java/org/openoffice/xmerge/build.xml.old 2005-09-09 12:22:56.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/build.xml 2006-10-11 16:08:54.000000000 +0200
-@@ -113,7 +113,9 @@
+--- 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}"
@@ -1035,9 +1029,9 @@
<classpath refid="classpath"/>
<include name="${package}/Convert.java"/>
<include name="${package}/ConverterCapabilities.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/dom/build.xml.old 2005-09-09 12:24:04.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/dom/build.xml 2006-10-11 17:04:03.000000000 +0200
-@@ -114,7 +114,9 @@
+--- 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}"
@@ -1048,9 +1042,9 @@
<classpath refid="classpath"/>
<include name="${package}/DOMDocument.java"/>
</javac>
---- xmerge/java/org/openoffice/xmerge/converter/palm/build.xml.old 2005-09-09 12:26:39.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/palm/build.xml 2006-10-11 16:47:21.000000000 +0200
-@@ -111,7 +111,9 @@
+--- 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}"
@@ -1061,9 +1055,9 @@
<classpath refid="classpath"/>
<include name="${package}/PalmDB.java"/>
<include name="${package}/PdbDecoder.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/build.xml.old 2005-09-09 12:45:07.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/build.xml 2006-10-11 16:47:58.000000000 +0200
-@@ -114,7 +114,9 @@
+--- 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}"
@@ -1074,9 +1068,9 @@
<classpath refid="classpath"/>
<include name="${package}/EmbeddedObject.java"/>
<include name="${package}/EmbeddedBinaryObject.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/build.xml.old 2005-09-09 12:49:55.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/build.xml 2006-10-11 16:50:37.000000000 +0200
-@@ -114,7 +114,9 @@
+--- 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}"
@@ -1087,9 +1081,9 @@
<classpath refid="classpath"/>
<include name="${package}/CellStyle.java"/>
<include name="${package}/ColumnStyle.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/build.xml.old 2005-09-09 12:52:54.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/build.xml 2006-10-11 16:52:07.000000000 +0200
-@@ -115,7 +115,9 @@
+--- 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}"
@@ -1100,9 +1094,9 @@
<classpath refid="classpath"/>
<include name="${package}/MinicalcConstants.java"/>
<include name="${package}/MinicalcDecoder.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/build.xml.old 2005-09-09 12:55:41.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/build.xml 2006-10-11 16:51:12.000000000 +0200
-@@ -113,7 +113,9 @@
+--- 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}"
@@ -1113,9 +1107,9 @@
<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.old 2005-09-09 13:04:31.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/build.xml 2006-10-11 16:51:28.000000000 +0200
-@@ -113,7 +113,9 @@
+--- 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}"
@@ -1126,9 +1120,9 @@
<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.old 2005-09-09 13:09:59.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/build.xml 2006-10-11 16:51:45.000000000 +0200
-@@ -113,7 +113,9 @@
+--- 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}"
@@ -1139,9 +1133,9 @@
<classpath refid="classpath"/>
<include name="${package}/FormulaCompiler.java"/>
<include name="${package}/FormulaHelper.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/build.xml.old 2005-09-09 13:14:23.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/build.xml 2006-10-11 16:50:03.000000000 +0200
-@@ -114,7 +114,9 @@
+--- 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}"
@@ -1152,9 +1146,9 @@
<classpath refid="classpath"/>
<include name="${package}/DocConstants.java"/>
<include name="${package}/DocDecoder.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/build.xml.old 2005-09-09 13:11:24.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/build.xml 2006-10-11 16:48:59.000000000 +0200
-@@ -114,7 +114,9 @@
+--- 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}"
@@ -1165,9 +1159,9 @@
<classpath refid="classpath"/>
<include name="${package}/SxwDocument.java"/>
<include name="${package}/SxwPluginFactory.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/build.xml.old 2005-09-09 13:18:18.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/build.xml 2006-10-11 16:49:16.000000000 +0200
-@@ -114,7 +114,9 @@
+--- 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}"
@@ -1178,9 +1172,9 @@
<classpath refid="classpath"/>
<include name="${package}/DocumentDescriptor.java"/>
<include name="${package}/DocumentDeserializerImpl.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/build.xml.old 2005-09-09 13:23:06.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/build.xml 2006-10-11 16:49:34.000000000 +0200
-@@ -113,7 +113,9 @@
+--- 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}"
@@ -1191,9 +1185,9 @@
<classpath refid="classpath"/>
<include name="${package}/DOCConstants.java"/>
<include name="${package}/textRecord.java"/>
---- xmerge/java/org/openoffice/xmerge/converter/xml/xslt/build.xml.old 2005-09-09 13:26:09.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/converter/xml/xslt/build.xml 2006-10-11 16:48:23.000000000 +0200
-@@ -115,7 +115,9 @@
+--- 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}"
@@ -1204,9 +1198,9 @@
<classpath refid="classpath"/>
<include name="${package}/DocumentDeserializerImpl.java"/>
<include name="${package}/DocumentSerializerImpl.java"/>
---- xmerge/java/org/openoffice/xmerge/merger/build.xml.old 2005-09-09 13:30:36.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/merger/build.xml 2006-10-11 16:44:04.000000000 +0200
-@@ -114,7 +114,9 @@
+--- 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}"
@@ -1217,9 +1211,9 @@
<classpath refid="classpath"/>
<include name="${package}/DiffAlgorithm.java"/>
<include name="${package}/Difference.java"/>
---- xmerge/java/org/openoffice/xmerge/merger/diff/build.xml.old 2005-09-09 13:34:42.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/merger/diff/build.xml 2006-10-11 16:46:49.000000000 +0200
-@@ -114,7 +114,9 @@
+--- 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}"
@@ -1230,9 +1224,9 @@
<classpath refid="classpath"/>
<include name="${package}/CharacterParser.java"/>
<include name="${package}/CharArrayLCSAlgorithm.java"/>
---- xmerge/java/org/openoffice/xmerge/merger/merge/build.xml.old 2005-09-09 13:37:05.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/merger/merge/build.xml 2006-10-11 16:46:28.000000000 +0200
-@@ -114,7 +114,9 @@
+--- 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}"
@@ -1243,9 +1237,9 @@
<classpath refid="classpath"/>
<include name="${package}/CharacterBaseParagraphMerge.java"/>
<include name="${package}/PositionBaseRowMerge.java"/>
---- xmerge/java/org/openoffice/xmerge/test/build.xml.old 2005-09-09 13:38:44.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/test/build.xml 2006-10-11 17:07:59.000000000 +0200
-@@ -113,7 +113,9 @@
+--- 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}"
@@ -1256,9 +1250,9 @@
<classpath refid="classpath"/>
<include name="${package}/ConverterInfoList.java"/>
<include name="${package}/Driver.java"/>
---- xmerge/java/org/openoffice/xmerge/util/build.xml.old 2005-09-09 13:42:14.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/util/build.xml 2006-10-11 17:07:04.000000000 +0200
-@@ -113,7 +113,9 @@
+--- 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}"
@@ -1269,9 +1263,9 @@
<classpath refid="classpath"/>
<include name="${package}/IntArrayList.java"/>
<include name="${package}/Resources.java"/>
---- xmerge/java/org/openoffice/xmerge/util/registry/build.xml.old 2005-09-09 13:44:35.000000000 +0200
-+++ xmerge/java/org/openoffice/xmerge/util/registry/build.xml 2006-10-11 17:07:18.000000000 +0200
-@@ -113,7 +113,9 @@
+--- 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}"
@@ -1282,9 +1276,9 @@
<classpath refid="classpath"/>
<include name="${package}/ConverterInfo.java"/>
<include name="${package}/ConverterInfoMgr.java"/>
---- xmerge/source/aportisdoc/build.xml.old 2006-08-01 14:39:04.000000000 +0200
-+++ xmerge/source/aportisdoc/build.xml 2006-10-11 16:07:08.000000000 +0200
-@@ -55,7 +55,9 @@
+--- 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}"
@@ -1295,9 +1289,9 @@
<classpath refid="classpath"/>
</javac>
</target>
---- xmerge/source/bridge/build.xml.old 2006-08-01 14:41:36.000000000 +0200
-+++ xmerge/source/bridge/build.xml 2006-10-11 16:05:56.000000000 +0200
-@@ -62,7 +62,9 @@
+--- 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}"
@@ -1308,9 +1302,9 @@
<classpath refid="classpath"/>
</javac>
</target>
---- xmerge/source/minicalc/build.xml.old 2006-08-01 14:43:30.000000000 +0200
-+++ xmerge/source/minicalc/build.xml 2006-10-11 16:05:30.000000000 +0200
-@@ -55,7 +55,9 @@
+--- 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}"
@@ -1321,9 +1315,9 @@
<classpath refid="classpath"/>
</javac>
</target>
---- xmerge/source/pexcel/build.xml.old 2006-08-01 14:56:54.000000000 +0200
-+++ xmerge/source/pexcel/build.xml 2006-10-11 16:05:04.000000000 +0200
-@@ -55,7 +55,9 @@
+--- 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}"
@@ -1334,9 +1328,9 @@
<classpath refid="classpath"/>
</javac>
</target>
---- xmerge/source/pocketword/build.xml.old 2006-08-01 15:09:21.000000000 +0200
-+++ xmerge/source/pocketword/build.xml 2006-10-11 16:02:43.000000000 +0200
-@@ -55,7 +55,9 @@
+--- 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}"
@@ -1347,9 +1341,9 @@
<classpath refid="classpath"/>
</javac>
</target>
---- xmerge/source/wordsmith/build.xml.old 2006-08-01 15:12:23.000000000 +0200
-+++ xmerge/source/wordsmith/build.xml 2006-10-11 16:06:21.000000000 +0200
-@@ -55,7 +55,9 @@
+--- 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}"
@@ -1360,8 +1354,8 @@
<classpath refid="classpath"/>
</javac>
</target>
---- xmerge/source/writer2latex/build.xml.old 2006-07-13 11:16:05.000000000 +0200
-+++ xmerge/source/writer2latex/build.xml 2006-10-11 16:06:43.000000000 +0200
+--- 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}"
@@ -1373,9 +1367,9 @@
<classpath refid="classpath"/>
</javac>
</target>
---- xmerge/source/xmerge/build.xml.old 2006-08-01 15:16:55.000000000 +0200
-+++ xmerge/source/xmerge/build.xml 2006-10-11 16:03:09.000000000 +0200
-@@ -64,7 +64,9 @@
+--- 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}"
@@ -1386,9 +1380,9 @@
<classpath refid="classpath"/>
</javac>
</target>
---- xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml.old 2006-08-01 15:43:18.000000000 +0200
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml 2006-10-11 16:03:48.000000000 +0200
-@@ -118,7 +118,9 @@
+--- 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}"
@@ -1399,9 +1393,9 @@
<classpath refid="classpath"/>
<include name="${package}/ConverterInfo.java"/>
<include name="${package}/ConverterInfoMgr.java"/>
---- xmerge/workben/build.xml.old 2006-04-19 17:11:40.000000000 +0200
-+++ xmerge/workben/build.xml 2006-10-11 16:01:22.000000000 +0200
-@@ -116,7 +116,9 @@
+--- 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}"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
