WinGui: Added implementation of IWindsorInstaller to the AppServices library and updated the installers to use wildcards instead of hard coded files.

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

10 files changed, 84 insertions, 207 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 412719085..6265e1cf4 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -41,6 +41,13 @@
     <Optimize>true</Optimize>

   </PropertyGroup>

   <ItemGroup>

+    <Reference Include="Castle.Core">

+      <HintPath>..\libraries\caliburn\Castle.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="Castle.Windsor">

+      <HintPath>..\libraries\caliburn\Castle.Windsor.dll</HintPath>

+      <EmbedInteropTypes>False</EmbedInteropTypes>

+    </Reference>

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

       <SpecificVersion>False</SpecificVersion>

       <HintPath>..\libraries\Growl.Connector.dll</HintPath>

@@ -122,6 +129,7 @@
       <DependentUpon>Resources.resx</DependentUpon>

     </Compile>

     <Compile Include="ServiceManager.cs" />

+    <Compile Include="ServicesWindsorInstaller.cs" />

     <Compile Include="Services\Base\EncodeBase.cs" />

     <Compile Include="Services\Encode.cs" />

     <Compile Include="Services\Interfaces\IEncode.cs" />

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs
index 3d71688cb..ad2635556 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs
@@ -1,3 +1,8 @@
+/*  IQueueProcessor.cs $

+    This file is part of the HandBrake source code.

+    Homepage: <http://handbrake.fr/>.

+    It may be used under the terms of the GNU General Public License. */

+

 namespace HandBrake.ApplicationServices.Services.Interfaces

 {

     using System;

diff --git a/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs b/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs
new file mode 100644
index 000000000..a250aa2fa
--- /dev/null
+++ b/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs
@@ -0,0 +1,33 @@
+namespace HandBrake.ApplicationServices

+{

+    using Castle.MicroKernel.Registration;

+    using Castle.MicroKernel.SubSystems.Configuration;

+    using Castle.Windsor;

+

+    using HandBrake.ApplicationServices.Services;

+    using HandBrake.ApplicationServices.Services.Interfaces;

+

+    /// <summary>

+    /// An Implimentation of IWindsorInstaller for this library.

+    /// </summary>

+    public class ServicesWindsorInstaller : IWindsorInstaller

+    {

+        #region Implementation of IWindsorInstaller

+

+        /// <summary>

+        /// Performs the installation in the <see cref="T:Castle.Windsor.IWindsorContainer"/>.

+        /// </summary>

+        /// <param name="container">The container.</param><param name="store">The configuration store.</param>

+        public void Install(IWindsorContainer container, IConfigurationStore store)

+        {

+            container.Register(Component.For<IPresetService>().ImplementedBy<PresetService>());

+            container.Register(Component.For<IQueueManager>().ImplementedBy<QueueManager>());

+            container.Register(Component.For<IQueueProcessor>().ImplementedBy<QueueProcessor>());

+            container.Register(Component.For<IUserSettingService>().ImplementedBy<UserSettingService>());

+            container.Register(Component.For<IScan>().ImplementedBy<ScanService>());

+            container.Register(Component.For<IEncode>().ImplementedBy<Encode>());

+        }

+

+        #endregion

+    }

+}

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index c6ffc4194..645a64cb6 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
@@ -28,12 +28,6 @@ namespace HandBrake.ApplicationServices.Utilities
         /// </summary>

         private static IUserSettingService userSettingService = ServiceManager.UserSettingService;

 

-        /**

-         * TODO:

-         * - Update with the new vfr,pfr,cfr keys

-         * - Clean up this code, it's pretty nasty right now.

-         **/

-

         #region Import

 

         public static EncodeTask Import(string filename)

diff --git a/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs b/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
index 22811d348..02710b161 100644
--- a/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
+++ b/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
@@ -11,6 +11,8 @@
     using Castle.MicroKernel.Registration;

     using Castle.Windsor;

 

+    using HandBrake.ApplicationServices;

+

     using HandBrakeWPF.ViewModels;

     using HandBrakeWPF.ViewModels.Interfaces;

 

@@ -33,6 +35,10 @@
             this.windsorContainer.Register(Component.For<IWindowManager>().ImplementedBy<WindowManager>());

             this.windsorContainer.Register(Component.For<IEventAggregator>().ImplementedBy<EventAggregator>());

 

+            // Initialise the ApplicationServices IWindsorInstaller

+            this.windsorContainer.Register(Component.For<IWindsorInstaller>().ImplementedBy<ServicesWindsorInstaller>());

+            this.windsorContainer.Install(windsorContainer.ResolveAll<IWindsorInstaller>());

+

             // Shell

             this.windsorContainer.Register(Component.For<IMainViewModel>().ImplementedBy<MainViewModel>().LifeStyle.Is(LifestyleType.Singleton));

         }

diff --git a/win/CS/HandBrakeWPF/app.config b/win/CS/HandBrakeWPF/app.config
index f76deb94f..31b594129 100644
--- a/win/CS/HandBrakeWPF/app.config
+++ b/win/CS/HandBrakeWPF/app.config
@@ -1,3 +1,6 @@
 <?xml version="1.0"?>

 <configuration>

-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>

+  <startup>

+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>

+  </startup>

+</configuration>
\ No newline at end of file
diff --git a/win/CS/Installer/Installer.nsi b/win/CS/Installer/Installer.nsi
index 607bfb697..278eb3d8a 100644
--- a/win/CS/Installer/Installer.nsi
+++ b/win/CS/Installer/Installer.nsi
@@ -124,39 +124,18 @@ Section "Handbrake" SEC01
   ${EndIf}

   

   ; Install Files

-  File "Handbrake.exe"

-  File "HandBrakeCLI.exe"

+  File "*.exe"

   CreateDirectory "$SMPROGRAMS\Handbrake"

   CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"

   CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"

-  File "Growl.Connector.dll"

-  File "Growl.CoreLibrary.dll"

-  File "Handbrake.exe.config"

-  File "HandBrake.ApplicationServices.dll"

-  File "Microsoft.WindowsAPICodePack.Shell.dll"

-  File "Microsoft.WindowsAPICodePack.dll"

-  File "HandBrakeInterop.dll"

-  File "SplitButton.dll"

-  File "Ookii.Dialogs.Wpf.dll"

-  File "defaultsettings.xml"

-

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

+  File "*.dll"

+  File "*.config"

+  File "*.xml"

 

   ; Copy the standard doc set into the doc folder

   SetOutPath "$INSTDIR\doc"

   SetOverwrite ifnewer

-  File "doc\AUTHORS"

-  File "doc\COPYING"

-  File "doc\CREDITS"

-  File "doc\NEWS"

-  File "doc\THANKS"

-  File "doc\TRANSLATIONS"

+  File "doc\*.*"

 SectionEnd

 

 Section -AdditionalIcons

@@ -186,39 +165,8 @@ FunctionEnd
 Section Uninstall

   Delete "$INSTDIR\uninst.exe"

   

-  Delete "$INSTDIR\Interop.QTOLibrary.dll"

-  Delete "$INSTDIR\Interop.QTOControlLib.dll"

-  Delete "$INSTDIR\AxInterop.QTOControlLib.dll"

-  Delete "$INSTDIR\HandBrakeCLI.exe"

-  Delete "$INSTDIR\handbrakepineapple.ico"

-  Delete "$INSTDIR\Handbrake.exe"

-  Delete "$INSTDIR\Handbrake.exe.config"

-  Delete "$INSTDIR\Growl.Connector.dll"

-  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\SplitButton.dll"

-  Delete "$INSTDIR\defaultsettings.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\Ookii.Dialogs.Wpf.dll"

-

-  Delete "$INSTDIR\doc\AUTHORS"

-  Delete "$INSTDIR\doc\COPYING"

-  Delete "$INSTDIR\doc\CREDITS"

-  Delete "$INSTDIR\doc\NEWS"

-  Delete "$INSTDIR\doc\THANKS"

-  Delete "$INSTDIR\doc\TRANSLATIONS"

+  Delete "$INSTDIR\*.*"

+  Delete "$INSTDIR\doc\*.*"

   RMDir  "$INSTDIR\doc"

   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"

   Delete "$DESKTOP\Handbrake.lnk"

diff --git a/win/CS/Installer/Installer64.nsi b/win/CS/Installer/Installer64.nsi
index ae63028a4..ad93519ba 100644
--- a/win/CS/Installer/Installer64.nsi
+++ b/win/CS/Installer/Installer64.nsi
@@ -129,34 +129,14 @@ Section "Handbrake" SEC01
   CreateDirectory "$SMPROGRAMS\Handbrake"

   CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"

   CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"

-  File "Growl.Connector.dll"

-  File "Growl.CoreLibrary.dll"

-  File "Handbrake.exe.config"

-  File "HandBrake.ApplicationServices.dll"

-  File "Microsoft.WindowsAPICodePack.Shell.dll"

-  File "Microsoft.WindowsAPICodePack.dll"

-  File "HandBrakeInterop.dll"

-  File "SplitButton.dll"

-  File "Ookii.Dialogs.Wpf.dll"

-  File "defaultsettings.xml"

-

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

+  File "*.dll"

+  File "*.config"

+  File "*.xml"

 

   ; Copy the standard doc set into the doc folder

   SetOutPath "$INSTDIR\doc"

   SetOverwrite ifnewer

-  File "doc\AUTHORS"

-  File "doc\COPYING"

-  File "doc\CREDITS"

-  File "doc\NEWS"

-  File "doc\THANKS"

-  File "doc\TRANSLATIONS"

+  File "doc\*.*"

 SectionEnd

 

 Section -AdditionalIcons

@@ -186,39 +166,8 @@ FunctionEnd
 Section Uninstall

   Delete "$INSTDIR\uninst.exe"

   

-  Delete "$INSTDIR\Interop.QTOLibrary.dll"

-  Delete "$INSTDIR\Interop.QTOControlLib.dll"

-  Delete "$INSTDIR\AxInterop.QTOControlLib.dll"

-  Delete "$INSTDIR\HandBrakeCLI.exe"

-  Delete "$INSTDIR\handbrakepineapple.ico"

-  Delete "$INSTDIR\Handbrake.exe"

-  Delete "$INSTDIR\Handbrake.exe.config"

-  Delete "$INSTDIR\Growl.Connector.dll"

-  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\SplitButton.dll"

-  Delete "$INSTDIR\defaultsettings.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\Ookii.Dialogs.Wpf.dll"

-

-  Delete "$INSTDIR\doc\AUTHORS"

-  Delete "$INSTDIR\doc\COPYING"

-  Delete "$INSTDIR\doc\CREDITS"

-  Delete "$INSTDIR\doc\NEWS"

-  Delete "$INSTDIR\doc\THANKS"

-  Delete "$INSTDIR\doc\TRANSLATIONS"

+  Delete "$INSTDIR\*.*"

+  Delete "$INSTDIR\doc\*.*"

   RMDir  "$INSTDIR\doc"

   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"

   Delete "$DESKTOP\Handbrake.lnk"

diff --git a/win/CS/Installer/MakeNightly.nsi.tmpl b/win/CS/Installer/MakeNightly.nsi.tmpl
index 865da9c36..e33ee26fc 100644
--- a/win/CS/Installer/MakeNightly.nsi.tmpl
+++ b/win/CS/Installer/MakeNightly.nsi.tmpl
@@ -124,31 +124,19 @@ Section "Handbrake" SEC01
   ${EndIf}

   

   ; Install Files

-  File "Handbrake.exe"

-  File "HandBrakeCLI.exe"

+  ; Install Files

+  File "*.exe"

   CreateDirectory "$SMPROGRAMS\Handbrake"

   CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"

   CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"

-  File "Growl.Connector.dll"

-  File "Growl.CoreLibrary.dll"

-  File "Handbrake.exe.config"

-  File "HandBrake.ApplicationServices.dll"

-  File "Microsoft.WindowsAPICodePack.Shell.dll"

-  File "Microsoft.WindowsAPICodePack.dll"

-  File "HandBrakeInterop.dll"

-  File "SplitButton.dll"

-  File "Ookii.Dialogs.Wpf.dll"

-  File "defaultsettings.xml"

+  File "*.dll"

+  File "*.config"

+  File "*.xml"

 

   ; Copy the standard doc set into the doc folder

   SetOutPath "$INSTDIR\doc"

   SetOverwrite ifnewer

-  File "doc\AUTHORS"

-  File "doc\COPYING"

-  File "doc\CREDITS"

-  File "doc\NEWS"

-  File "doc\THANKS"

-  File "doc\TRANSLATIONS"

+  File "doc\*.*"

 SectionEnd

 

 Section -AdditionalIcons

@@ -178,30 +166,8 @@ FunctionEnd
 Section Uninstall

   Delete "$INSTDIR\uninst.exe"

   

-  Delete "$INSTDIR\Interop.QTOLibrary.dll"

-  Delete "$INSTDIR\Interop.QTOControlLib.dll"

-  Delete "$INSTDIR\AxInterop.QTOControlLib.dll"

-  Delete "$INSTDIR\HandBrakeCLI.exe"

-  Delete "$INSTDIR\handbrakepineapple.ico"

-  Delete "$INSTDIR\Handbrake.exe"

-  Delete "$INSTDIR\Handbrake.exe.config"

-  Delete "$INSTDIR\Growl.Connector.dll"

-  Delete "$INSTDIR\Growl.CoreLibrary.dll"

-  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"

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

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

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

-  Delete "$INSTDIR\HandBrakeInterop.dll"

-  Delete "$INSTDIR\SplitButton.dll"

-  Delete "$INSTDIR\Ookii.Dialogs.Wpf.dll"

-  Delete "$INSTDIR\defaultsettings.dll"

-

-  Delete "$INSTDIR\doc\AUTHORS"

-  Delete "$INSTDIR\doc\COPYING"

-  Delete "$INSTDIR\doc\CREDITS"

-  Delete "$INSTDIR\doc\NEWS"

-  Delete "$INSTDIR\doc\THANKS"

-  Delete "$INSTDIR\doc\TRANSLATIONS"

+  Delete "$INSTDIR\*.*"

+  Delete "$INSTDIR\doc\*.*"

   RMDir  "$INSTDIR\doc"

   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"

   Delete "$DESKTOP\Handbrake.lnk"

diff --git a/win/CS/Installer/MakeNightly64.nsi.tmpl b/win/CS/Installer/MakeNightly64.nsi.tmpl
index b55e42f09..c8fc37726 100644
--- a/win/CS/Installer/MakeNightly64.nsi.tmpl
+++ b/win/CS/Installer/MakeNightly64.nsi.tmpl
@@ -124,31 +124,18 @@ Section "Handbrake" SEC01
   ${EndIf}

   

   ; Install Files

-  File "Handbrake.exe"

-  File "HandBrakeCLI.exe"

+  File "*.exe"

   CreateDirectory "$SMPROGRAMS\Handbrake"

   CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"

   CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"

-  File "Growl.Connector.dll"

-  File "Growl.CoreLibrary.dll"

-  File "Handbrake.exe.config"

-  File "HandBrake.ApplicationServices.dll"

-  File "Microsoft.WindowsAPICodePack.Shell.dll"

-  File "Microsoft.WindowsAPICodePack.dll"

-  File "HandBrakeInterop.dll"

-  File "SplitButton.dll"

-  File "Ookii.Dialogs.Wpf.dll"

-  File "defaultsettings.xml"

+  File "*.dll"

+  File "*.config"

+  File "*.xml"

 

   ; Copy the standard doc set into the doc folder

   SetOutPath "$INSTDIR\doc"

   SetOverwrite ifnewer

-  File "doc\AUTHORS"

-  File "doc\COPYING"

-  File "doc\CREDITS"

-  File "doc\NEWS"

-  File "doc\THANKS"

-  File "doc\TRANSLATIONS"

+  File "doc\*.*"

 SectionEnd

 

 Section -AdditionalIcons

@@ -178,30 +165,8 @@ FunctionEnd
 Section Uninstall

   Delete "$INSTDIR\uninst.exe"

   

-  Delete "$INSTDIR\Interop.QTOLibrary.dll"

-  Delete "$INSTDIR\Interop.QTOControlLib.dll"

-  Delete "$INSTDIR\AxInterop.QTOControlLib.dll"

-  Delete "$INSTDIR\HandBrakeCLI.exe"

-  Delete "$INSTDIR\handbrakepineapple.ico"

-  Delete "$INSTDIR\Handbrake.exe"

-  Delete "$INSTDIR\Handbrake.exe.config"

-  Delete "$INSTDIR\Growl.Connector.dll"

-  Delete "$INSTDIR\Growl.CoreLibrary.dll"

-  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"

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

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

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

-  Delete "$INSTDIR\HandBrakeInterop.dll"

-  Delete "$INSTDIR\SplitButton.dll"

-  Delete "$INSTDIR\Ookii.Dialogs.Wpf.dll"

-  Delete "$INSTDIR\defaultsettings.dll"

-

-  Delete "$INSTDIR\doc\AUTHORS"

-  Delete "$INSTDIR\doc\COPYING"

-  Delete "$INSTDIR\doc\CREDITS"

-  Delete "$INSTDIR\doc\NEWS"

-  Delete "$INSTDIR\doc\THANKS"

-  Delete "$INSTDIR\doc\TRANSLATIONS"

+  Delete "$INSTDIR\*.*"

+  Delete "$INSTDIR\doc\*.*"

   RMDir  "$INSTDIR\doc"

   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"

   Delete "$DESKTOP\Handbrake.lnk"