fix a bug with executables not in the root of

Author: Arcath

Readme.md

@@ -18,7 +18,7 @@ To use this script you need the following tools installed on your machine:
 |Path|Yes|Null|The folder to create the MSI from|
 |Product|Yes|Null|The name to give the product. Used for Program Files folder, Desktop/Start Menu shortcut & others.|
 |Version|Yes|Null|The Version to report to AD etc...|
-|Executable|Yes|Null|The name of the exe inside `Path`.|
+|Executable|Yes|Null|The name of the exe inside `Path`. e.g. `App.exe` or `bin\app.exe`|
 |UpgradeGUID|No|Generated at Runtime|Supply the UpgradeGUID that was outputted when you generated the first version of the MSI.|
 |Manufacturer|No|Ed-IT Solutions MSI Creator|The manufacturer to set.|
 |Contact|No|System Administrator|Who should the user contact for help.|

create-msi-installer-from-folder.ps1

@@ -50,34 +50,67 @@ step -message "Creating Installer.wixproj"
 
 [xml]$installer = Get-Content "$PSScriptRoot\source\installer.wixproj"
 
+Write-Host "Setting project information."
+
 $installer.Project.PropertyGroup[0].OutputName = "$Product ($Version)"
 $installer.Project.PropertyGroup[0].ProjectGuid = "$ProjectGUID"
 $installer.Project.PropertyGroup[0].ProductVersion = $Version
 $installer.Project.PropertyGroup[1].DefineConstants = "Debug;HarvestPath=$Path;ProductVersion=$Version"
 $installer.Project.PropertyGroup[2].DefineConstants = "HarvestPath=$Path;ProductVersion=$Version"
 $installer.Project.Target[0].HeatDirectory.Directory = $Path
 
+Write-Host "Saving to .\build"
+
 $installer.Save("$PSScriptRoot\build\installer.wixproj")
 
 step -message "Creating Product.wxs"
 
 $productwxs = New-Object xml
 $productwxs.Load("$PSScriptRoot\source\product.wxs")
 
+Write-Host "Setting product information."
+
 $productwxs.Wix.Product.Name = $Product
 $productwxs.Wix.Product.Version = $Version
 $productwxs.Wix.Product.Manufacturer = $Manufacturer
 $productwxs.Wix.Product.UpgradeCode = $UpgradeGUID
 
+Write-Host "Creating directories."
+
 $productwxs.Wix.Product.Directory.Directory[0].Directory.Name = $Product
-$productwxs.Wix.Product.Directory.Directory[0].Directory.Component.File.Source = "$Path\$Executable"
+
+$installDir = $productwxs.Wix.Product.Directory.Directory[0].Directory
+$installDir.Component.File.Source = "$Path\$Executable"
+
+$dirs = $Executable.split('\')
+$i = 1
+
+forEach($dir in $dirs){
+  if($dir -notmatch '\.exe$'){
+    $exeDir = $installDir.Clone()
+
+    $component = $installDir.Component
+    $installDir.RemoveChild($component) | Out-Null
+
+    $exeDir.Id = "EXEDIR_$i"
+    $exeDir.Name = $dir
+    $installDir.appendChild($exeDir) | Out-Null
+    $installDir = $exeDir
+    $i = $i + 1
+  }
+}
+
+
+
+Write-Host "Creating start menu shortcut."
+
 $productwxs.Wix.Product.Directory.Directory[1].Component.Shortcut.Name = $Product
 $productwxs.Wix.Product.Directory.Directory[1].Component.Shortcut.Description = $Product
 $productwxs.Wix.Product.Directory.Directory[1].Component.Shortcut.Target = "[INSTALLDIR]$Executable"
 $productwxs.Wix.Product.Directory.Directory[1].Component.RegistryValue.Key = "Software\$Product"
 
 if($Desktop){
-  Write-Host "Adding desktop shortcut"
+  Write-Host "Creating desktop shortcut"
 
   $desktopDirectory = $productwxs.Wix.Product.Directory.Directory[1].Clone()
   $desktopDirectory.Component.Shortcut.Id = "DesktopShortcut_001"
@@ -94,6 +127,8 @@ $productwxs.Wix.Product.Icon.SourceFile = "$Path\$Executable"
 
 $productwxs.Wix.Product.Feature.Title = $Product
 
+Write-Host "Setting contact information."
+
 $productwxs.Wix.Product.Property[0].Value = $Contact
 $productwxs.Wix.Product.Property[1].Value = $HelpLink
 $productwxs.Wix.Product.Property[3].Value = $AboutLink
@@ -115,13 +150,17 @@ if($FileType){
   $productwxs.Wix.Product.Directory.Directory[0].Directory.Component.appendChild($appendable.ProgId) | Out-Null
 }
 
+Write-Host "Saving to .\build"
+
 $productwxs.Save("$PSScriptRoot\build\product.wxs")
 
 step -message "Create Transform"
 
 [xml]$transform = Get-Content "$PSScriptRoot\source\transform.xslt"
 
-$transform.stylesheet.key.match = "wix:Component[contains(wix:File/@Source, '$Executable')]"
+$exe = Split-Path -Path "$Path\$Executable" -Leaf -Resolve
+
+$transform.stylesheet.key.match = "wix:Component[contains(wix:File/@Source, '$exe')]"
 
 $transform.Save("$PSScriptRoot\build\transform.xslt")
 

source/installer.wixproj

@@ -46,20 +46,6 @@
 				  <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
 				  <Name>WixUtilExtension</Name>
 				</WixExtension>
-				<!--
-				<WixExtension Include="WixFirewallExtension">
-				  <HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath>
-				  <Name>WixFirewallExtension</Name>
-				</WixExtension>
-				<WixExtension Include="WixIIsExtension">
-				  <HintPath>$(WixExtDir)\WixIIsExtension.dll</HintPath>
-				  <Name>WixIIsExtension</Name>
-				</WixExtension>
-				<WixExtension Include="WixNetFxExtension">
-				  <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
-				  <Name>WixNetFxExtension</Name>
-				</WixExtension>
-				-->
         </ItemGroup>
 
         <ItemGroup>