Merge branch 'master' into feature/killsdf

Conflicts:
Makefile.top
Module_tail_build.mk
RepositoryExternal.mk
RepositoryFixes.mk
accessibility/source/standard/vclxaccessibletoolbox.cxx
basic/source/uno/dlgcont.cxx
connectivity/Library_ado.mk
cross_tail_build/prj/build.lst
desktop/source/offacc/acceptor.cxx
filter/Library_PptImporter.mk
filter/source/t602/filterenv.cxx
i18npool/Library_textconv_dict.mk
ooo.lst.in
saxon/ExternalProject_saxon.mk
saxon/build.xml
sc/sdi/scalc.sdi
sc/source/filter/xml/xmlstyli.cxx
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatmgr.cxx
sc/source/ui/view/cellsh1.cxx
sdext/source/pdfimport/misc/pwdinteract.cxx
shell/qa/zip/makefile.mk
shell/qa/zip/testimpl/makefile.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/android.mk
solenv/gbuild/platform/com_GCC_defs.mk
solenv/gbuild/platform/macosx.mk
soltools/Executable_adjustvisibility.mk
soltools/Executable_checkdll.mk
soltools/Executable_cpp.mk
soltools/Executable_javadep.mk
soltools/Executable_makedepend.mk
sw/qa/extras/rtfimport/rtfimport.cxx
tail_build/prj/build.lst
tomcat/ExternalProject_tomcat.mk
ucb/source/ucp/webdav/webdavcontent.cxx
xml2cmp/Executable_xml2cmp.mk

2 files changed, 10 insertions, 20 deletions

diff --git a/saxon/ExternalProject_saxon.mk b/saxon/ExternalProject_saxon.mk
index 03f0b94436fa..8d31d58f505c 100644
--- a/saxon/ExternalProject_saxon.mk
+++ b/saxon/ExternalProject_saxon.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,saxon,\
 $(call gb_ExternalProject_get_state_target,saxon,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,saxon)" && \
 	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
-	"$(ANT)" \
+	$(ICECREAM_RUN) "$(ANT)" \
 		-q \
 		-f build.xml \
 		-Dbuild.label="build-libreoffice" \
@@ -28,11 +28,10 @@ $(call gb_ExternalProject_get_state_target,saxon,build) :
 		)\
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 		) \
+		-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 		$(if $(debug),-Dbuild.debug="on") \
-		-Dsolarbindir=$(SOLARBINDIR) jar-bj && \
+		-Dsolarbindir=$(OUTDIR)/bin jar-bj && \
 	touch $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/saxon/build.xml b/saxon/build.xml
index c9026f7778ea..954bc82ad740 100644
--- a/saxon/build.xml
+++ b/saxon/build.xml
@@ -139,10 +139,7 @@
     <property name="build.debuglevel" value="source,lines,vars"/>
     <property name="build.deprecation" value="true"/>
     <property name="build.optimize" value="true"/>
-    <property name="build.compiler.source" value="1.4"/>
-    <property name="build.compiler.target" value="1.4"/>
-    <property name="build.s9api.compiler.source" value="1.5"/>
-    <property name="build.s9api.compiler.target" value="1.5"/>
+    <property name="build.compiler.source" value="1.5"/>
     <property name="build.compress" value="false"/>
 
     <!-- following properties can be switched to determine whether to build from patch source
@@ -380,8 +377,7 @@ http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl
         <mkdir dir="${classes-j.dir}"/>
         <javac encoding="ISO-8859-1" debug="${build.debug}" debuglevel="${build.debuglevel}"
             deprecation="${build.deprecation}" destdir="${classes-j.dir}"
-            optimize="${build.optimize}" srcdir="${temp-src-j.dir}" source="${build.compiler.source}"
-            target="${build.compiler.target}">
+            optimize="${build.optimize}" srcdir="${temp-src-j.dir}" source="${build.compiler.source}">
 
             <include name="net/**"/>
             <exclude name="**/dom/**"/>
@@ -408,8 +404,7 @@ http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl
         <mkdir dir="${classes-j.dir}"/>
         <javac debug="${build.debug}"  debuglevel="${build.debuglevel}"
             deprecation="${build.deprecation}" destdir="${classes-j.dir}"
-            optimize="${build.optimize}" srcdir="${temp-src-j.dir}" source="${build.compiler.source}"
-            target="${build.compiler.target}">
+            optimize="${build.optimize}" srcdir="${temp-src-j.dir}" source="${build.compiler.source}">
 
             <include name="com/saxonica/**"/>
             <include name="net/sf/saxon/ant/**"/>
@@ -427,8 +422,7 @@ http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl
              it will be compiled in 1.5 mode because the classes are referenced from the s9api package -->
         <javac debug="${build.debug}" debuglevel="${build.debuglevel}"
             deprecation="${build.deprecation}" destdir="${classes-j.dir}"
-            optimize="${build.optimize}" srcdir="${temp-src-j.dir}" source="${build.s9api.compiler.source}"
-            target="${build.s9api.compiler.target}">
+            optimize="${build.optimize}" srcdir="${temp-src-j.dir}" source="${build.compiler.source}">
 
             <include name="**/s9api/**"/>
             <classpath>
@@ -441,8 +435,7 @@ http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl
         <mkdir dir="${classes-n.dir}"/>
         <javac debug="${build.debug}" debuglevel="${build.debuglevel}"
             deprecation="${build.deprecation}" destdir="${classes-n.dir}"
-            optimize="${build.optimize}" srcdir="${temp-src-nj.dir}" source="${build.compiler.source}"
-            target="${build.compiler.target}">
+            optimize="${build.optimize}" srcdir="${temp-src-nj.dir}" source="${build.compiler.source}">
 
             <include name="net/**"/>
             <exclude name="**/s9api/**"/>
@@ -456,8 +449,7 @@ http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl
         <mkdir dir="${classes-n.dir}"/>
         <javac debug="${build.debug}"  debuglevel="${build.debuglevel}"
             deprecation="${build.deprecation}" destdir="${classes-n.dir}"
-            optimize="${build.optimize}" srcdir="${temp-src-nj.dir}" source="${build.compiler.source}"
-            target="${build.compiler.target}">
+            optimize="${build.optimize}" srcdir="${temp-src-nj.dir}" source="${build.compiler.source}">
 
             <include name="com/saxonica/**"/>
             <exclude name="com/saxonica/validate/JavaVerifier.java"/>
@@ -789,8 +781,7 @@ http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl
                         <javac debug="true" debuglevel="source, lines"
                               destdir="${product.dir}/resources/samples/java/classes"
             srcdir="${product.dir}/resources/samples/java"
-            source="${build.compiler.source}"
-            target="${build.compiler.target}">
+            source="${build.compiler.source}">
         <include name="*.java"/>
         <classpath>
             <path refid="classpath-samples"/>