[split] add the thrift root to the list of includes for scrooge

RB_ID=282485
twitter · Feb 7, 2014 · b27e8dd · b27e8dd
1 parent 3d5c75f
commit b27e8dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/scrooge-maven-plugin/src/main/java/com/twitter/AbstractMavenScroogeMojo.java b/scrooge-maven-plugin/src/main/java/com/twitter/AbstractMavenScroogeMojo.java
@@ -219,6 +219,12 @@ public void execute() throws MojoExecutionException, MojoFailureException {
           Set<File> includes = thriftIncludes;
           includes.add(getResourcesOutputDirectory());
 
+          // Include thrift root
+          final File thriftSourceRoot = getThriftSourceRoot();
+          if (thriftSourceRoot != null && thriftSourceRoot.exists()) {
+            includes.add(thriftSourceRoot);
+          }
+
           runner.compile(
                   getLog(),
                   new File(outputDirectory, "scrooge"),

diff --git a/scrooge-sbt-plugin/src/main/scala/com/twitter/ScroogeSBT.scala b/scrooge-sbt-plugin/src/main/scala/com/twitter/ScroogeSBT.scala
@@ -108,8 +108,8 @@ object ScroogeSBT extends Plugin {
     scroogeBuildOptions := Seq("--finagle"),
     scroogeThriftSourceFolder <<= (sourceDirectory) { _ / "thrift" },
     scroogeThriftExternalSourceFolder <<= (target) { _ / "thrift_external" },
-    scroogeThriftOutputFolder <<= (sourceManaged) { x => x },
-    scroogeThriftIncludeFolders := Seq(),
+    scroogeThriftOutputFolder <<= (sourceManaged) { identity },
+    scroogeThriftIncludeFolders <<= (scroogeThriftSourceFolder) { Seq(_) },
     scroogeThriftNamespaceMap := Map(),
     scroogeThriftDependencies := Seq(),