aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-04-02 13:11:21 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2016-04-02 14:51:10 -0400
commit9c03feba55b8705280990b7e39b19d43df612703 (patch)
tree0ea610e25d2752e593e3234b21df956811391a10
parent47c619c5cec7964b1244a20a5cd379e7efefa197 (diff)
downloadcbt-9c03feba55b8705280990b7e39b19d43df612703.tar.gz
cbt-9c03feba55b8705280990b7e39b19d43df612703.tar.bz2
cbt-9c03feba55b8705280990b7e39b19d43df612703.zip
Add build file to build CBT with itself. Needed to be able to consume CBT as a library.
-rw-r--r--build/build.scala18
-rw-r--r--nailgun_launcher/CBTUrlClassLoader.java2
2 files changed, 19 insertions, 1 deletions
diff --git a/build/build.scala b/build/build.scala
new file mode 100644
index 0000000..aa5d27a
--- /dev/null
+++ b/build/build.scala
@@ -0,0 +1,18 @@
+import cbt._
+import java.net.URL
+import java.io.File
+import scala.collection.immutable.Seq
+
+class Build(context: Context) extends BasicBuild(context){
+ // FIXME: somehow consolidate this with cbt's own boot-strapping from source.
+ override def dependencies = super.dependencies ++ Seq(
+ JavaDependency("org.scala-lang","scala-library",constants.scalaVersion),
+ JavaDependency("net.incongru.watchservice","barbary-watchservice","1.0"),
+ JavaDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r"),
+ JavaDependency("com.typesafe.zinc","zinc","0.3.9"),
+ ScalaDependency("org.scala-lang.modules","scala-xml","1.0.5")
+ )
+ override def sources = Seq(
+ "nailgun_launcher", "stage1", "stage2"
+ ).map(d => projectDirectory ++ ("/" + d))
+}
diff --git a/nailgun_launcher/CBTUrlClassLoader.java b/nailgun_launcher/CBTUrlClassLoader.java
index 15440c7..88bf4a3 100644
--- a/nailgun_launcher/CBTUrlClassLoader.java
+++ b/nailgun_launcher/CBTUrlClassLoader.java
@@ -2,7 +2,7 @@ package cbt;
import java.io.*;
import java.net.*;
import java.util.*;
-class CbtURLClassLoader extends URLClassLoader{
+class CbtURLClassLoader extends java.net.URLClassLoader{
public String toString(){
return (
super.toString()