You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2018/07/21 10:28:53 UTC
svn commit: r1836402 - in /poi:
site/src/documentation/resources/images/support-asf.png trunk/build.xml
Author: kiwiwings
Date: Sat Jul 21 10:28:53 2018
New Revision: 1836402
URL: http://svn.apache.org/viewvc?rev=1836402&view=rev
Log:
replaced forrest ant integration with ant invocation - copying xml-resolver.jar in $ANT_HOME/lib isn't necessary anymore
Modified:
poi/site/src/documentation/resources/images/support-asf.png
poi/trunk/build.xml
Modified: poi/site/src/documentation/resources/images/support-asf.png
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/resources/images/support-asf.png?rev=1836402&r1=1836401&r2=1836402&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1836402&r1=1836401&r2=1836402&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sat Jul 21 10:28:53 2018
@@ -24,9 +24,7 @@ under the License.
updated to forrest 0.9:
To build the documentation you will need to install forrest and set
- the FORREST_HOME environment variable. Forrest 0.9 required.
- check https://forrest.apache.org/docs_0_90/your-project.html#invoking_from_ant
- TODO: cp forrest/lib/core/xml-commons-resolver-*.jar $ANT_HOME/lib
+ the FORREST_HOME environment variable.
Since POI 4.0 you will need JDK 1.8 or newer to build and run POI.
@@ -56,13 +54,6 @@ under the License.
<property name="ooxml.lib" location="ooxml-lib"/>
<property name="compile.lib" location="compile-lib"/>
- <!-- apache forrest settings -->
- <property name="forrest.home" location="${env.FORREST_HOME}"/>
- <property name="project.home" location="."/>
- <!--<property name="project.build-dir" location="build"/>-->
- <!--<property name="project.site" value="tmp/site"/>-->
- <import file="${env.FORREST_HOME}/main/forrest.build.xml"/>
-
<!-- compiler options options -->
<property name="jdk.version.source" value="1.8" description="JDK version of source code"/>
<property name="jdk.version.class" value="1.8" description="JDK version of generated class files"/>
@@ -1757,9 +1748,11 @@ under the License.
<fail message="Apache Forrest is not installed."/>
</target>
- <target name="docs" depends="init, -check-forrest-installed, -check-docs, check-java-version, init-props, init-skins, init-plugins, site, javadocs"
+ <target name="docs" depends="init, -check-forrest-installed, -check-docs, javadocs"
unless="main.docs.notRequired" description="Builds the POI website">
+ <exec executable="${env.FORREST_HOME}/bin/forrest"/>
+
<echo>Broken links:</echo>
<echo file="${build.site}/../tmp/brokenlinks.xml"/>
@@ -2111,7 +2104,7 @@ under the License.
</mvn:mvn>
</target>
- <target name="dist" depends="clean, compile-all, test-all, rat-check, forbidden-apis-check, site, jar, release-notes, assemble"
+ <target name="dist" depends="clean, compile-all, test-all, rat-check, forbidden-apis-check, docs, jar, release-notes, assemble"
description="Creates the entire distribution into build/dist, from scratch">
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org