pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix errors due to new lib structure

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1877466 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2020-05-07 10:27:52 +00:00
parent e1621cdca0
commit 23337fa03d
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/integrationtest/build.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.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
@ -20,7 +20,7 @@ under the License.
<project name="POI Testbuild" default="run" basedir=".">
<description>Test-Ant file which verifies that the Apache POI distribution build sources can be compiled successfully.
Before running this, you should execute the "assemble" target in the main build.xml to have the packaged files created correctly.
</description>
@ -63,17 +63,9 @@ Before running this, you should execute the "assemble" target in the main build.
<!-- copy over required libs to avoid re-downloading them always -->
<mkdir dir="${dirversion}/lib"/>
<mkdir dir="${dirversion}/ooxml-lib"/>
<mkdir dir="${dirversion}/compile-lib"/>
<copy todir="${dirversion}/lib">
<fileset dir="../../lib"/>
</copy>
<copy todir="${dirversion}/ooxml-lib">
<fileset dir="../../ooxml-lib"/>
</copy>
<copy todir="${dirversion}/compile-lib">
<fileset dir="../../compile-lib"/>
</copy>
<!-- finally call Ant on the extracted source to check if we can build the packages -->
<echo message="Building in temporary dir ${dirversion}/"/>
@ -115,21 +107,17 @@ Before running this, you should execute the "assemble" target in the main build.
<echo message="Found jar packages at ${jarpackage}, dist: ${dist}"/>
<path id="libs">
<fileset dir="../../lib">
<fileset dir="../../lib/main" includes="*.jar"/>
<fileset dir="../../lib/ooxml" includes="*.jar"/>
<fileset dir="../../lib/main-tests">
<include name="junit*.jar"/>
<include name="commons-compress*.jar"/>
</fileset>
<fileset dir="../../ooxml-lib">
<include name="ooxml-schemas-*.jar"/>
<include name="xmlbeans-3.*.jar"/>
<exclude name="xmlbeans-2.*.jar"/>
</fileset>
</path>
<echo message="Compiling examples without linking to scratchpad.jar to ensure that only some specific ones require this jar"/>
<javac srcdir="../examples/src" destdir="${build}"
<javac srcdir="../examples/src" destdir="${build}"
target="1.8" source="1.8" debug="true"
encoding="ASCII" fork="yes" includeantruntime="false"
encoding="ASCII" fork="yes" includeantruntime="false"
excludes="org/apache/poi/hslf/**,org/apache/poi/hsmf/**,**/EmbeddedObjects.java,**/EmeddedObjects.java,**/LoadEmbedded.java,**/Word2Forrest.java"
classpath="${jarpackage}" classpathref="libs">
</javac>
@ -151,9 +139,9 @@ Before running this, you should execute the "assemble" target in the main build.
</pathconvert>
<echo message="Compiling all examples with the additional scratchpad.jar"/>
<javac srcdir="../examples/src" destdir="${build}"
<javac srcdir="../examples/src" destdir="${build}"
target="1.8" source="1.8" debug="true"
encoding="ASCII" fork="yes" includeantruntime="false"
encoding="ASCII" fork="yes" includeantruntime="false"
classpath="${jarpackagescratchpad}" classpathref="libs">
</javac>
</target>