Skip to content

Commit a41b72a

Browse files
committed
Update build for CSharp and Golang to use included schema but running SbeTool in the resource directory. Issue #624.
1 parent a311f18 commit a41b72a

File tree

1 file changed

+34
-8
lines changed

1 file changed

+34
-8
lines changed

build.gradle

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ task generateGolangCodecTestVarData(type: JavaExec) {
619619
args = ['sbe-tool/src/test/resources/basic-variable-length-schema.xml']
620620
}
621621

622-
task generateGolangCodecsWithXSD(type: JavaExec) {
622+
task generateGolangCodecsWithXsd(type: JavaExec) {
623623
main = 'uk.co.real_logic.sbe.SbeTool'
624624
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
625625
systemProperties(
@@ -639,9 +639,19 @@ task generateGolangCodecsWithXSD(type: JavaExec) {
639639
'gocode/resources/example-composite.xml',
640640
'gocode/resources/example-extension-2-schema.xml',
641641
'gocode/resources/group-with-data-extension-schema.xml',
642-
'gocode/resources/simple.xml',
643-
'sbe-samples/src/main/resources/example-schema.xml',
644-
'sbe-samples/src/main/resources/example-extension-schema.xml']
642+
'gocode/resources/simple.xml']
643+
}
644+
645+
task generateGolangCodecsWithXsdAndIncludes(type: JavaExec) {
646+
main = 'uk.co.real_logic.sbe.SbeTool'
647+
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
648+
workingDir = 'sbe-samples/src/main/resources'
649+
systemProperties(
650+
'sbe.output.dir': '../../../../gocode/src',
651+
'sbe.target.language': 'golang',
652+
'sbe.xinclude.aware': 'true',
653+
'sbe.validation.xsd': validationXsdPath)
654+
args = ['example-schema.xml', 'example-extension-schema.xml']
645655
}
646656

647657
task generateGolangCodecs {
@@ -650,10 +660,11 @@ task generateGolangCodecs {
650660
'generateGolangCodecTestGroup',
651661
'generateGolangCodecTestBasic',
652662
'generateGolangCodecTestComposite',
653-
'generateGolangCodecsWithXSD'
663+
'generateGolangCodecsWithXsd',
664+
'generateGolangCodecsWithXsdAndIncludes'
654665
}
655666

656-
task generateCSharpCodecs(type: JavaExec) {
667+
task generateCSharpCodecsBase(type: JavaExec) {
657668
main = 'uk.co.real_logic.sbe.SbeTool'
658669
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
659670
systemProperties(
@@ -667,11 +678,26 @@ task generateCSharpCodecs(type: JavaExec) {
667678
'sbe-tool/src/test/resources/issue560.xml',
668679
'sbe-tool/src/test/resources/since-deprecated-test-schema.xml',
669680
'sbe-tool/src/test/resources/example-bigendian-test-schema.xml',
670-
'sbe-samples/src/main/resources/example-schema.xml',
671-
'sbe-samples/src/main/resources/example-extension-schema.xml',
672681
'sbe-benchmarks/src/main/resources/fix-message-samples.xml']
673682
}
674683

684+
task generateCSharpCodecsWithIncludes(type: JavaExec) {
685+
main = 'uk.co.real_logic.sbe.SbeTool'
686+
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
687+
workingDir = 'sbe-samples/src/main/resources'
688+
systemProperties(
689+
'sbe.output.dir': '../../../../csharp/sbe-generated',
690+
'sbe.target.language': 'uk.co.real_logic.sbe.generation.csharp.CSharp',
691+
'sbe.xinclude.aware': 'true',
692+
'sbe.validation.xsd': validationXsdPath)
693+
args = ['example-schema.xml', 'example-extension-schema.xml']
694+
}
695+
696+
task generateCSharpCodecs {
697+
description = 'Generate CSharp test codecs'
698+
dependsOn 'generateCSharpCodecsBase', 'generateCSharpCodecsWithIncludes'
699+
}
700+
675701
task generateJavaIrCodecs(type: JavaExec) {
676702
main = 'uk.co.real_logic.sbe.SbeTool'
677703
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath

0 commit comments

Comments
 (0)