Permalink
Browse files

Updated installer to use WiX v3.6

  • Loading branch information...
1 parent ca6f279 commit fa8179d84e88aee591f4e3ecc68a0a1cdff1caa5 Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) committed Jul 14, 2012
Showing with 2 additions and 25 deletions.
  1. +0 −23 BEurtle.sln
  2. +2 −2 Installer/Installer.wixproj
View
@@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Readme.txt = Readme.txt
EndProjectSection
EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{4657D134-F9B9-4A1C-A182-4A91A260B1D0}"
-EndProject
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "BEXML", "BEXML\BEXML.pyproj", "{ACAEFC7D-2E27-4E17-8184-89468D9EDFB1}"
EndProject
Global
@@ -71,27 +69,6 @@ Global
{DB789663-858A-45BA-B202-3508856A0BE6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{DB789663-858A-45BA-B202-3508856A0BE6}.Release|x64.ActiveCfg = Release|Any CPU
{DB789663-858A-45BA-B202-3508856A0BE6}.Release|x86.ActiveCfg = Release|Any CPU
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Debug|Any CPU.ActiveCfg = Debug|x86
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Debug|Mixed Platforms.Build.0 = Debug|x64
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Debug|x64.ActiveCfg = Debug|x86
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Debug|x64.Build.0 = Debug|x86
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Debug|x86.ActiveCfg = Debug|x86
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Debug|x86.Build.0 = Debug|x86
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Installer|Any CPU.ActiveCfg = Release|x86
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Installer|Mixed Platforms.ActiveCfg = Release|x64
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Installer|Mixed Platforms.Build.0 = Release|x64
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Installer|x64.ActiveCfg = Release|x86
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Installer|x64.Build.0 = Release|x86
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Installer|x86.ActiveCfg = Release|x86
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Installer|x86.Build.0 = Release|x86
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Release|Any CPU.ActiveCfg = Release|x86
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Release|Mixed Platforms.ActiveCfg = Release|x64
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Release|Mixed Platforms.Build.0 = Release|x64
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Release|x64.ActiveCfg = Release|x64
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Release|x64.Build.0 = Release|x64
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Release|x86.ActiveCfg = Release|x86
- {4657D134-F9B9-4A1C-A182-4A91A260B1D0}.Release|x86.Build.0 = Release|x86
{ACAEFC7D-2E27-4E17-8184-89468D9EDFB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ACAEFC7D-2E27-4E17-8184-89468D9EDFB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{ACAEFC7D-2E27-4E17-8184-89468D9EDFB1}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -62,8 +62,8 @@
<Import Project="$(WixTargetsPath)" />
<PropertyGroup>
<PreBuildEvent>xcopy /E /Q /Y /D /I ..\..\..\BE ..\..\..\BEforinstaller /EXCLUDE:..\..\exclude.txt
-"C:\Program Files (x86)\Windows Installer XML v3.5\bin\heat" dir ..\..\..\BEforinstaller -ag -cg BE -dr INSTALLDIR -var var.BE_srcdir -out ..\..\BE.wxs
-"C:\Program Files (x86)\Windows Installer XML v3.5\bin\heat" file ..\..\..\BEurtle\bin\Release\BEurtle.dll -ag -srd -cg BEurtle.dll -dr INSTALLDIR -var var.BEurtle_bindir -out ..\..\BEurtle.dll.wxs</PreBuildEvent>
+"C:\Program Files (x86)\WiX Toolset v3.6\bin\heat" dir ..\..\..\BEforinstaller\dist -ag -cg BE -dr INSTALLDIR\dist -var var.BE_srcdir -out ..\..\BE.wxs
+"C:\Program Files (x86)\WiX Toolset v3.6\bin\heat" file ..\..\..\BEurtle\bin\Release\BEurtle.dll -ag -srd -cg BEurtle.dll -dr INSTALLDIR -var var.BEurtle_bindir -out ..\..\BEurtle.dll.wxs</PreBuildEvent>
</PropertyGroup>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.

0 comments on commit fa8179d

Please sign in to comment.