Commit a0bd8f24 authored by markhammons's avatar markhammons

Fixed the installer yaml. Beware of built-in variables that the yaml parser doesn't recognize!!

parent 1757e8a2
customXML:
- |
<native type="izpack" name="ShellLink.dll"></native>
info:
appName: OpenMOLE
summaryLogFilePath: "/tmp/out"
appVersion: $version
createUninstaller: yes
javaVersion: 1.7
......@@ -13,11 +18,11 @@ packs:
required: yes
description: OpenMOLE Core
fileset:
includes: $installSourceDir/openmole/
includes: $installSourceDir/openmole/*
targetDir: $INSTALL_PATH
file:
src: $installSourceDir/resources/register.bat
targetDir: $INSTALL_PATH/register.bat
targetDir: $INSTALL_PATH
override: true
pack:
name: OpenMOLE Runtime
......@@ -25,32 +30,33 @@ packs:
description: OpenMOLE Runtime
file:
src: $installSourceDir/runtime/runtime.tar.gz
targetDir: $USER_HOME/.openmole/runtime/
file:
targetDir: \$USER_HOME/.openmole/runtime
file:
src: $installSourceDir/runtime/jvm-x64.tar.gz
targetDir: $USER_HOME/.openmole/runtime/
targetDir: \$USER_HOME/.openmole/runtime
file:
src: $installSourceDir/runtime/jvm-386.tar.gz
targetDir: $USER_HOME/.openmole/runtime/
targetDir: \$USER_HOME/.openmole/runtime
pack:
name: OpenMOLE Icons
required: yes
description: OpenMOLE Icons
file:
src: $installSourceDir/resources/openmole.ico
targetDir: $INSTALL_PATH/openmole.ico
targetDir: $INSTALL_PATH
override: true
file:
src: $installSourceDir/resources/openmole-uninstall.ico
targetDir: $INSTALL_PATH/openmole-uninstall.ico
targetDir: $INSTALL_PATH
override: true
file:
src: $installSourceDir/resources/openmole.png
targetDir: $INSTALL_PATH/openmole.png
targetDir: $INSTALL_PATH
override: true
file:
src: $installSourceDir/resources/openmole-uninstall.png
targetDir: $INSTALL_PATH/openmole-uninstall.png
targetDir: $INSTALL_PATH
override: true
executable:
targetFile: $INSTALL_PATH/openmole
......@@ -74,6 +80,8 @@ panels:
className: LicencePanel
panel:
className: TargetPanel
panel:
className: PacksPanel
panel:
className: InstallPanel
panel:
......
......@@ -9,7 +9,7 @@ import org.openmole.buildsystem.OMKeys._
import Application.{ openmolePlugins, openmoleRuntime }
object Installer extends Defaults {
val dir = file("installer")
val dir = file(".")
val all = Aggregator("installer-all") aggregate (installer)
lazy val openmoleSettings: Seq[Setting[_]] = openmolePlugins.settings
......@@ -18,11 +18,11 @@ object Installer extends Defaults {
lazy val t = target in openmolePlugins
lazy val installer = AssemblyProject("izpack-installer", "", settings = IzPack.izPackSettings ++ resAssemblyProject) settings (
lazy val installer = AssemblyProject("installer", "installer", settings = IzPack.izPackSettings ++ resAssemblyProject) settings (
assemble := false,
packageBin := file("."),
createInstaller in IzPack.IzPack.Config <<= (createInstaller in IzPack.IzPack.Config) dependsOn resourceAssemble,
variables in Config <+= version { v ("version", v) },
variables in Config <++= version { v Seq(("version", v), "home" -> "$USER_HOME") },
installSourceDir in Config <<= assemblyPath,
configFile in Config <<= assemblyPath { _ / "resources/install.yml" },
resourceSets <<= (assemblyPath in openmolePlugins, target in openmoleRuntime, tarGZName in openmoleRuntime, baseDirectory) map { (assembly, target, tarGz, bD)
......
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