Issue aeron-io#642. Handle XInclude for CSharp and Golang by manipulating working and output directories.

Author: billsegall

build.gradle

@@ -582,6 +582,7 @@ task generateRustCodecs {
  * validate those.
  * *) Some of the test files need an additional output directory setting
  * as they generate into the same directory and golang won't allow that.
+ * *) Some examples need to fiddle with WorkingDir to deal with XInclude
  */
 task generateGolangCodecTestComposite(type: JavaExec) {
  main = 'uk.co.real_logic.sbe.SbeTool'
@@ -619,7 +620,20 @@ task generateGolangCodecTestVarData(type: JavaExec) {
  args = ['sbe-tool/src/test/resources/basic-variable-length-schema.xml']
 }
 
-task generateGolangCodecsWithXsd(type: JavaExec) {
+task generateGolangCodecsWithXIncludes(type: JavaExec) {
+ workingDir = 'sbe-samples/src/main/resources'
+ main = 'uk.co.real_logic.sbe.SbeTool'
+ classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
+ systemProperties(
+ 'sbe.output.dir': '../../../../gocode/src',
+ 'sbe.target.language': 'golang',
+ 'sbe.xinclude.aware': 'true',
+ 'sbe.validation.xsd': validationXsdPath)
+ args = ['example-schema.xml',
+ 'example-extension-schema.xml']
+}
+
+task generateGolangCodecsWithXSD(type: JavaExec) {
  main = 'uk.co.real_logic.sbe.SbeTool'
  classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
  systemProperties(
@@ -642,29 +656,34 @@ task generateGolangCodecsWithXsd(type: JavaExec) {
  'gocode/resources/simple.xml']
 }
 
-task generateGolangCodecsWithXsdAndIncludes(type: JavaExec) {
- main = 'uk.co.real_logic.sbe.SbeTool'
- classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
- workingDir = 'sbe-samples/src/main/resources'
- systemProperties(
- 'sbe.output.dir': '../../../../gocode/src',
- 'sbe.target.language': 'golang',
- 'sbe.xinclude.aware': 'true',
- 'sbe.validation.xsd': validationXsdPath)
- args = ['example-schema.xml', 'example-extension-schema.xml']
-}
-
 task generateGolangCodecs {
  description = 'Generate golang test codecs'
  dependsOn 'generateGolangCodecTestVarData',
  'generateGolangCodecTestGroup',
  'generateGolangCodecTestBasic',
  'generateGolangCodecTestComposite',
- 'generateGolangCodecsWithXsd',
- 'generateGolangCodecsWithXsdAndIncludes'
+ 'generateGolangCodecsWithXIncludes',
+ 'generateGolangCodecsWithXSD'
+}
+
+/*
+ * CSharp codec targets used for testing, benchmarking etc. We have
+ * multiple targets as XInclude forces us to change working dir
+ */
+task generateCSharpCodecsWithXIncludes(type: JavaExec) {
+ workingDir = 'sbe-samples/src/main/resources'
+ main = 'uk.co.real_logic.sbe.SbeTool'
+ classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
+ systemProperties(
+ 'sbe.output.dir': '../../../../csharp/sbe-generated',
+ 'sbe.target.language': 'uk.co.real_logic.sbe.generation.csharp.CSharp',
+ 'sbe.xinclude.aware': 'true',
+ 'sbe.validation.xsd': validationXsdPath)
+ args = ['example-schema.xml',
+ 'example-extension-schema.xml']
 }
 
-task generateCSharpCodecsBase(type: JavaExec) {
+task generateCSharpCodecsTests(type: JavaExec) {
  main = 'uk.co.real_logic.sbe.SbeTool'
  classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
  systemProperties(
@@ -681,23 +700,14 @@ task generateCSharpCodecsBase(type: JavaExec) {
  'sbe-benchmarks/src/main/resources/fix-message-samples.xml']
 }
 
-task generateCSharpCodecsWithIncludes(type: JavaExec) {
- main = 'uk.co.real_logic.sbe.SbeTool'
- classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
- workingDir = 'sbe-samples/src/main/resources'
- systemProperties(
- 'sbe.output.dir': '../../../../csharp/sbe-generated',
- 'sbe.target.language': 'uk.co.real_logic.sbe.generation.csharp.CSharp',
- 'sbe.xinclude.aware': 'true',
- 'sbe.validation.xsd': validationXsdPath)
- args = ['example-schema.xml', 'example-extension-schema.xml']
-}
-
 task generateCSharpCodecs {
- description = 'Generate CSharp test codecs'
- dependsOn 'generateCSharpCodecsBase', 'generateCSharpCodecsWithIncludes'
+ description = 'Generate csharp codecs'
+ dependsOn 'generateCSharpCodecsTests',
+ 'generateCSharpCodecsWithXIncludes'
 }
 
+
+
 task generateJavaIrCodecs(type: JavaExec) {
  main = 'uk.co.real_logic.sbe.SbeTool'
  classpath = project(':sbe-all').sourceSets.main.runtimeClasspath