Commit 7b76616a authored by Mathieu Leclaire's avatar Mathieu Leclaire
Browse files

[Build] Merge plugins and openmole-plugins

parent a38bb070
......@@ -60,7 +60,7 @@ function run {
java -Dlogback.configurationFile=${LOCATION}/configuration/logback.xml -Xss1M -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom -Dosgi.locking=none -Dopenmole.location="${LOCATION}" -Dosgi.classloader.singleThreadLoads=true -Dosgi.configuration.area="${CONFIGDIR}" -Xmx${MEM} $FLAG -XX:+UseG1GC \
-jar "$LOCATION/plugins/org.eclipse.equinox.launcher.jar" -consoleLog \
-cp "$LOCATION/openmole-plugins" -gp "$LOCATION/openmole-plugins-gui" "${ARGS[@]}"
"${ARGS[@]}"
RET=$?
rm -rf "${CONFIGDIR}"
......
......@@ -12,7 +12,7 @@ set FLAG="-XX:+UseCompressedOops"
:is32bit
:run
java -Dlogback.configurationFile="%PWD%/configuration/logback.xml" -Xss1M -Dfile.encoding=UTF-8 -Dosgi.locking=none -Dopenmole.location="%PWD%" -Dosgi.classloader.singleThreadLoads=true -Dosgi.configuration.area=%ran% -XX:MaxPermSize=128M -XX:+UseG1GC -Xmx1G -XX:MaxPermSize=128M %FLAG% -jar "%PWD%/plugins/org.eclipse.equinox.launcher.jar" -consoleLog -cp "%PWD%/openmole-plugins" -gp "%PWD%/openmole-plugins-gui" %*
java -Dlogback.configurationFile="%PWD%/configuration/logback.xml" -Xss1M -Dfile.encoding=UTF-8 -Dosgi.locking=none -Dopenmole.location="%PWD%" -Dosgi.classloader.singleThreadLoads=true -Dosgi.configuration.area=%ran% -XX:MaxPermSize=128M -XX:+UseG1GC -Xmx1G -XX:MaxPermSize=128M %FLAG% -jar "%PWD%/plugins/org.eclipse.equinox.launcher.jar" -consoleLog %*
set ret=%errorlevel%
rmdir /s /q %ran%
......
......@@ -91,7 +91,7 @@ object Bin extends Defaults(Core, Plugin, Runtime, Gui, Libraries, ThirdParties,
resourcesAssemble <+= (buildJS, assemblyPath) map { case (js, p) rename(js, "openmole.js") (p / "webapp/js") },
resourcesAssemble <+= (buildJS, assemblyPath) map { case (js, p) rename(new File(js.getParent, "org-openmole-gui-client-core-jsdeps.min.js"), "deps.js") (p / "webapp/js") },
resourcesAssemble <+= (assemble in dbServer, assemblyPath) map { case (r, p) r (p / "dbserver") },
resourcesAssemble <+= (assemble in consolePlugins, assemblyPath) map { case (r, p) r (p / "openmole-plugins") },
resourcesAssemble <+= (assemble in consolePlugins, assemblyPath) map { case (r, p) r (p / "plugins") },
resourcesAssemble <+= (Tar.tar in openmoleRuntime, assemblyPath) map { case (r, p) r (p / "runtime") },
downloads := Seq(java368URL "runtime/jvm-386.tar.gz", javax64URL "runtime/jvm-x64.tar.gz"),
libraryDependencies += Libraries.scalajHttp,
......@@ -312,7 +312,7 @@ object Bin extends Defaults(Core, Plugin, Runtime, Gui, Libraries, ThirdParties,
header :=
"""|eclipse.application=org.openmole.site
|osgi.bundles.defaultStartLevel=4""".stripMargin,
startLevels := openmoleStartLevels ++ Seq("openmole-plugin" 3),
startLevels := openmoleStartLevels ++ Seq("plugin" 3),
pluginsDirectory := assemblyPath.value / "plugins",
config := assemblyPath.value / "configuration/config.ini"
) dependsOn (siteGeneration, Core.tools)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment