You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ke...@apache.org on 2013/12/04 21:12:12 UTC
[3/8] git commit: Clean up codegen refs in build.gradle.
Clean up codegen refs in build.gradle.
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/29d39b1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/29d39b1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/29d39b1d
Branch: refs/heads/master
Commit: 29d39b1d479f3f82a3857f103e67cf5104105b9d
Parents: 8704736
Author: Bill Farner <bi...@twitter.com>
Authored: Tue Nov 26 13:20:24 2013 -0800
Committer: Bill Farner <bi...@twitter.com>
Committed: Tue Nov 26 13:20:24 2013 -0800
----------------------------------------------------------------------
build.gradle | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/29d39b1d/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 44d6cbf..d5e08ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,6 +6,7 @@ apply plugin: 'maven-publish'
buildDir = 'dist'
def generatedDir = "$buildDir/generated-src"
+def generatedJavaDir = "$generatedDir/gen-java"
compileJava {
sourceCompatibility = 1.7
@@ -178,6 +179,8 @@ task generateSources(dependsOn: 'bootstrapThrift') {
args = ['--gen', 'java:hashcode', '-o', outputDir, file]
}
}
+ // These are the 'root' structs, the tool recursively generates all composed structs.
+ // TODO(wfarner): Change codegen tool to generate for all structs in a thrift file.
['JobConfiguration', 'Lock', 'ScheduledTask', 'Quota'].each {
def structName = it
exec {
@@ -185,7 +188,7 @@ task generateSources(dependsOn: 'bootstrapThrift') {
args = ['src/main/python/twitter/aurora/tools/java/thrift_wrapper_codegen.py',
'src/main/thrift/com/twitter/aurora/gen/api.thrift',
structName,
- "$generatedDir/gen-java"]
+ generatedJavaDir]
}
}
}
@@ -208,7 +211,7 @@ idea {
iml {
beforeMerged { module ->
module.sourceFolders.add(new org.gradle.plugins.ide.idea.model.Path(
- 'file://$MODULE_DIR$/dist/generated-src/gen-java'))
+ "file://$generatedJavaDir"))
}
whenMerged { module ->
// TODO(zmanji): Find a way to remove the `dist` directory instead of