ooo-build r13028 - in trunk: . bin patches/dev300
- From: pmladek svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13028 - in trunk: . bin patches/dev300
- Date: Wed, 2 Jul 2008 16:46:20 +0000 (UTC)
Author: pmladek
Date: Wed Jul 2 16:46:20 2008
New Revision: 13028
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13028&view=rev
Log:
2008-07-02 Petr Mladek <pmladek suse cz>
* patches/dev300/build-java-target.diff, patches/dev300/apply: ported
for dev300 and enabled again
* bin/package-ooo: put the extra en-US tempaltes to the en-US
subpackage; fix path to the NLD branging
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/bin/package-ooo
trunk/patches/dev300/apply
trunk/patches/dev300/build-java-target.diff
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Wed Jul 2 16:46:20 2008
@@ -1,48 +1,116 @@
ooo-build-2.99.21:
+ features:
- + support dev300-m21 [Kendy, Rene, Tor, others]
- + CJK character units back again [Amelia]
+ + support dev300-m21 [Kendy, Rene, Tor, many others]
+ + Excel export encryption support (i#60305, i#71468, i#84766) [Kohei]
+ + WP file-formats password protection [Fridrich]
+ + CJK character unit is back again [Amelia]
+ + slideshow media control (i#91250) [Thorsten]
+ + allow to insert SVGs into documents [Thorsten]
+ + shrink font automatically in text boxes in Impress [Thorsten]
+ + Macro Nudge, 10x nudge function (i#91249, bnc#188199) [Thorsten]
+ + speed up:
+ + don't lstat() that much while creating absolute URLs [Kendy]
+ fixes:
+ lots improvements in the SVG import filter [Thorsten, Fridrich]
+ lots fixes in the data pilot (i#83250, i#88473, i#88531) [Kohei]
+ lots improvements of the layout stuff [Jan]
- + "Animate attached Shape" checkbox (bnc#380036, i#69364) [Thorsten]
- + FREQUENCY function regression (i#88477) [Kohei]
+ + EMF+ import fixes (bnc#361534) [Thorsten, Radek]
+ better support for various formula syntax [Kohei]
- + escher export and linked graphics [Thorsten]
+ + FREQUENCY function regression (i#88477) [Kohei]
+ better highlighting of current row [Kohei]
- + printing crash (i#88818) [Thorsten]
- + opening a tab delimited CSV file (n#376473) [Kohei]
- + no source border when doing cut [n#367489] [Jon]
+ + bin check for incompatible ODF version {Kohei]
+ + no source border when doing cut [bnc#367489] [Jon]
+ + opening a tab delimited CSV file (bnc#376473) [Kohei]
+ undefined behavior of SbUnoObject (i#88930) [Julian, Kohei]
+ tab color of selected and unselected sheets (bnc#386029) [Kohei]
+ allow special characters in sheet names (i#6087) [Caolan, Kohei]
- + bin check for incompatible ODF version {Kohei]
- + warn when inserting a linked graphic (bnc#348149) [Thorsten]
+ + INDIRECT and Text as numbers calculation error (bnc#391330) [Kohei]
+ + center content when toggling merge cells (bnc#398243, lp#236378) [Kohei]
+ + column/row breaks and fit to x pages (bnc#404232, bnc#404563) [Kohei]
+ + rename the obsolete SFX_NOTIFY to Notify (i#89804) [Kohei]
+ + move cell notes with the anchored cells (i#59745) [Yun]
+ better fix for the rounding problems (i#86775) [Kohei]
-
+ + cutting cell and moving cursor (bnc#388770) [Jon]
+ + page format in print preview (bnc#386052) [Jon]
+ + goalseek higher precision [Kohei]
+ + printing crash (i#88818) [Thorsten]
+ + escher export and linked graphics [Thorsten]
+ + warn when inserting a linked graphic (bnc#348149) [Thorsten]
+ + deselected inplace OLE objects (i#89283, bnc#384506) [Thorsten]
+ + easy moving of Draw/Impress text frames (bnc#384563) [Thorsten]
+ + honour XDG_CONFIG_HOME environment variable (i#91247) [Thorsten]
+ + "Animate attached Shape" check box (bnc#380036, i#69364) [Thorsten]
+ + hidden slides in custom slideshow (bnc#355638, i#90145) [Thorsten]
+ + hyperlinks with numeric slide names (bnc#355674, i#55224) [Radek]
+ + handle multipart object records (bnc#385338) [Radek]
+ + animated BMP in slideshow fix
+ + ODF import crasher (i#90562) [Florian]
+ + export to MS Word Doc crasher (bnc#391197) [Fridrich]
+ + documents with form fields crasher (bnc#390953) [Petr, Florian]
+ + better conformance to DIS26300 (ODF) (bnc#396280) [Florian]
+ + object positioning in tables (bnc#367341, i#18732) [Florian]
+ + Word document set to Read Only (i#90306) [Caolan, Rene]
+ + title style cannot set alignment (i#23221) [Thorsten]
+ + PNG import crasher [Thorsten]
+ + WebDAV locking timeout (bnc#403724) [Kendy]
+ + do not enable OOo open dialogs unwillingly [Kendy]
+ + fixed crash in RandR (bnc#398244, i#90809) [Thorsten]
+ + unopkg --share when running OOo (i#86080) [Caolan, Chris]
+ + unopkg shows random localization (bnc#399101, i#90820) [Petr]
+ + checks for file locking and opengl on Ubuntu (lp#232160) [Chris]
+ + open document with trailing space in folder name (bnc#277603) [Tor]
+ + do not lost pictures added by drag and drop (bnc#348149) [Thorsten]
+ + allow to change broken java configuration (i#83140, bnc#393719) [Petr]
+ + bash completion for writer and master documents (bnc#257299) [Petr]
+ + copy/paste problem on special documents (i#89626) [Michel]
+ + mozilla plug-in crashes on x86_64 (i#82545) [Caolan, Rene]
+ + shrinked french localization (bnc#340679, i#89475) [Petr]
+ + loading and storing SMB hyperlinks (bnc#382718) [Kendy]
+ + hyperlinks without scheme (bnc#376389, i#91105) [Kendy]
+ + crash when calling the mono test case (i#90076) [Petr]
+ + avoid unnecessary dns lookup (bnc#389257) [Kendy]
+ + Chinese forbidden characters [Amelia]
+ + registry store crasher [Radek]
+ VBA bits:
- + more on user forms and even handling [Noel, Jiao]
+ + lots improvements of user forms and even handling [Noel, Jiao, Jon]
+ + workbook/worksheet events and event handle class [Fong]
+ + support multiple array indices (i#75443) [Andreas, Noel]
+ + Worksheet_SelectionChange event (bnc#388049) [Noel]
+ + delegate security check to the basic manager [Noel]
+ + PageSetup interface and PrintArea method [Fong]
+ crasher caused by the 3 layer system [Noel]
- + hyperlink service and interface [Fong]
+ brackets and array syntax handling [Noel]
- + workbook/worksheet events and event handle class [Fong]
+ + hyperlink service and interface [Fong]
+ non-working mediawiki extension [Noel]
- + Worksheet_SelectionChange event (bnc#388049) [Noel]
- + Win32 bits:
+ + switch on VBA import by default [Noel]
+ + myFunction Not bBool (bnc#397325) [Fong]
+ + empty types comparison (bnc#397438) [Fong]
+ + support Range.ShowDetail, Range.MergeArea [Fong]
+ + osx button names not imported (bnc#359933) [Noel]
++ Win32 bits:
+ + multi-lingual installer fixes (i#88638, i#88639, i#90116) [Tor]
+ + disable Cairo in the Win32 builds [Tor]
+ localize.pl and Cygwin pathnames [Tor]
- + disable cairo in the Win32 builds [Tor]
- + multi-lingual installer fixes (i#88638, i#88639) [Tor]
+ build with MSVS 2008 (MSVS9) [Tor]
+ + apply FedoreFixes section [Tor]
+ lots warning during build [Tor]
+ + fix gengal to work again [Jan]
+ + download instmsiw.exe [Tor]
+ + update Ant to 1.7.0 [Tor]
+ build bits:
+ + various build fixes [all]
+ build on s390 [Rene]
+ + always add openXML MIME types [Petr]
+ + use -Wl,--as-needed [Caolan, Petr, Kendy]
+ packaging of extensions that we build it [Rene, Thorsten]
- + variaous fixes [Michel, Rene, others]
- + updated Debian, Frugalware, Gentoo, Novell, Ubuntu bits [Rene, Miklos, Andreas, Petr, Michel]
+ + cws-extract for perl-5.10 on openSUSE-11.0 (i#90853) [Petr]
+ + updated Ark, Debian, Frugalware, Gentoo, GO-OO, Mandriva, Novell,
+ OxygenOffice, Ubuntu bits [Bernhard, Rene, Miklos, Andreas, Fridrich,
+ Michel, Petr, Fridrich, Thorsten, KAMI, Michel]
+ experimental:
- + support for MSVS 2008 (MSVS9)
+ + KDE4 support [Eric]
+ + build split [Michael]
ooo-build-2.4.0.7
Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo (original)
+++ trunk/bin/package-ooo Wed Jul 2 16:46:20 2008
@@ -522,13 +522,16 @@
if test "z$VENDORNAME" != "zDebian" ; then
echo "Moving package file lists..."
- # Nasty hack for now...
- echo "$OOINSTBASE/install-dict
- $OOINSTBASE/basis$VERSION/program/java-set-classpath
- %dir $OOINSTBASE/basis$VERSION/share/template/en-US/forms
- $OOINSTBASE/basis$VERSION/share/template/en-US/forms/resume.ott
- %dir $OOINSTBASE/basis$VERSION/share/template/en-US/officorr
- $OOINSTBASE/basis$VERSION/share/template/en-US/officorr/project-proposal.ott" > gid_Module_Root_Hack
+ # Nasty hacks for now...
+ echo "%dir $OOINSTBASE/basis$VERSION/share/template/en-US/forms
+ $OOINSTBASE/basis$VERSION/share/template/en-US/forms/resume.ott
+ %dir $OOINSTBASE/basis$VERSION/share/template/en-US/officorr
+ $OOINSTBASE/basis$VERSION/share/template/en-US/officorr/project-proposal.ott" >> gid_Module_Langpack_Basis_en_US
+
+ echo "%dir $OOINSTBASE
+ $OOINSTBASE/install-dict
+ $OOINSTBASE/basis$VERSION/program/java-set-classpath" > gid_Module_Root_Hack
+
test -f $OOINSTDIR/basis$VERSION/program/pyunorc-update64 && \
echo $OOINSTBASE/basis$VERSION/program/pyunorc-update64 >> gid_Module_Pyuno_Hack
@@ -685,8 +688,8 @@
# NLD subpackage
rm -f nld_list.txt
- mv_file_between_flists nld_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/openintro_nld.bmp
- mv_file_between_flists nld_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/openabout_nld.bmp
+ mv_file_between_flists nld_list.txt common_list.txt $OOINSTBASE/program/openintro_nld.bmp
+ mv_file_between_flists nld_list.txt common_list.txt $OOINSTBASE/program/openabout_nld.bmp
add_used_directories nld_list.txt common_list.txt
# mono subpackage
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Wed Jul 2 16:46:20 2008
@@ -925,7 +925,7 @@
# allow to define java target, so the build is usable with the JVM 1.4
# even when it is built with JDK 1.5
-#FIXME dev300-m10: build-java-target.diff, pmladek
+build-java-target.diff, pmladek
# 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 Wed Jul 2 16:46:20 2008
@@ -1,8 +1,8 @@
--- 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
-@@ -417,6 +417,17 @@
- or XML filters. Use --with-java=gij to enable gij/gcj
- as java/javac replacements
+@@ -573,6 +573,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)
+AC_ARG_WITH(java_target_version,
+[ --with-java-target-version Generate class files that will work on JVMs with
@@ -172,34 +172,120 @@
#classpath and response
.IF "$(JDK)" == "J++"
---- beanshell/bsh-2.0b1-src.patch.old 2005-12-21 12:36:35.000000000 +0100
-+++ beanshell/bsh-2.0b1-src.patch 2006-10-11 15:49:48.000000000 +0200
-@@ -1,5 +1,5 @@
--*** misc/BeanShell/build.xml Fri Dec 19 17:14:27 2003
----- misc/build/BeanShell/build.xml Mon May 30 15:47:00 2005
-+*** misc/BeanShell/build.xml 2003-12-19 17:14:27.000000000 +0100
-+--- misc/build/BeanShell/build.xml 2006-10-11 15:46:05.000000000 +0200
- ***************
- *** 17,23 ****
- up the build dir! It has to be done manually the first time (or put
-@@ -41,6 +41,17 @@
- <!-- Legacy excludes. Comment this *out* to build these legacy items -->
- <property name="legacy-excludes"
- value="bsh/JThis.java"/>
-+***************
-+*** 165,170 ****
-+--- 171,178 ----
-+ deprecation="${deprecation}"
-+ optimize="on"
-+ debug="off"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
-+ includes="**/*.java"
-+ excludes="${excludes},**/bak/**"
-+ >
- *** misc/BeanShell/makefile.mk Mon May 30 15:55:35 2005
- --- misc/build/BeanShell/makefile.mk Mon May 30 15:47:00 2005
- ***************
+--- 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 @@
@@ -324,120 +410,120 @@
+--- 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>
++
++ <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>
++
++ <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}"
-+ >
++ 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}"
-+ >
++ 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}"
-+ >
++ 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}"
-+ >
++ 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}"
-+ >
++ 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"
++ 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}"
-+ >
++ 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}"
-+ >
++ 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}"
-+ >
++ 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}"
++ >
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
@@ -682,9 +768,9 @@
+ debug="${debug}">
+ </javac>
+ <copy todir="${nest}/${classes}">
- *** misc/rhino1_5R5/src/org/mozilla/javascript/DefiningClassLoader.java Tue Mar 22 13:20:47 2005
- --- misc/build/rhino1_5R5/src/org/mozilla/javascript/DefiningClassLoader.java Tue Jul 4 14:59:43 2006
- ***************
+ --- 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
@@ -845,6 +931,75 @@
<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
+ PATCH_FILE_NAME=tomcat.patch
+
+ BUILD_DIR=jakarta-servletapi-5
+-BUILD_ACTION=$(ANT)
++BUILD_ACTION=$(ANT) $(ANT_JAVA_VER_FLAGS)
+
+ # --- 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>
++--- 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" />
--- 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 @@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
