Merge pull request #50 from sbt/wip-jsuereth-fix-43

Fixes #43 - unable to create MSI of play application
sbt · Oct 21, 2013 · fe77d76 · fe77d76
2 parents 02ff0bd + 9cb77b6
commit fe77d76
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.4
+sbt.version=0.13.0
diff --git a/src/main/scala/com/typesafe/sbt/packager/GenericPackageSettings.scala b/src/main/scala/com/typesafe/sbt/packager/GenericPackageSettings.scala
@@ -132,7 +132,7 @@ trait GenericPackageSettings
              (file, name) <- mappings
              if !file.isDirectory
              if name startsWith "conf/"
-          } yield name
+          } yield name.replaceAll("//", "/").stripSuffix("/").stripSuffix("/")
     val menuLinks =
       WindowsFeature(
           id="AddConfigLinks",

diff --git a/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala b/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala
@@ -67,7 +67,9 @@ object WixHelper {
     // Now for directories...
     def parentDir(filename: String) = { filename take (filename lastIndexOf '/') }
     def simpleName(filename: String) = {
-      val lastSlash = filename lastIndexOf '/'
+      val lastSlash = 
+        if(filename contains '/') filename lastIndexOf '/'
+        else filename lastIndexOf '\\'
       filename drop (lastSlash + 1)
     }
     val dirs = (filenames map parentDir).distinct;
@@ -105,7 +107,7 @@ object WixHelper {
         ComponentInfo(id, xml)
       case ComponentFile(name, editable) =>
         val uname = name.replaceAll("\\\\", "/")
-        val dir = parentDir(uname)
+        val dir = parentDir(uname).replaceAll("//", "/").stripSuffix("/").stripSuffix("/")
         val dirRef = if(dir.isEmpty) "INSTALLDIR" else cleanStringForId(dir)
             val fname = simpleName(uname)
             val id = cleanStringForId(uname).takeRight(67)  // Room for "fl_"
@@ -134,8 +136,9 @@ object WixHelper {
                   for(target <- targets) yield {
                     val name = simpleName(target)
                     val desc = "Edit configuration file: " + name
+                    val cleanName = name.replaceAll("[\\.-\\\\//]+","_")
                     <Shortcut Id={id+"_SC"}
-                          Name={name}
+                          Name={cleanName}
                           Description={desc}
                           Target={"[INSTALLDIR]\\" + target.replaceAll("\\/", "\\\\")}
                           WorkingDirectory="INSTALLDIR"/>

diff --git a/test-project/build.sbt b/test-project/build.sbt
@@ -1,6 +1,6 @@
 import NativePackagerKeys._
 
-packageArchetype.java_server
+play.Project.playScalaSettings  //packageArchetype.java_server
 
 name := "dtest"
 

diff --git a/test-project/conf/application.conf b/test-project/conf/application.conf
@@ -0,0 +1 @@
+
diff --git a/test-project/project/plugins.sbt b/test-project/project/plugins.sbt
@@ -0,0 +1,3 @@
+resolvers += Resolver.typesafeRepo("releases")
+
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.0")