Add new network extension submodule!

NetLogo · May 14, 2014 · c6a5902 · c6a5902
1 parent 7605ffb
commit c6a5902
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,6 +48,3 @@ tmp/
 /resources/GUI_Strings_??.properties
 /resources/system/dict.txt
 /resources/system/dict3d.txt
-
-# ignore nw extension until bundled
-/extensions/nw
diff --git a/.gitmodules b/.gitmodules
@@ -40,3 +40,6 @@
 [submodule "Mathematica-Link"]
 	path = Mathematica-Link
 	url = https://github.com/NetLogo/Mathematica-Link.git
+[submodule "extensions/nw"]
+	path = extensions/nw
+	url = https://github.com/NetLogo/NW-Extension
diff --git a/extensions/nw b/extensions/nw
diff --git a/project/Extensions.scala b/project/Extensions.scala
@@ -28,9 +28,12 @@ object Extensions {
     log.info("building extension: " + dir.getName)
     val jar = dir / (dir.getName + ".jar")
     val exitCode =
-      if((dir / "build.sbt").exists)
+      if((dir / "build.sbt").exists && (dir / "bin" / "sbt").exists)
         Process(Seq("bin/sbt", "package"), dir,
                 "SCALA_JAR" -> scalaLibrary.getPath) ! log
+      else if((dir / "build.sbt").exists)
+        Process(Seq("sbt", "package"), dir,
+                "SCALA_JAR" -> scalaLibrary.getPath) ! log
       else
         Process(Seq("make", "-s", jar.getName), dir,
                 "SCALA_JAR" -> scalaLibrary.getPath) ! log