Updated Windows installer to be built from existing zip file

6 files changed, 41 insertions, 13 deletions

diff --git a/Installer/Windows/Resources/InstallerLarge.bmp b/Installer/Windows/Resources/InstallerLarge.bmp
index e9a4a0f70..1951f1036 100644
--- a/Installer/Windows/Resources/InstallerLarge.bmp
+++ b/Installer/Windows/Resources/InstallerLarge.bmp
diff --git a/Installer/Windows/Resources/InstallerSmall.bmp b/Installer/Windows/Resources/InstallerSmall.bmp
index c5c513cb8..ed72d67d8 100644
--- a/Installer/Windows/Resources/InstallerSmall.bmp
+++ b/Installer/Windows/Resources/InstallerSmall.bmp
diff --git a/Installer/Windows/Shortcuts.wxs b/Installer/Windows/Shortcuts.wxs
index 728c026ef..83b4ad946 100644
--- a/Installer/Windows/Shortcuts.wxs
+++ b/Installer/Windows/Shortcuts.wxs
@@ -65,7 +65,7 @@
       </Directory>

     </DirectoryRef>

 

-    <Icon Id="DuplicatiIcon.exe" SourceFile="..\Duplicati\GUI\Duplicati.GUI.TrayIcon\bin\Release\Duplicati.GUI.TrayIcon.exe" />

+    <Icon Id="DuplicatiIcon.exe" SourceFile="Duplicati\Duplicati.GUI.TrayIcon.exe" />

 

   </Fragment>

 </Wix>
\ No newline at end of file
diff --git a/Installer/Windows/WixInstaller.sln b/Installer/Windows/WixInstaller.sln
index f6a139429..ead79c206 100644
--- a/Installer/Windows/WixInstaller.sln
+++ b/Installer/Windows/WixInstaller.sln
@@ -1,6 +1,8 @@
 

-Microsoft Visual Studio Solution File, Format Version 10.00

-# Visual Studio 2008

+Microsoft Visual Studio Solution File, Format Version 12.00

+# Visual Studio 14

+VisualStudioVersion = 14.0.23107.0

+MinimumVisualStudioVersion = 10.0.40219.1

 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixInstaller", "WixInstaller.wixproj", "{AB757800-A4CB-478B-A359-33786D0E8A9C}"

 EndProject

 Global

diff --git a/Installer/Windows/WixInstaller.wixproj b/Installer/Windows/WixInstaller.wixproj
index b1b243b2d..6c1ff5046 100644
--- a/Installer/Windows/WixInstaller.wixproj
+++ b/Installer/Windows/WixInstaller.wixproj
@@ -9,18 +9,18 @@
     <OutputType>Package</OutputType>

     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

-    <HeatDefinitions>HarvestPath=bin\$(Configuration)\Duplicati\</HeatDefinitions>

+    <HeatDefinitions>HarvestPath=Duplicati\</HeatDefinitions>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

-    <OutputPath>bin\$(Configuration)\</OutputPath>

-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>

+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>

+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>

     <DefineConstants>Debug;Win64=no;$(HeatDefinitions)</DefineConstants>

     <WixVariables>

     </WixVariables>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>bin\$(Configuration)\</OutputPath>

-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>

+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>

+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>

     <WixVariables>

     </WixVariables>

     <DefineConstants>Win64=no;$(HeatDefinitions)</DefineConstants>

@@ -66,14 +66,12 @@
     </WixExtension>

   </ItemGroup>

   <ItemGroup>

-    <BinFiles Include="..\Duplicati\GUI\Duplicati.GUI.TrayIcon\bin\$(Configuration)\**\*.*" Exclude="..\**\*.pdb;..\**\SVGIcons\**\*.*;..\**\OSX Icons\**\*.*;..\**\lvm-scripts\**\*.*" />

-    <WebFiles Include="..\Duplicati\Server\webroot\**\*.*" />

+    <BinFiles Include="..\Duplicati\**" Exclude="..\**\*.pdb;..\**\SVGIcons\**\*.*;..\**\OSX Icons\**\*.*;..\**\lvm-scripts\**\*.*" />

   </ItemGroup>

   <Import Project="$(WixTargetsPath)" />

   <Target Name="BeforeBuild">

-    <Copy SourceFiles="@(BinFiles)" DestinationFiles="@(BinFiles->'bin\$(Configuration)\Duplicati\%(RecursiveDir)%(Filename)%(Extension)')" />

-    <Copy SourceFiles="@(WebFiles)" DestinationFiles="@(WebFiles->'bin\$(Configuration)\Duplicati\webroot\%(RecursiveDir)%(Filename)%(Extension)')" />

-    <HeatDirectory Directory="bin\$(Configuration)\Duplicati\" OutputFile="binfiles.wxs" ComponentGroupName="DUPLICATIBIN" DirectoryRefId="INSTALLLOCATION" SuppressCom="true" SuppressRegistry="true" SuppressFragments="true" SuppressRootDirectory="true" SuppressUniqueIds="true" AutogenerateGuids="true" PreprocessorVariable="var.HarvestPath" ToolPath="$(WixToolPath)"/>

+    <Copy SourceFiles="@(BinFiles)" DestinationFiles="@(BinFiles->'Duplicati\%(RecursiveDir)%(Filename)%(Extension)')" />

+    <HeatDirectory Directory="Duplicati" OutputFile="binfiles.wxs" ComponentGroupName="DUPLICATIBIN" DirectoryRefId="INSTALLLOCATION" SuppressCom="true" SuppressRegistry="true" SuppressFragments="true" SuppressRootDirectory="true" SuppressUniqueIds="true" AutogenerateGuids="true" PreprocessorVariable="var.HarvestPath" ToolPath="$(WixToolPath)"/>

 	</Target>

 	<Target Name="AfterBuild">

 	</Target>

diff --git a/Installer/Windows/build-msi.bat b/Installer/Windows/build-msi.bat
new file mode 100644
index 000000000..435ca31f4
--- /dev/null
+++ b/Installer/Windows/build-msi.bat
@@ -0,0 +1,28 @@
+@echo off
+
+IF NOT EXIST "%1" (
+echo File not found, please supply a zip file with the build as the first argument
+goto EXIT
+)
+
+
+call "%VS120COMNTOOLS%vsvars32.bat"
+
+rmdir /s /q Duplicati
+del /q Duplicati.msi
+del /q Duplicati-32bit.msi
+
+7z x -oDuplicati %1
+
+rmdir /s /q obj
+rmdir /s /q bin
+
+msbuild /property:Configuration=Release /property:Platform=x64
+move bin\x64\Release\Duplicati.msi Duplicati.msi
+
+msbuild /property:Configuration=Release /property:Platform=x86
+move bin\x86\Release\Duplicati.msi Duplicati-32bit.msi
+
+rmdir /s /q Duplicati
+
+:EXIT
\ No newline at end of file