openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1832749 - in /openoffice/trunk/main: NOTICE configure.ac external_deps.lst saxon/prj/build.lst saxon/saxon-9.0.0.7-bj.patch set_soenv.in stax/
Date Sat, 02 Jun 2018 22:02:07 GMT
Author: pfg
Date: Sat Jun  2 22:02:07 2018
New Revision: 1832749

URL: http://svn.apache.org/viewvc?rev=1832749&view=rev
Log:
Revert r1832747:
Drop references and the requirement for the StAX API.

The saxon build needs more care.

Added:
    openoffice/trunk/main/stax/
      - copied from r1832746, openoffice/trunk/main/stax/
Modified:
    openoffice/trunk/main/NOTICE
    openoffice/trunk/main/configure.ac
    openoffice/trunk/main/external_deps.lst
    openoffice/trunk/main/saxon/prj/build.lst
    openoffice/trunk/main/saxon/saxon-9.0.0.7-bj.patch
    openoffice/trunk/main/set_soenv.in

Modified: openoffice/trunk/main/NOTICE
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/NOTICE?rev=1832749&r1=1832748&r2=1832749&view=diff
==============================================================================
--- openoffice/trunk/main/NOTICE (original)
+++ openoffice/trunk/main/NOTICE Sat Jun  2 22:02:07 2018
@@ -135,6 +135,7 @@ As part of the base system this product
 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 (
 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

Modified: openoffice/trunk/main/configure.ac
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1832749&r1=1832748&r2=1832749&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Sat Jun  2 22:02:07 2018
@@ -3646,6 +3646,19 @@ fi
 AC_SUBST(GPERF)
 
 dnl ===================================================================
+dnl Check for building stax
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build the stax])
+if test -f "./stax/download/stax-1.2.0.jar"; then
+   BUILD_STAX=NO
+   AC_MSG_RESULT([no, will use the prebuilt stax/download/stax-1.2.0.jar])
+else
+   BUILD_STAX=YES
+   AC_MSG_RESULT([yes])
+fi
+AC_SUBST(BUILD_STAX)
+
+dnl ===================================================================
 dnl Check for building ODK
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build the ODK])

Modified: openoffice/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1832749&r1=1832748&r2=1832749&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Sat Jun  2 22:02:07 2018
@@ -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

Modified: openoffice/trunk/main/saxon/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/saxon/prj/build.lst?rev=1832749&r1=1832748&r2=1832749&view=diff
==============================================================================
--- openoffice/trunk/main/saxon/prj/build.lst (original)
+++ openoffice/trunk/main/saxon/prj/build.lst Sat Jun  2 22:02:07 2018
@@ -1,2 +1,2 @@
-xx	saxon	:	solenv NULL
+xx	saxon	:	solenv stax NULL
 xx	saxon	nmake	-	all	xx_saxon NULL

Modified: openoffice/trunk/main/saxon/saxon-9.0.0.7-bj.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/saxon/saxon-9.0.0.7-bj.patch?rev=1832749&r1=1832748&r2=1832749&view=diff
==============================================================================
--- openoffice/trunk/main/saxon/saxon-9.0.0.7-bj.patch (original)
+++ openoffice/trunk/main/saxon/saxon-9.0.0.7-bj.patch Sat Jun  2 22:02:07 2018
@@ -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"/>

Modified: openoffice/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1832749&r1=1832748&r2=1832749&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Sat Jun  2 22:02:07 2018
@@ -2007,6 +2007,7 @@ ToFile( "RAT_JAR_HOME",      "@RAT_JAR_H
 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" );



Mime
View raw message