WinGui:

- Complete work to remove the framework library.
- Fix a couple of issues with the build script and updated the nsis scripts/

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

2 files changed, 12 insertions, 31 deletions

diff --git a/win/C#/Installer/Installer.nsi b/win/C#/Installer/Installer.nsi
index 9283fdd01..a4d70f3e0 100644
--- a/win/C#/Installer/Installer.nsi
+++ b/win/C#/Installer/Installer.nsi
@@ -8,15 +8,15 @@
 

 ; HM NIS Edit Wizard helper defines

 !define PRODUCT_NAME "HandBrake"

-!define PRODUCT_VERSION "0.9.5"

-!define PRODUCT_VERSION_NUMBER "0.9.5"

+!define PRODUCT_VERSION "0.9.6"

+!define PRODUCT_VERSION_NUMBER "0.9.6"

 !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"

 

 ;Required .NET framework

-!define MIN_FRA_MAJOR "3"

-!define MIN_FRA_MINOR "5"

+!define MIN_FRA_MAJOR "4"

+!define MIN_FRA_MINOR "0"

 !define MIN_FRA_BUILD "*"

 

 SetCompressor lzma

@@ -100,18 +100,18 @@ Section "Handbrake" SEC01
   Call CheckFramework

      StrCmp $0 "1" +3

         StrCpy $InstallDotNET "Yes"

-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 3.5 SP1 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}."

+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}."

      Pop $0

 

   ; Get .NET if required

   ${If} $InstallDotNET == "Yes"

      SetDetailsView hide

-     inetc::get /caption "Downloading .NET Framework 3.5" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=90&p=&SrcDisplayLang=en&SrcCategoryId=&SrcFamilyId=ab99342f-5d1a-413d-8319-81da479ab0d7&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f0%2f6%2f1%2f061f001c-8752-4600-a198-53214c69b51f%2fdotnetfx35setup.exe" "$INSTDIR\dotnetfx.exe" /end

+     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&SrcFamilyId=9CFB2D51-5FF4-4491-B0E5-B386F32C0992&SrcDisplayLang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f1%2fB%2fE%2f1BE39E79-7E39-46A3-96FF-047F95396215%2fdotNetFx40_Full_setup.exe" "$INSTDIR\dotnetfx.exe" /end

      Pop $1

 

      ${If} $1 != "OK"

            Delete "$INSTDIR\dotnetfx.exe"

-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 3.5 Framework"

+           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"

      ${EndIf}

 

      ExecWait "$INSTDIR\dotnetfx.exe"

@@ -133,7 +133,6 @@ Section "Handbrake" SEC01
   File "Growl.CoreLibrary.dll"

   File "Handbrake.exe.config"

   File "HandBrake.ApplicationServices.dll"

-  File "HandBrake.Framework.dll"

   File "Microsoft.WindowsAPICodePack.Shell.dll"

   File "Microsoft.WindowsAPICodePack.dll"

   File "HandBrakeInterop.dll"

diff --git a/win/C#/Installer/MakeNightly.nsi.tmpl b/win/C#/Installer/MakeNightly.nsi.tmpl
index b7b6a2ed5..3c5768a20 100644
--- a/win/C#/Installer/MakeNightly.nsi.tmpl
+++ b/win/C#/Installer/MakeNightly.nsi.tmpl
@@ -15,8 +15,8 @@
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"

 

 ;Required .NET framework

-!define MIN_FRA_MAJOR "3"

-!define MIN_FRA_MINOR "5"

+!define MIN_FRA_MAJOR "4"

+!define MIN_FRA_MINOR "0"

 !define MIN_FRA_BUILD "*"

 

 SetCompressor lzma

@@ -100,18 +100,18 @@ Section "Handbrake" SEC01
   Call CheckFramework

      StrCmp $0 "1" +3

         StrCpy $InstallDotNET "Yes"

-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 3.5 SP1 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}."

+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}."

      Pop $0

 

   ; Get .NET if required

   ${If} $InstallDotNET == "Yes"

      SetDetailsView hide

-     inetc::get /caption "Downloading .NET Framework 3.5" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=90&p=&SrcDisplayLang=en&SrcCategoryId=&SrcFamilyId=ab99342f-5d1a-413d-8319-81da479ab0d7&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f0%2f6%2f1%2f061f001c-8752-4600-a198-53214c69b51f%2fdotnetfx35setup.exe" "$INSTDIR\dotnetfx.exe" /end

+     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&SrcFamilyId=9CFB2D51-5FF4-4491-B0E5-B386F32C0992&SrcDisplayLang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f1%2fB%2fE%2f1BE39E79-7E39-46A3-96FF-047F95396215%2fdotNetFx40_Full_setup.exe" "$INSTDIR\dotnetfx.exe" /end

      Pop $1

 

      ${If} $1 != "OK"

            Delete "$INSTDIR\dotnetfx.exe"

-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 3.5 Framework"

+           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"

      ${EndIf}

 

      ExecWait "$INSTDIR\dotnetfx.exe"

@@ -133,19 +133,10 @@ Section "Handbrake" SEC01
   File "Growl.CoreLibrary.dll"

   File "Handbrake.exe.config"

   File "HandBrake.ApplicationServices.dll"

-  File "HandBrake.Framework.dll"

   File "Microsoft.WindowsAPICodePack.Shell.dll"

   File "Microsoft.WindowsAPICodePack.dll"

   File "HandBrakeInterop.dll"

 

-  ;File "Caliburn.Castle.dll"

-  ;File "Caliburn.Core.dll"

-  ;File "Castle.Core.dll"

-  ;File "Castle.DynamicProxy2.dll"

-  ;File "Castle.MicroKernel.dll"

-  ;File "Castle.Windsor.dll"

-  ;File "Microsoft.Practices.ServiceLocation.dll"

-

   ; Copy the standard doc set into the doc folder

   SetOutPath "$INSTDIR\doc"

   SetOverwrite ifnewer

@@ -195,19 +186,10 @@ Section Uninstall
   Delete "$INSTDIR\Growl.CoreLibrary.dll"

   Delete "$INSTDIR\libgcc_s_sjlj-1.dll"

   Delete "$INSTDIR\HandBrake.ApplicationServices.dll"

-  Delete "$INSTDIR\HandBrake.Framework.dll"

   Delete "$INSTDIR\Microsoft.WindowsAPICodePack.Shell.dll"

   Delete "$INSTDIR\Microsoft.WindowsAPICodePack.dll"

   Delete "$INSTDIR\HandBrakeInterop.dll"

 

-  Delete "$INSTDIR\Caliburn.Castle.dll"

-  Delete "$INSTDIR\Caliburn.Core.dll"

-  Delete "$INSTDIR\Castle.Core.dll"

-  Delete "$INSTDIR\Castle.DynamicProxy2.dll"

-  Delete "$INSTDIR\Castle.MicroKernel.dll"

-  Delete "$INSTDIR\Castle.Windsor.dll"

-  Delete "$INSTDIR\Microsoft.Practices.ServiceLocation.dll"

-

   Delete "$INSTDIR\doc\AUTHORS"

   Delete "$INSTDIR\doc\COPYING"

   Delete "$INSTDIR\doc\CREDITS"