[GUI] move bootstrap to server directory.

libraries/build.sbt

@@ -129,9 +129,6 @@ lazy val rx = OsgiProject(dir, "rx", exports = Seq("rx.*")) settings(
 lazy val scalajsTools = OsgiProject(dir, "scalajs-tools", exports = Seq("scala.scalajs.*", "org.scalajs.core.tools.*", "org.scalajs.core.ir.*", "com.google.javascript.*", "com.google.common.*", "rhino_ast.java.com.google.javascript.rhino.*", "org.json.*")) settings(
   libraryDependencies += "org.scala-js" %% "scalajs-tools" % scalajsVersion, version := scalajsVersion) settings(settings: _*)
 
-lazy val scalajsLibrary = OsgiProject(dir, "scalajs-library", exports = Seq("scala.scalajs.*", "org.scalajs.core.tools.*", "org.scalajs.core.ir.*", "com.google.javascript.*", "com.google.common.*", "rhino_ast.java.com.google.javascript.rhino.*", "org.json.*")) settings(
-  libraryDependencies += "org.scala-js" %% "scalajs-library" % scalajsVersion, version := scalajsVersion) settings(settings: _*)
-
 lazy val scalaJS = OsgiProject(dir, "scalajs", exports = Seq("scala.scalajs.*"), imports = Seq("*")) settings (
   libraryDependencies += "org.scala-js" %% "scalajs-library" % scalajsVersion,
   version := scalajsVersion

openmole/build.sbt

@@ -457,14 +457,20 @@ lazy val sharedGUI = OsgiProject(guiExt, "org.openmole.gui.ext.api") dependsOn (
 val jqueryPath = s"META-INF/resources/webjars/jquery/${Libraries.jqueryVersion}/jquery.js"
 val acePath = s"META-INF/resources/webjars/ace/${Libraries.aceVersion}/src-min/ace.js"
 
-
-def guiBootstrapDir = guiDir / "bootstrap"
-lazy val bootstrapGUI = OsgiProject(guiBootstrapDir, "org.openmole.gui.bootstrap") dependsOn(pluginManager, sharedGUI, serverGUI, fileService) settings(defaultSettings: _*) settings(
-  libraryDependencies += Libraries.scalajsLibrary,
+lazy val bootstrapGUI = OsgiProject(guiServerDir, "org.openmole.gui.server.jscompile") dependsOn(pluginManager, sharedGUI, serverGUI, fileService) settings(defaultSettings: _*) settings(
+  libraryDependencies += "org.scala-js" %% "scalajs-library" % Libraries.scalajsVersion,
   libraryDependencies += Libraries.scalajsTools,
-  OsgiKeys.embeddedJars := (Keys.externalDependencyClasspath in Compile).value map (_.data) filter (
-    _.getName startsWith "scalajs-library")
-  )
+  OsgiKeys.embeddedJars := {
+    val scalaLib =
+      (Keys.externalDependencyClasspath in Compile).value.filter {
+        d => d.data.getName startsWith "scalajs-library"
+      }.head
+
+    val dest = target.value / "scalajs-library.jar"
+    sbt.IO.copyFile(scalaLib.data, dest)
+    Seq(dest)
+  }
+)
 
 
 /* -------------- Client ------------------- */

openmole/gui/bootstrap/org.openmole.gui.bootstrap/src/main/scala/org/openmole/gui/bootstrap/js/BootstrapJS.scala → openmole/gui/server/org.openmole.gui.server.jscompile/src/main/scala/org/openmole/gui/server/jscompile/BootstrapJS.scala

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.openmole.gui.bootstrap.js
+package org.openmole.gui.server.jscompile
 
 import java.net.URL
 import java.io.{ FileOutputStream, File }
@@ -92,7 +92,7 @@ object BootstrapJS {
         }*/
         writer.write("}")
       }
-      JSPack.link(Seq(copyJar("scalajs-library_2.11-0.6.13"), jsSrc), new java.io.File(jsCompiled, JS_FILE))
+      JSPack.link(Seq(copyJar("scalajs-library"), jsSrc), new java.io.File(jsCompiled, JS_FILE))
     }
 
     // Extract and copy all the .sjsir files from bundles to src

openmole/gui/bootstrap/org.openmole.gui.bootstrap/src/main/scala/org/openmole/gui/bootstrap/js/JSPack.scala → openmole/gui/server/org.openmole.gui.server.jscompile/src/main/scala/org/openmole/gui/server/jscompile/JSPack.scala

-package org.openmole.gui.bootstrap.js
+package org.openmole.gui.server.jscompile
 
 /*
  * Copyright (C) 02/10/14 // mathieu.leclaire@openmole.org

openmole/project/Libraries.scala

@@ -83,7 +83,6 @@ object Libraries {
   lazy val upickleJS = libraryDependencies += "com.lihaoyi" %%% "upickle" % scalaUpickleVersion
 
   lazy val scalajsTools = "org.openmole" %% "scalajs-tools" % scalajsVersion
-  lazy val scalajsLibrary = "org.openmole" %% "scalajs-library" % scalajsVersion
   lazy val scalajs = "org.openmole" %% "scalajs" % scalajsVersion
 
   lazy val mgo = "org.openmole" %% "fr-iscpif-mgo" % "2.0"