WinGui:

- Add a new build target called "Install".  If you have NSIS installed and it's in your path, you can now use the "Install" target to automatically build the HandBrake Installer for the Windows GUI.
HandBrakeCLI.exe, libgcc_s_sjlj-1.dll, "doc" folder, and  handbrakepineapple.ico must all be copied into the "bin/install" folder for this to work.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3192 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 61 insertions, 2 deletions

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 701316b78..a28bdc3a5 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -97,6 +97,42 @@
     <PlatformTarget>x86</PlatformTarget>

     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

   </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Install|AnyCPU'">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\Install\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

+    <Optimize>true</Optimize>

+    <DebugType>full</DebugType>

+    <PlatformTarget>x86</PlatformTarget>

+    <CodeAnalysisLogFile>bin\Release\Handbrake.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>

+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>

+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>

+    <UseVSHostingProcess>false</UseVSHostingProcess>

+    <ErrorReport>prompt</ErrorReport>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRuleSetDirectories>;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>

+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>

+    <CodeAnalysisRuleDirectories>;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>

+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>

+    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>

+  </PropertyGroup>

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

+    <OutputPath>bin\x86\Install\</OutputPath>

+    <DefineConstants>TRACE;DEBUG</DefineConstants>

+    <Optimize>true</Optimize>

+    <PlatformTarget>x86</PlatformTarget>

+    <CodeAnalysisLogFile>bin\x86\Release\Handbrake.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>

+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>

+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>

+    <UseVSHostingProcess>false</UseVSHostingProcess>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRuleSetDirectories>;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>

+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>

+    <CodeAnalysisRuleDirectories>;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>

+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>

+    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>

+  </PropertyGroup>

   <ItemGroup>

     <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">

       <SpecificVersion>False</SpecificVersion>

@@ -317,6 +353,7 @@
       <DesignTime>True</DesignTime>

     </Compile>

     <None Include="app.config" />

+    <None Include="Installer\Installer.nsi" />

     <None Include="Properties\Settings.settings">

       <Generator>SettingsSingleFileGenerator</Generator>

       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

@@ -365,6 +402,11 @@
     <None Include="Resources\General Preferences.png" />

   </ItemGroup>

   <ItemGroup>

+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

+      <Visible>False</Visible>

+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>

+      <Install>false</Install>

+    </BootstrapperPackage>

     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">

       <Visible>False</Visible>

       <ProductName>.NET Framework 2.0 %28x86%29</ProductName>

@@ -380,6 +422,11 @@
       <ProductName>.NET Framework 3.5</ProductName>

       <Install>true</Install>

     </BootstrapperPackage>

+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">

+      <Visible>False</Visible>

+      <ProductName>.NET Framework 3.5 SP1</ProductName>

+      <Install>false</Install>

+    </BootstrapperPackage>

     <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">

       <Visible>False</Visible>

       <ProductName>Windows Installer 3.1</ProductName>

@@ -429,4 +476,10 @@
   </Target>

   -->

   <Import Project="$(ProgramFiles)\MSBuild\Microsoft\StyleCop\v4.3\Microsoft.StyleCop.targets" />

+  <PropertyGroup>

+    <PostBuildEvent>cd ../../

+copy Installer\Installer.nsi bin\Install

+cd bin\Install

+makensis Installer.nsi</PostBuildEvent>

+  </PropertyGroup>

 </Project>
\ No newline at end of file
diff --git a/win/C#/HandBrakeCS.sln b/win/C#/HandBrakeCS.sln
index 34013bf20..cc4ccc3c6 100644
--- a/win/C#/HandBrakeCS.sln
+++ b/win/C#/HandBrakeCS.sln
@@ -7,6 +7,8 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Any CPU = Debug|Any CPU

 		Debug|x86 = Debug|x86

+		Install|Any CPU = Install|Any CPU

+		Install|x86 = Install|x86

 		Release|Any CPU = Release|Any CPU

 		Release|x86 = Release|x86

 	EndGlobalSection

@@ -15,6 +17,10 @@ Global
 		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x86.ActiveCfg = Release|x86

 		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x86.Build.0 = Release|x86

+		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|Any CPU.ActiveCfg = Install|Any CPU

+		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|Any CPU.Build.0 = Install|Any CPU

+		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|x86.ActiveCfg = Install|x86

+		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|x86.Build.0 = Install|x86

 		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.Build.0 = Release|Any CPU

 		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.ActiveCfg = Release|x86

diff --git a/win/C#/Installer/Installer.nsi b/win/C#/Installer/Installer.nsi
index 8faf8a069..b24c47278 100644
--- a/win/C#/Installer/Installer.nsi
+++ b/win/C#/Installer/Installer.nsi
@@ -8,8 +8,8 @@
 

 ; HM NIS Edit Wizard helper defines

 !define PRODUCT_NAME "Handbrake"

-!define PRODUCT_VERSION "SVN 3090 Snapshot"

-!define PRODUCT_VERSION_NUMBER "svn3090"

+!define PRODUCT_VERSION "SVN 3191 Snapshot"

+!define PRODUCT_VERSION_NUMBER "svn3191"

 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"

 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

 !define PRODUCT_UNINST_ROOT_KEY "HKLM"