Skip to content

Commit ebac74a

Browse files
committed
- fix generated files packages.
* add post task that copies .token files to fdb-relational-core/src/main/antlr this makes the IDE able to parse the grammar files correctly.
1 parent 847ffe6 commit ebac74a

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

Diff for: .gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,6 @@ fdb-environment.properties
7777

7878
# Docker local support
7979
run/
80+
81+
# Token files required for parsing Antlr files correctly in the IDE
82+
fdb-relational-core/src/main/antlr/*.tokens

Diff for: gradle/antlr.gradle

+12
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
apply plugin: 'antlr'
2222

2323
generateGrammarSource {
24+
outputDirectory = layout.buildDirectory.dir('generated-src/antlr/main/com/apple/foundationdb/relational/generated').get().asFile
2425
maxHeapSize = "128m"
2526
arguments += ['-package','com.apple.foundationdb.relational.generated', '-listener','-visitor', '-long-messages']
2627
}
@@ -29,3 +30,14 @@ sourceSets.configureEach {
2930
var generateGrammarSource = tasks.named(getTaskName("generate", "GrammarSource"))
3031
java.srcDir(generateGrammarSource.map { files() })
3132
}
33+
34+
generateGrammarSource.doLast {
35+
final source = layout.buildDirectory.dir('generated-src/antlr/main/com/apple/foundationdb/relational/generated/')
36+
final tokensFile = "*.tokens"
37+
final dest = layout.projectDirectory.dir('src/main/antlr')
38+
copy {
39+
from source
40+
include tokensFile
41+
into dest
42+
}
43+
}

0 commit comments

Comments
 (0)