aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.xml9
-rw-r--r--src/integrationtest/build.xml2
2 files changed, 9 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index 80f11a3e5e..6a189f602e 100644
--- a/build.xml
+++ b/build.xml
@@ -1958,8 +1958,11 @@ under the License.
<mappedresources cache="true">
<fileset dir="." excludes="build/**,
dist*/**,
- maven/**,
lib/**,
+ bin/**,
+ out/**,
+ sonar/**/target/**,
+ sonar/*/src/**,
compile-lib/**,
ooxml-lib/**,
scripts/**,
@@ -1970,6 +1973,10 @@ under the License.
*.lnk,
*.rdf,
*.swp,
+ *.launch,
+ *.log,
+ .gradle/**,
+ .idea/**,
.settings/**,
.classpath,
.settings/**,
diff --git a/src/integrationtest/build.xml b/src/integrationtest/build.xml
index 8409e5354d..6af90e77b5 100644
--- a/src/integrationtest/build.xml
+++ b/src/integrationtest/build.xml
@@ -77,7 +77,7 @@ Before running this, you should execute the "assemble" target in the main build.
<!-- finally call Ant on the extracted source to check if we can build the packages -->
<echo message="Building in temporary dir ${dirversion}/"/>
- <ant dir="${dirversion}" target="jar" inheritAll="false" inheritRefs="false" useNativeBasedir="true"/>
+ <ant dir="${dirversion}" target="assemble" inheritAll="false" inheritRefs="false" useNativeBasedir="true"/>
</target>
<target name="runCompileTest" depends="init" description="Verify that we can compile most examples without including excelant or scratchpad jars">