From da4bc855e8318da17645bae798b4bdf6bb68e1b2 Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Tue, 6 Apr 2021 06:11:16 +0000
Subject: [PATCH] Switch the Ant-build to separate folders under
 "build/classes"

This avoids colliding in strange ways with the default Gradle location "build/classes/main/java"

This caused very strange error messages about invalid package names when compiling with Gradle and Ant in one source checkout

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1888422 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index a9e0cd598c..221f22491d 100644
--- a/build.xml
+++ b/build.xml
@@ -120,7 +120,7 @@ under the License.
     <property name="main.src.test" location="main/src/test/java"/>
     <property name="main.resources.test" location="main/src/test/resources"/>
     <property name="main.documentation" value="src/documentation"/>
-    <property name="main.output.dir" location="main/build/classes"/>
+    <property name="main.output.dir" location="main/build/classes/ant/java"/>
     <property name="main.output.test.dir" location="main/build/test-classes"/>
     <property name="main.reports.test" location="main/build/test-results"/>
     <property name="main.testokfile" location="main/build/testokfile.txt"/>
@@ -134,13 +134,13 @@ under the License.
     <property name="scratchpad.src.test" location="scratchpad/src/test/java"/>
     <property name="scratchpad.resources.test" location="scratchpad/src/main/resources"/>
     <property name="scratchpad.reports.test" location="scratchpad/build/test-results"/>
-    <property name="scratchpad.output.dir" location="scratchpad/build/classes"/>
+    <property name="scratchpad.output.dir" location="scratchpad/build/classes/ant/java"/>
     <property name="scratchpad.output.test.dir" location="scratchpad/build/test-classes"/>
     <property name="scratchpad.testokfile" location="scratchpad/build/testokfile.txt"/>
 
     <!-- Examples: -->
     <property name="examples.src" location="examples/src/main/java"/>
-    <property name="examples.output.dir" location="examples/build/classes"/>
+    <property name="examples.output.dir" location="examples/build/classes/ant/java"/>
 
     <!-- OOXML support: -->
     <property name="ooxml.src" location="ooxml/src/main/java"/>
@@ -148,7 +148,7 @@ under the License.
     <property name="ooxml.src.test" location="ooxml/src/test/java"/>
     <property name="ooxml.resources.test" location="ooxml/src/test/resources"/>
     <property name="ooxml.reports.test" location="ooxml/build/test-results"/>
-    <property name="ooxml.output.dir" location="ooxml/build/classes"/>
+    <property name="ooxml.output.dir" location="ooxml/build/classes/ant/java"/>
     <property name="ooxml.output.test.dir" location="ooxml/build/test-classes"/>
     <property name="ooxml.testokfile" location="ooxml/build/testokfile.txt"/>
 
@@ -171,7 +171,7 @@ under the License.
     <property name="excelant.src.test" location="excelant/src/test/java"/>
     <property name="excelant.resources.test" location="excelant/src/test/resources"/>
     <property name="excelant.reports.test" location="excelant/build/test-results"/>
-    <property name="excelant.output.dir" location="excelant/build/classes"/>
+    <property name="excelant.output.dir" location="excelant/build/classes/ant/java"/>
     <property name="excelant.output.test.dir" location="excelant/build/test-classes"/>
     <property name="excelant.testokfile" location="excelant/build/testokfile.txt"/>
 
@@ -347,7 +347,7 @@ under the License.
 
     <!-- See https://www.ecma-international.org/publications/standards/Ecma-376.htm -->
     <!-- "Copy these file(s), free of charge" -->
-    <property name="ooxml-schema.output.dir" location="ooxml-schema/build/classes"/>
+    <property name="ooxml-schema.output.dir" location="ooxml-schema/build/classes/ant/java"/>
     <property name="ooxml-schema.output.test.dir" location="ooxml-schema/build/test-classes"/>
     <property name="ooxml-schema.output.gen-sources.dir" location="ooxml-schema/build/generated-sources"/>
     <property name="ooxml-schema.output.gen-classes.dir" location="ooxml-schema/build/generated-classes"/>