From a72b1f262f72571ed3dbbb2bc0af21d2cbb2c7bd Mon Sep 17 00:00:00 2001 From: "kenneth.skovhede@gmail.com" Date: Wed, 12 May 2010 10:08:26 +0000 Subject: [PATCH] Update to the Wix builder, should now be able to select target folder correctly. git-svn-id: https://duplicati.googlecode.com/svn/trunk@402 59da171f-624f-0410-aa54-27559c288bec --- Installer/Duplicati.wxs | 11 +- Installer/UpgradeData.wxi | 2 +- Installer/VS Express build.bat | 11 +- Installer/WixInstaller.sln | 4 +- Installer/incBinFiles.wxs | 204 ++++++++++----------------------- 5 files changed, 82 insertions(+), 150 deletions(-) diff --git a/Installer/Duplicati.wxs b/Installer/Duplicati.wxs index b4f2e2bd6..b3f11ec28 100644 --- a/Installer/Duplicati.wxs +++ b/Installer/Duplicati.wxs @@ -53,7 +53,12 @@ - + + @@ -74,7 +79,7 @@ - + @@ -83,7 +88,7 @@ - + - + diff --git a/Installer/VS Express build.bat b/Installer/VS Express build.bat index 50717349b..5c17dd67b 100644 --- a/Installer/VS Express build.bat +++ b/Installer/VS Express build.bat @@ -22,7 +22,14 @@ del ..\Duplicati.zip cd ..\.. -paraffin -dir bin\Release\Duplicati -custom DUPLICATIBIN -dirref ProgramFilesFolder -ext .pdb -alias bin\Release\Duplicati -guids incBinFiles.wxs +REM Create version +REM paraffin -dir bin\Release\Duplicati -groupname DUPLICATIBIN -dirref INSTALLLOCATION -ext .pdb -ext .0 -alias bin\Release\Duplicati -norootdirectory -multiple incBinFiles.wxs -WixProjBuilder.exe WixInstaller.wixproj +REM Update version +if exist incBinFiles.PARAFFIN del incBinFiles.PARAFFIN +paraffin -update incBinFiles.wxs +if exist incBinFiles.PARAFFIN xcopy /I /Y incBinFiles.PARAFFIN incBinFiles.wxs +if exist incBinFiles.PARAFFIN del incBinFiles.PARAFFIN + +WixProjBuilder.exe --wixpath="C:\Program Files (x86)\Windows Installer XML v3\bin" WixInstaller.wixproj pause \ No newline at end of file diff --git a/Installer/WixInstaller.sln b/Installer/WixInstaller.sln index 41d7d005a..dcfbfd50d 100644 --- a/Installer/WixInstaller.sln +++ b/Installer/WixInstaller.sln @@ -1,6 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixInstaller", "WixInstaller.wixproj", "{AB757800-A4CB-478B-A359-33786D0E8A9C}" EndProject Global diff --git a/Installer/incBinFiles.wxs b/Installer/incBinFiles.wxs index d89c51adc..acbd8685f 100644 --- a/Installer/incBinFiles.wxs +++ b/Installer/incBinFiles.wxs @@ -3,158 +3,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +