0 files changed
New commits:
commit 7ca6c18c0eb268322c66728dcbdbc9a2229a9e7d
Author: Pedro Giffuni <p...@apache.org>
Date: Sat Jun 2 22:02:07 2018 +0000
Revert r1832747:
Drop references and the requirement for the StAX API.
The saxon build needs more care.
diff --git a/NOTICE b/NOTICE
index 1cdb073d5422..68d964b9fd9f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -135,6 +135,7 @@ As part of the base system this product also includes code
from the following
projects which are licensed under the Apache license:
- serf
- redland
+- StAX
The notices from these projects are following:
@@ -148,6 +149,10 @@ This product includes Redland software (http://librdf.org/)
developed at the Institute for Learning and Research Technology,
University of Bristol, UK (http://www.bristol.ac.uk/).
+
+StAX
+[no notices]
+
____
This product includes software developed by the OpenSSL Project
diff --git a/external_deps.lst b/external_deps.lst
index 7753870b8ab3..4243d5be5c0e 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -187,6 +187,12 @@ if (SOLAR_JAVA == TRUE)
URL1 =
http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+if (SOLAR_JAVA == TRUE)
+ MD5 = 980143f96b3f6ce45d2e4947da21a5e9
+ name = stax-src-1.2.0.zip
+ URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
+ URL2 = http://maven.ibiblio.org/maven/stax/jars/stax-src-1.2.0.zip
+
if (ENABLE_MEDIAWIKI == YES)
MD5 = a7983f859eafb2677d7ff386a023bc40
name = xsltml_2.1.2.zip
diff --git a/saxon/prj/build.lst b/saxon/prj/build.lst
index de579a047406..813097c66d90 100644
--- a/saxon/prj/build.lst
+++ b/saxon/prj/build.lst
@@ -1,2 +1,2 @@
-xx saxon : solenv NULL
+xx saxon : solenv stax NULL
xx saxon nmake - all xx_saxon NULL
diff --git a/saxon/saxon-9.0.0.7-bj.patch b/saxon/saxon-9.0.0.7-bj.patch
index c04d69c9d1c8..157ed004c2ef 100644
--- a/saxon/saxon-9.0.0.7-bj.patch
+++ b/saxon/saxon-9.0.0.7-bj.patch
@@ -1,6 +1,6 @@
--- misc/src/build.xml 2008-07-11 12:11:50.079281000 +0200
+++ misc/build/src/build.xml 2008-07-11 12:17:29.848740000 +0200
-@@ -1 +1,1020 @@
+@@ -1 +1,1027 @@
-dummy
+<?xml version="1.0" encoding="UTF-8"?>
+
@@ -170,6 +170,13 @@
+ <property name="source-samples-n.dir" value="${vss-n.dir}"/>
+ -->
+
++ <property name="solar.bin" value="${solarbindir}"/>
++ <path id="classpath-j">
++ <fileset dir="${solar.bin}">
++ <include name="stax-1.2.0.jar"/>
++ </fileset>
++ </path>
++
+ <path id="classpath-n">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
diff --git a/set_soenv.in b/set_soenv.in
index 854cac9e3ccd..b4acb948299e 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -2007,6 +2007,7 @@ ToFile( "RAT_JAR_HOME", "@RAT_JAR_HOME@", "e" );
ToFile( "DMAKE_URL", "@DMAKE_URL@", "e" );
ToFile( "DMAKE_PATH", "@DMAKE_PATH@", "e" );
ToFile( "IS_SYSTEM_DMAKE", "@IS_SYSTEM_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" );
diff --git a/stax/download/README_stax-1.2.0.jar.txt
b/stax/download/README_stax-1.2.0.jar.txt
new file mode 100644
index 000000000000..c2f4365afbac
--- /dev/null
+++ b/stax/download/README_stax-1.2.0.jar.txt
@@ -0,0 +1,13 @@
+The JSR173 is the XML pull API used at build time for the Saxon-B
+XSLT processor: it has become part of OpenJDK 6.
+
+When using an older JDK, you can get the API from
+ http://dist.codehaus.org/stax/jars/
+located at the StAX Home site
+ http://stax.codehaus.org/
+and put it under stax/download.
+
+1.2 Release(final) is available under the Apache License 2.0.
+
+Checksum (for reference):
+MD5 (stax-1.2.0.jar) = aa3439d235f7d999532b66bac56c1f87
diff --git a/stax/makefile.mk b/stax/makefile.mk
new file mode 100644
index 000000000000..145e787cedba
--- /dev/null
+++ b/stax/makefile.mk
@@ -0,0 +1,74 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=.
+
+PRJNAME=stax
+TARGET=stax
+USE_JAVAVER=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+.INCLUDE : antsettings.mk
+
+.IF "$(SOLAR_JAVA)" != ""
+.IF "$(JAVANUMVER:s/.//)" >= "000100060000" || "$(JDK)"=="gcj"
+all:
+ @echo "Your java version already contains StAX"
+.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100060000"
+.IF "$(SYSTEM_SAXON)" == "YES"
+all:
+ @echo "An already available installation of saxon should exist on your
system."
+ @echo "Therefore the files provided here does not need to be built in
addition."
+.ENDIF
+
+.IF "$(BUILD_STAX)" != "YES"
+
+$(OUT)$/class$/stax-1.2.0.jar : $(PRJ)$/download$/stax-1.2.0.jar
+ +$(COPY) $< $@
+
+.ELSE # "$(BUILD_STAX)" != "YES"
+
+# --- Files --------------------------------------------------------
+TARFILE_NAME=stax-src-1.2.0
+TARFILE_MD5=980143f96b3f6ce45d2e4947da21a5e9
+TARFILE_ROOTDIR=src
+
+BUILD_ACTION=$(JAVAC) javax$/xml$/stream$/*.java && jar -cf stax-1.2.0.jar
javax$/xml$/stream$/*.class javax$/xml$/stream$/events$/*.class
javax$/xml$/stream$/util$/*.class
+
+OUT2CLASS=stax-1.2.0.jar
+.ENDIF # "$(BUILD_STAX)" != "YES"
+
+.ELSE # $(SOLAR_JAVA)!= ""
+nojava:
+ @echo "Not building $(PRJNAME) because Java is disabled"
+.ENDIF # $(SOLAR_JAVA)!= ""
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.IF "$(SOLAR_JAVA)" != ""
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/stax/prj/build.lst b/stax/prj/build.lst
new file mode 100644
index 000000000000..cbfc6ea3ba6a
--- /dev/null
+++ b/stax/prj/build.lst
@@ -0,0 +1,2 @@
+tx stax : solenv NULL
+tx stax nmake - all tx_stax NULL
diff --git a/stax/prj/d.lst b/stax/prj/d.lst
new file mode 100644
index 000000000000..4345d5b8844c
--- /dev/null
+++ b/stax/prj/d.lst
@@ -0,0 +1 @@
+..\%__SRC%\class\stax*.jar %_DEST%\bin%_EXT%
commit ef7015b64f6884088f634e24abf2efdd6092796d
Author: Pedro Giffuni <p...@apache.org>
Date: Sat Jun 2 21:25:36 2018 +0000
Drop references and the requirement for the StAX API.
The StAX API was a requirement to build saxon however, long ago StAX
became part of the Java API[1], so in practice we are not using StAX
as a separate tarball at all.
No functional change intended.
Huge thanks to AdfinisSygroup that maintained the opengrok service for so
long. These type of changes would have been much more difficult without
the service.
[1]
https://docs.oracle.com/javase/tutorial/jaxp/stax/why.html
diff --git a/NOTICE b/NOTICE
index 68d964b9fd9f..1cdb073d5422 100644
--- a/NOTICE
+++ b/NOTICE
@@ -135,7 +135,6 @@ As part of the base system this product also includes code
from the following
projects which are licensed under the Apache license:
- serf
- redland
-- StAX
The notices from these projects are following:
@@ -149,10 +148,6 @@ This product includes Redland software (http://librdf.org/)
developed at the Institute for Learning and Research Technology,
University of Bristol, UK (http://www.bristol.ac.uk/).
-
-StAX
-[no notices]
-
____
This product includes software developed by the OpenSSL Project
diff --git a/external_deps.lst b/external_deps.lst
index 4243d5be5c0e..7753870b8ab3 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -187,12 +187,6 @@ if (SOLAR_JAVA == TRUE)
URL1 =
http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-if (SOLAR_JAVA == TRUE)
- MD5 = 980143f96b3f6ce45d2e4947da21a5e9
- name = stax-src-1.2.0.zip
- URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL2 = http://maven.ibiblio.org/maven/stax/jars/stax-src-1.2.0.zip
-
if (ENABLE_MEDIAWIKI == YES)
MD5 = a7983f859eafb2677d7ff386a023bc40
name = xsltml_2.1.2.zip
diff --git a/saxon/prj/build.lst b/saxon/prj/build.lst
index 813097c66d90..de579a047406 100644
--- a/saxon/prj/build.lst
+++ b/saxon/prj/build.lst
@@ -1,2 +1,2 @@
-xx saxon : solenv stax NULL
+xx saxon : solenv NULL
xx saxon nmake - all xx_saxon NULL
diff --git a/saxon/saxon-9.0.0.7-bj.patch b/saxon/saxon-9.0.0.7-bj.patch
index 157ed004c2ef..c04d69c9d1c8 100644
--- a/saxon/saxon-9.0.0.7-bj.patch
+++ b/saxon/saxon-9.0.0.7-bj.patch
@@ -1,6 +1,6 @@
--- misc/src/build.xml 2008-07-11 12:11:50.079281000 +0200
+++ misc/build/src/build.xml 2008-07-11 12:17:29.848740000 +0200
-@@ -1 +1,1027 @@
+@@ -1 +1,1020 @@
-dummy
+<?xml version="1.0" encoding="UTF-8"?>
+
@@ -170,13 +170,6 @@
+ <property name="source-samples-n.dir" value="${vss-n.dir}"/>
+ -->
+
-+ <property name="solar.bin" value="${solarbindir}"/>
-+ <path id="classpath-j">
-+ <fileset dir="${solar.bin}">
-+ <include name="stax-1.2.0.jar"/>
-+ </fileset>
-+ </path>
-+
+ <path id="classpath-n">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
diff --git a/set_soenv.in b/set_soenv.in
index b4acb948299e..854cac9e3ccd 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -2007,7 +2007,6 @@ ToFile( "RAT_JAR_HOME", "@RAT_JAR_HOME@", "e" );
ToFile( "DMAKE_URL", "@DMAKE_URL@", "e" );
ToFile( "DMAKE_PATH", "@DMAKE_PATH@", "e" );
ToFile( "IS_SYSTEM_DMAKE", "@IS_SYSTEM_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" );
diff --git a/stax/download/README_stax-1.2.0.jar.txt
b/stax/download/README_stax-1.2.0.jar.txt
deleted file mode 100644
index c2f4365afbac..000000000000
--- a/stax/download/README_stax-1.2.0.jar.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-The JSR173 is the XML pull API used at build time for the Saxon-B
-XSLT processor: it has become part of OpenJDK 6.
-
-When using an older JDK, you can get the API from
- http://dist.codehaus.org/stax/jars/
-located at the StAX Home site
- http://stax.codehaus.org/
-and put it under stax/download.
-
-1.2 Release(final) is available under the Apache License 2.0.
-
-Checksum (for reference):
-MD5 (stax-1.2.0.jar) = aa3439d235f7d999532b66bac56c1f87
diff --git a/stax/makefile.mk b/stax/makefile.mk
deleted file mode 100644
index 145e787cedba..000000000000
--- a/stax/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=.
-
-PRJNAME=stax
-TARGET=stax
-USE_JAVAVER=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : antsettings.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-.IF "$(JAVANUMVER:s/.//)" >= "000100060000" || "$(JDK)"=="gcj"
-all:
- @echo "Your java version already contains StAX"
-.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100060000"
-.IF "$(SYSTEM_SAXON)" == "YES"
-all:
- @echo "An already available installation of saxon should exist on your
system."
- @echo "Therefore the files provided here does not need to be built in
addition."
-.ENDIF
-
-.IF "$(BUILD_STAX)" != "YES"
-
-$(OUT)$/class$/stax-1.2.0.jar : $(PRJ)$/download$/stax-1.2.0.jar
- +$(COPY) $< $@
-
-.ELSE # "$(BUILD_STAX)" != "YES"
-
-# --- Files --------------------------------------------------------
-TARFILE_NAME=stax-src-1.2.0
-TARFILE_MD5=980143f96b3f6ce45d2e4947da21a5e9
-TARFILE_ROOTDIR=src
-
-BUILD_ACTION=$(JAVAC) javax$/xml$/stream$/*.java && jar -cf stax-1.2.0.jar
javax$/xml$/stream$/*.class javax$/xml$/stream$/events$/*.class
javax$/xml$/stream$/util$/*.class
-
-OUT2CLASS=stax-1.2.0.jar
-.ENDIF # "$(BUILD_STAX)" != "YES"
-
-.ELSE # $(SOLAR_JAVA)!= ""
-nojava:
- @echo "Not building $(PRJNAME) because Java is disabled"
-.ENDIF # $(SOLAR_JAVA)!= ""
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-.ENDIF
-
diff --git a/stax/prj/build.lst b/stax/prj/build.lst
deleted file mode 100644
index cbfc6ea3ba6a..000000000000
--- a/stax/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-tx stax : solenv NULL
-tx stax nmake - all tx_stax NULL
diff --git a/stax/prj/d.lst b/stax/prj/d.lst
deleted file mode 100644
index 4345d5b8844c..000000000000
--- a/stax/prj/d.lst
+++ /dev/null
@@ -1 +0,0 @@
-..\%__SRC%\class\stax*.jar %_DEST%\bin%_EXT%
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
