X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=9987e3baa5159720b9161cdc256e726466d18b6d;hb=9a3fbb958e7b83e448f34eaadd32a9667bd444ca;hp=41a972b19a463ae7cf021b467d32f83e2132e9c7;hpb=c1c19b38ad4af8dfc9afc83a6baed02ac4a3cd4b;p=jalview.git

diff --git a/build.gradle b/build.gradle
index 41a972b..9987e3b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -628,7 +628,15 @@ eclipse {
             //println("Not adding duplicate entry "+itPath)
           } else {
             //println("Adding entry "+itPath)
-            cp.entries += new Library(fileReference(itPath))
+            def lib = new Library(fileReference(itPath))
+            // check for source jar
+            def sourcePath = file("${j11sourcesDir}/"+it.name.replaceAll(".jar\$","-sources.jar"))
+            if (sourcePath.exists()) {
+              def refFactory = eclipse.classpath.getFileReferenceFactory();
+              def sourceRef = refFactory.fromFile(sourcePath)
+              lib.setSourcePath(sourceRef)
+            }
+            cp.entries += lib
             alreadyAddedLibPath.put(itPath, true)
           }
         }
@@ -656,6 +664,18 @@ eclipse {
 
       } // whenMerged
 
+      /*
+      withXml {
+        xml ->
+        def node = xml.asNode()
+        node.classpathentry.forEach {
+          if (it.@kind == "lib") {
+            println("LIB "+it.toString())
+          }
+        }
+      }
+      */
+
     } // file
 
     containers 'org.eclipse.buildship.core.gradleclasspathcontainer'
@@ -2947,7 +2967,13 @@ task jalviewjsServer {
   def htmlFile = "${jalviewDirAbsolutePath}/${filename}"
   doLast {
 
-    SimpleHttpFileServerFactory factory = new SimpleHttpFileServerFactory()
+    def factory
+    try {
+      def f = Class.forName("org.gradle.plugins.javascript.envjs.http.simple.SimpleHttpFileServerFactory")
+      factory = f.newInstance()
+    } catch (ClassNotFoundException e) {
+      throw new GradleException("Unable to create SimpleHttpFileServerFactory")
+    }
     def port = Integer.valueOf(jalviewjs_server_port)
     def start = port
     def running = false