summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2010-10-24 10:58:36 +0000
committersr55 <[email protected]>2010-10-24 10:58:36 +0000
commit3a1b6a0ce8cad3c6030a5bbcf924d7d01043a03f (patch)
tree4b103781ea05df7f5d4b9aa163144c431592b283
parentf15679077f20ac8976add2c0387bcf169a8c64f6 (diff)
WinGui:
- Fix the nightly build. Was missing the service location dll. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3626 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--win/C#/Installer/Installer.nsi4
-rw-r--r--win/C#/Installer/MakeNightly.nsi.tmpl2
2 files changed, 5 insertions, 1 deletions
diff --git a/win/C#/Installer/Installer.nsi b/win/C#/Installer/Installer.nsi
index 48b8c4a3e..1b8320ef5 100644
--- a/win/C#/Installer/Installer.nsi
+++ b/win/C#/Installer/Installer.nsi
@@ -145,7 +145,8 @@ Section "Handbrake" SEC01
File "Castle.DynamicProxy2.dll"
File "Castle.MicroKernel.dll"
File "Castle.Windsor.dll"
-
+ File "Microsoft.Practices.ServiceLocation.dll"
+
SetOutPath "$INSTDIR\doc"
SetOverwrite ifnewer
File "doc\AUTHORS"
@@ -203,6 +204,7 @@ Section Uninstall
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"
diff --git a/win/C#/Installer/MakeNightly.nsi.tmpl b/win/C#/Installer/MakeNightly.nsi.tmpl
index 9aceb637d..ef9f6666f 100644
--- a/win/C#/Installer/MakeNightly.nsi.tmpl
+++ b/win/C#/Installer/MakeNightly.nsi.tmpl
@@ -143,6 +143,7 @@ Section "Handbrake" SEC01
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"
@@ -203,6 +204,7 @@ Section Uninstall
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"