Merge branch 'master' of github.com:typesafehub/giter8-package

typesafehub · Mar 28, 2012 · b584c8b · b584c8b
2 parents ea15250 + e97f0d8
commit b584c8b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/project/packaging.scala b/project/packaging.scala
@@ -58,7 +58,24 @@ object Packaging {
     // WINDOWS SPECIFIC
     name in Windows := "g8",
     lightOptions ++= Seq("-ext", "WixUIExtension", "-cultures:en-us"),
-    wixConfig <<= (version, resourceDirectory in Compile, sourceDirectory in Windows) map makeWindowsXml
+    wixConfig <<= (version, resourceDirectory in Compile, sourceDirectory in Windows) map makeWindowsXml,
+
+    // UNIVERSAL INSTALLER
+    name in Universal := "g8",
+    mappings in Universal <+= (resourceDirectory in Compile) map { dir =>
+       dir / "giter8.properties" -> ("bin/giter8.properties")
+    },
+    mappings in Universal <++= (sourceDirectory in Windows) map { dir =>
+       Seq(
+         dir / "g8.bat" -> ("bin/g8.bat"),
+         dir / "g8"     -> ("bin/win-g8")
+       )
+    },
+    mappings in Universal <++= (baseDirectory) map { dir =>
+       Seq(
+         dir / "LICENSE" -> ("LICENSE")
+       )
+    }
   )
 
   def makeWindowsXml(version: String, rdir: File, wdir: File) = {

diff --git a/src/universal/bin/g8 b/src/universal/bin/g8
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+# TODO - Find this from SBT install
+. $(dirname $0)/sbt-launch-lib.bash
+
+propsfile="$(dirname $0)/giter8.properties"
+
+usage() {
+  # Just call underlying g8 for usage info.
+  runAlternateBoot $propsfile
+}
+
+runAlternateBoot $propsfile $@