diff options
| author | Andreas Beeker <kiwiwings@apache.org> | 2020-05-07 10:27:52 +0000 |
|---|---|---|
| committer | Andreas Beeker <kiwiwings@apache.org> | 2020-05-07 10:27:52 +0000 |
| commit | 23337fa03daf1616d4eb314f309bf8d1f20d2206 (patch) | |
| tree | b2d4cd0f60e7241fec840c24318def83931142e7 /src/integrationtest | |
| parent | e1621cdca0f596c1c61720d434a1f85fbfecb869 (diff) | |
| download | poi-23337fa03daf1616d4eb314f309bf8d1f20d2206.tar.gz poi-23337fa03daf1616d4eb314f309bf8d1f20d2206.zip | |
fix errors due to new lib structure
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1877466 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/integrationtest')
| -rw-r--r-- | src/integrationtest/build.xml | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/src/integrationtest/build.xml b/src/integrationtest/build.xml index a228a22374..e81a47476f 100644 --- a/src/integrationtest/build.xml +++ b/src/integrationtest/build.xml @@ -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> |