support for git dependencies on projects in subdirectories

1 files changed, 9 insertions, 5 deletions

diff --git a/stage2/GitDependency.scala b/stage2/GitDependency.scala
index 174f9ff..0457c3c 100644
--- a/stage2/GitDependency.scala
+++ b/stage2/GitDependency.scala
@@ -9,7 +9,7 @@ object GitDependency{
   val GitUrl = "(git:|https:|file:/)//([^/]+)/(.+)".r
 }
 case class GitDependency(
-  url: String, ref: String // example: git://github.com/cvogt/cbt.git#<some-hash>
+  url: String, ref: String, subDirectory: Option[String] = None // example: git://github.com/cvogt/cbt.git#<some-hash>
 )(implicit val logger: Logger, classLoaderCache: ClassLoaderCache, context: Context ) extends DependencyImplementation{
   import GitDependency._
   override def lib = new Lib(logger)
@@ -18,8 +18,8 @@ case class GitDependency(
   // See http://www.codeaffine.com/2014/12/09/jgit-authentication/
   private val GitUrl( _, domain, path ) = url  
 
-
-  def checkout: File = {
+  private object checkoutCache extends Cache[File]
+  def checkout: File = checkoutCache{
     val checkoutDirectory = context.cache ++ s"/git/$domain/$path/$ref"
     if(checkoutDirectory.exists){
       logger.git(s"Found existing checkout of $url#$ref in $checkoutDirectory")
@@ -38,9 +38,13 @@ case class GitDependency(
     }
     checkoutDirectory
   }
-  private object dependencyCache extends Cache[Dependency]
+  private object dependencyCache extends Cache[DependencyImplementation]
   def dependency = dependencyCache{
-    BuildDependency( context.copy( projectDirectory = checkout ) )
+    BuildDependency(
+      context.copy(
+        projectDirectory = checkout ++ subDirectory.map("/" ++ _).getOrElse("")
+      )
+    )
   }
 
   def dependencies = Seq(dependency)