]> granicus.if.org Git - handbrake/commitdiff
WinGui: Tidy up the build system by removing x86 build profiles.
authorsr55 <sr55.hb@outlook.com>
Fri, 13 Apr 2018 22:53:21 +0000 (23:53 +0100)
committersr55 <sr55.hb@outlook.com>
Fri, 13 Apr 2018 22:53:21 +0000 (23:53 +0100)
win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
win/CS/HandBrake.sln
win/CS/HandBrakeWPF/App.xaml.cs
win/CS/HandBrakeWPF/Constants.cs
win/CS/HandBrakeWPF/HandBrakeWPF.csproj
win/CS/HandBrakeWPF/Installer/Installer.nsi [deleted file]
win/CS/HandBrakeWPF/Installer/MakeNightly.nsi [deleted file]
win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
win/CS/HandBrakeWPF/Properties/Resources.resx
win/CS/HandBrakeWPF/Services/UpdateService.cs
win/CS/build.xml

index 657f6b7a2dbb383031eb4cd8a3bcfa82ddfdb0b5..56fc36d638e5d4f2d04c3afa1fbff2eca607162f 100644 (file)
     <TargetFrameworkProfile>\r
     </TargetFrameworkProfile>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">\r
-    <PlatformTarget>AnyCPU</PlatformTarget>\r
-    <OutputPath>bin\Debug\</OutputPath>\r
-    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
-    <Prefer32Bit>false</Prefer32Bit>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">\r
-    <PlatformTarget>AnyCPU</PlatformTarget>\r
-    <OutputPath>bin\Release\</OutputPath>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
-    <DebugType>pdbonly</DebugType>\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <Prefer32Bit>false</Prefer32Bit>\r
-  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
     <PlatformTarget>AnyCPU</PlatformTarget>\r
     <OutputPath>bin\Debug\</OutputPath>\r
index 0c3cc678f70290c3109223f0f6a74272d445862d..b62d06cc4c93fc639ee59e09224a7baa39487419 100644 (file)
@@ -19,43 +19,27 @@ EndProject
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|x64 = Debug|x64\r
-               Debug|x86 = Debug|x86\r
                Release|x64 = Release|x64\r
-               Release|x86 = Release|x86\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
                {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x64.ActiveCfg = Debug|x64\r
                {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x64.Build.0 = Debug|x64\r
-               {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x86.ActiveCfg = Debug|x86\r
-               {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x86.Build.0 = Debug|x86\r
                {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|x64.ActiveCfg = Release|x64\r
                {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|x64.Build.0 = Release|x64\r
-               {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|x86.ActiveCfg = Release|x86\r
-               {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|x86.Build.0 = Release|x86\r
-               {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x64.ActiveCfg = Debug|x64\r
-               {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x64.Build.0 = Debug|x64\r
-               {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x86.ActiveCfg = Debug|x86\r
-               {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x86.Build.0 = Debug|x86\r
+               {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x64.ActiveCfg = Debug|x86\r
+               {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x64.Build.0 = Debug|x86\r
                {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x64.ActiveCfg = Release|x64\r
                {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x64.Build.0 = Release|x64\r
-               {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x86.ActiveCfg = Release|x86\r
-               {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x86.Build.0 = Release|x86\r
                {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Debug|x64.ActiveCfg = Debug|Any CPU\r
                {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Debug|x64.Build.0 = Debug|Any CPU\r
-               {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Debug|x86.ActiveCfg = Debug|Any CPU\r
-               {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Debug|x86.Build.0 = Debug|Any CPU\r
                {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x64.ActiveCfg = Release|Any CPU\r
                {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x64.Build.0 = Release|Any CPU\r
-               {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x86.ActiveCfg = Release|Any CPU\r
-               {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x86.Build.0 = Release|Any CPU\r
                {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Debug|x64.ActiveCfg = Debug|x64\r
                {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Debug|x64.Build.0 = Debug|x64\r
                {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Debug|x64.Deploy.0 = Debug|x64\r
-               {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Debug|x86.ActiveCfg = Debug|x64\r
                {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Release|x64.ActiveCfg = Release|x64\r
                {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Release|x64.Build.0 = Release|x64\r
                {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Release|x64.Deploy.0 = Release|x64\r
-               {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Release|x86.ActiveCfg = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
index 3d095277664d665bc046fb8f2f76a717beea78ed..d9349e567ae73f2d50133fbe4f5409edca84e211 100644 (file)
@@ -17,6 +17,8 @@ namespace HandBrakeWPF
 \r
     using Caliburn.Micro;\r
 \r
+    using HandBrake.ApplicationServices.Utilities;\r
+\r
     using HandBrakeWPF.Startup;\r
     using HandBrakeWPF.Utilities;\r
     using HandBrakeWPF.ViewModels;\r
@@ -53,7 +55,14 @@ namespace HandBrakeWPF
             OperatingSystem os = Environment.OSVersion;\r
             if (((os.Platform == PlatformID.Win32NT) && (os.Version.Major == 5)) || ((os.Platform == PlatformID.Win32NT) && (os.Version.Major == 6 && os.Version.Minor < 1)))\r
             {\r
-                MessageBox.Show("HandBrake requires Windows 7 or later to run. Version 0.9.9 (XP) and 0.10.5 (Vista) was the last version to support these versions.", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning);\r
+                MessageBox.Show(HandBrakeWPF.Properties.Resources.OsVersionWarning, HandBrakeWPF.Properties.Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);\r
+                Application.Current.Shutdown();\r
+                return;\r
+            }\r
+\r
+            if (!Environment.Is64BitOperatingSystem)\r
+            {\r
+                MessageBox.Show(HandBrakeWPF.Properties.Resources.OsBitnessWarning, HandBrakeWPF.Properties.Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);\r
                 Application.Current.Shutdown();\r
                 return;\r
             }\r
index 49e0183c57defe29b3d85386b1f45e60a80ea372..37d0f923b1ec2e1f4e7cc985c4a4e1d83c2b8704 100644 (file)
@@ -19,16 +19,6 @@ namespace HandBrakeWPF
         /// </summary>\r
         public const string Appcast64 = "https://handbrake.fr/appcast.x86_64.xml";\r
 \r
-        /// <summary>\r
-        /// The appcast 32.\r
-        /// </summary>\r
-        public const string Appcast32 = "https://handbrake.fr/appcast.i386.xml";\r
-\r
-        /// <summary>\r
-        /// The appcast 32.\r
-        /// </summary>\r
-        public const string AppcastUnstable32 = "https://handbrake.fr/appcast_unstable.i386.xml";\r
-\r
         /// <summary>\r
         /// The appcast 32.\r
         /// </summary>\r
index c366fe1c610ea4dd8fd26ad5b9d597677db3365a..a414b50d5e353d2fdcb58f76303bd6f354364620 100644 (file)
     </AdditionalFiles>\r
     <None Include="app.config" />\r
     <None Include="app.manifest" />\r
-    <None Include="Installer\Installer.nsi" />\r
     <None Include="Installer\Installer64.nsi" />\r
-    <None Include="Installer\MakeNightly.nsi" />\r
     <None Include="Installer\MakeNightly64.nsi" />\r
     <AppDesigner Include="Properties\" />\r
     <EmbeddedResource Include="public.key" />\r
diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi
deleted file mode 100644 (file)
index fdc8ea9..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-/*  Resources.Designer.cs $\r
-\r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://HandBrake.fr/>.\r
-          It may be used under the terms of the GNU General Public License. */\r
-\r
-; Script generated by the HM NIS Edit Script Wizard.\r
-\r
-; HM NIS Edit Wizard helper defines\r
-!define PRODUCT_NAME "HandBrake"\r
-!define PRODUCT_VERSION "1.1.0"\r
-!define PRODUCT_VERSION_NUMBER "1.1.0"\r
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"\r
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
-\r
-;Required .NET framework\r
-!define MIN_FRA_MAJOR "4"\r
-!define MIN_FRA_MINOR "6"\r
-!define MIN_FRA_BUILD "*"\r
-\r
-SetCompressor lzma\r
-\r
-; MUI 1.67 compatible ------\r
-!include "MUI.nsh"\r
-!include WinVer.nsh\r
-\r
-; MUI Settings\r
-!define MUI_ABORTWARNING\r
-!define MUI_ICON "HandBrakepineapple.ico"\r
-!define MUI_UNICON "HandBrakepineapple.ico"\r
-\r
-; Welcome page\r
-!insertmacro MUI_PAGE_WELCOME\r
-; License page\r
-!insertmacro MUI_PAGE_LICENSE "doc\COPYING"\r
-; Directory page\r
-!insertmacro MUI_PAGE_DIRECTORY\r
-; Instfiles page\r
-!insertmacro MUI_PAGE_INSTFILES\r
-; Finish page\r
-;!define MUI_FINISHPAGE_RUN "$INSTDIR\HandBrake.exe"\r
-!insertmacro MUI_PAGE_FINISH\r
-\r
-; Uninstaller pages\r
-!insertmacro MUI_UNPAGE_INSTFILES\r
-\r
-; Language files\r
-!insertmacro MUI_LANGUAGE "English"\r
-\r
-; MUI end ------\r
-\r
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"\r
-OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-Win_GUI.exe"\r
-\r
-!include WordFunc.nsh\r
-!insertmacro VersionCompare\r
-!include LogicLib.nsh\r
-\r
-InstallDir "$PROGRAMFILES\HandBrake"\r
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""\r
-ShowInstDetails show\r
-ShowUnInstDetails show\r
-\r
-Var InstallDotNET\r
-\r
-Function .onInit\r
-\r
-  ; For Silent Installs, Assume All Users\r
-  IfSilent 0 +2\r
-    SetShellVarContext all  \r
-\r
-  ; Begin Only allow one version\r
-  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'\r
-  Pop $R0\r
-\r
-  StrCmp $R0 0 +3\r
-  MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK\r
-  Abort\r
-  \r
-  ; Detect if the intsaller is running on Windows XP/Vista and abort if it is.\r
-  ${IfNot} ${AtLeastWin7}\r
-    MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake."\r
-    Quit\r
-  ${EndIf}\r
-\r
-  ;Remove previous version\r
-  ReadRegStr $R0 HKLM \\r
-  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \\r
-  "UninstallString"\r
-  StrCmp $R0 "" done\r
-\r
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \\r
-  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \\r
-  previous version or `Cancel` to continue." /SD IDOK \\r
-  IDOK uninst\r
-  goto done\r
-\r
- ;Run the uninstaller\r
-  uninst:\r
-   IfSilent +3\r
-   ExecWait $INSTDIR\uninst.exe\r
-   goto done\r
-   ExecWait '"$INSTDIR\uninst.exe" /S'\r
-  done:\r
-FunctionEnd\r
-\r
-Section "HandBrake" SEC01\r
-  SetOutPath "$INSTDIR"\r
-  SetOverwrite ifnewer\r
-\r
-  ; Begin Check .NET version\r
-  StrCpy $InstallDotNET "No"\r
-  Call CheckFramework\r
-     StrCmp $0 "1" +3\r
-        StrCpy $InstallDotNET "Yes"\r
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.6 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK\r
-     Pop $0\r
-\r
-  ; Get .NET if required\r
-  ${If} $InstallDotNET == "Yes"\r
-     SetDetailsView hide\r
-     inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "https://www.microsoft.com/en-us/download/confirmation.aspx?id=49982" "$INSTDIR\dotnetfx.exe" /end\r
-     Pop $1\r
-\r
-     ${If} $1 != "OK"\r
-           Delete "$INSTDIR\dotnetfx.exe"\r
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.6 Framework"\r
-     ${EndIf}\r
-\r
-     ExecWait "$INSTDIR\dotnetfx.exe"\r
-     Delete "$INSTDIR\dotnetfx.exe"\r
-\r
-     SetDetailsView show\r
-  ${EndIf}\r
-  \r
-  ; Install Files\r
-  File "*.exe"\r
-  CreateDirectory "$SMPROGRAMS\HandBrake"\r
-  CreateShortCut "$SMPROGRAMS\HandBrake\HandBrake.lnk" "$INSTDIR\HandBrake.exe"\r
-  CreateShortCut "$DESKTOP\HandBrake.lnk" "$INSTDIR\HandBrake.exe"\r
-  File "*.dll"\r
-  File "*.template"\r
-  File "*.config"\r
-  File "*.pdb"\r
-\r
-  ; Copy the standard doc set into the doc folder\r
-  SetOutPath "$INSTDIR\doc"\r
-  SetOverwrite ifnewer\r
-  File "doc\*.*"\r
-SectionEnd\r
-\r
-Section -AdditionalIcons\r
-  CreateShortCut "$SMPROGRAMS\HandBrake\Uninstall.lnk" "$INSTDIR\uninst.exe"\r
-SectionEnd\r
-\r
-Section -Post\r
-  WriteUninstaller "$INSTDIR\uninst.exe"\r
-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\HandBrake.exe"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\HandBrake.exe"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"\r
-SectionEnd\r
-\r
-\r
-Function un.onUninstSuccess\r
-  HideWindow\r
-  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK\r
-FunctionEnd\r
-\r
-Function un.onInit\r
-\r
-  ; For Silent Installs, Assume All Users\r
-  IfSilent 0 +2\r
-    SetShellVarContext all  \r
-\r
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2\r
-  Abort\r
-FunctionEnd\r
-\r
-Section Uninstall\r
-  Delete "$INSTDIR\uninst.exe"\r
-  \r
-  Delete "$INSTDIR\*.*"\r
-  Delete "$INSTDIR\doc\*.*"\r
-  RMDir  "$INSTDIR\doc"\r
-  Delete "$SMPROGRAMS\HandBrake\Uninstall.lnk"\r
-  Delete "$DESKTOP\HandBrake.lnk"\r
-  Delete "$SMPROGRAMS\HandBrake\HandBrake.lnk"\r
-  RMDir  "$SMPROGRAMS\HandBrake"\r
-  RMDir  "$INSTDIR"\r
-\r
-  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"\r
-  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"\r
-  SetAutoClose true\r
-SectionEnd\r
-\r
-;Check for .NET framework\r
-Function CheckFrameWork\r
-  ; Magic numbers from http://msdn.microsoft.com/en-us/library/ee942965.aspx\r
-    ClearErrors\r
-    ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Release"\r
-\r
-    IfErrors NotDetected\r
-\r
-    ${If} $0 >= 393295\r
-        StrCpy $0 "1"\r
-    ${Else}\r
-               NotDetected:\r
-                 StrCpy $0 "2"\r
-    ${EndIf}\r
-\r
-FunctionEnd
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
deleted file mode 100644 (file)
index 4d19fff..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-/*  Resources.Designer.cs $\r
-\r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://HandBrake.fr/>.\r
-          It may be used under the terms of the GNU General Public License. */\r
-\r
-; Script generated by the HM NIS Edit Script Wizard.\r
-\r
-; HM NIS Edit Wizard helper defines\r
-!define PRODUCT_NAME "HandBrake Nightly"\r
-!define PRODUCT_VERSION "Nightly"\r
-!define PRODUCT_VERSION_NUMBER "Nightly"\r
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"\r
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
-\r
-;Required .NET framework\r
-!define MIN_FRA_MAJOR "4"\r
-!define MIN_FRA_MINOR "6"\r
-!define MIN_FRA_BUILD "*"\r
-\r
-SetCompressor lzma\r
-\r
-; MUI 1.67 compatible ------\r
-!include "MUI.nsh"\r
-!include WinVer.nsh\r
-\r
-; MUI Settings\r
-!define MUI_ABORTWARNING\r
-!define MUI_ICON "HandBrakepineapple.ico"\r
-!define MUI_UNICON "HandBrakepineapple.ico"\r
-\r
-; Welcome page\r
-!insertmacro MUI_PAGE_WELCOME\r
-; License page\r
-!insertmacro MUI_PAGE_LICENSE "doc\COPYING"\r
-; Directory page\r
-!insertmacro MUI_PAGE_DIRECTORY\r
-; Instfiles page\r
-!insertmacro MUI_PAGE_INSTFILES\r
-; Finish page\r
-;!define MUI_FINISHPAGE_RUN "$INSTDIR\HandBrake.exe"\r
-!insertmacro MUI_PAGE_FINISH\r
-\r
-; Uninstaller pages\r
-!insertmacro MUI_UNPAGE_INSTFILES\r
-\r
-; Language files\r
-!insertmacro MUI_LANGUAGE "English"\r
-\r
-; MUI end ------\r
-\r
-Name "${PRODUCT_NAME}"\r
-OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}_i686-Win_GUI.exe"\r
-\r
-!include WordFunc.nsh\r
-!insertmacro VersionCompare\r
-!include LogicLib.nsh\r
-\r
-InstallDir "$PROGRAMFILES\HandBrake Nightly"\r
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""\r
-ShowInstDetails show\r
-ShowUnInstDetails show\r
-\r
-Var InstallDotNET\r
-\r
-Function .onInit\r
\r
-  ; For Silent Installs, Assume All Users\r
-  IfSilent 0 +2\r
-    SetShellVarContext all  \r
-\r
-  ; Begin Only allow one version\r
-  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'\r
-  Pop $R0\r
-\r
-  StrCmp $R0 0 +3\r
-  MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK\r
-  Abort\r
-\r
-  ; Detect if the intsaller is running on Windows XP/Vista and abort if it is.\r
-  ${IfNot} ${AtLeastWin7}\r
-    MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake."\r
-    Quit\r
-  ${EndIf}\r
-\r
-  ;Remove previous version\r
-  ReadRegStr $R0 HKLM \\r
-  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \\r
-  "UninstallString"\r
-  StrCmp $R0 "" done\r
-\r
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \\r
-  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \\r
-  previous version or `Cancel` to continue." /SD IDOK \\r
-  IDOK uninst\r
-  goto done\r
-\r
- ;Run the uninstaller\r
-  uninst:\r
-   IfSilent +3\r
-   ExecWait $INSTDIR\uninst.exe\r
-   goto done\r
-   ExecWait '"$INSTDIR\uninst.exe" /S'\r
-  done:\r
-FunctionEnd\r
-\r
-Section "HandBrake" SEC01\r
-  SetOutPath "$INSTDIR"\r
-  SetOverwrite ifnewer\r
-\r
-  ; Begin Check .NET version\r
-  StrCpy $InstallDotNET "No"\r
-  Call CheckFramework\r
-     StrCmp $0 "1" +3\r
-        StrCpy $InstallDotNET "Yes"\r
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.6 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK\r
-     Pop $0\r
-\r
-  ; Get .NET if required\r
-  ${If} $InstallDotNET == "Yes"\r
-     SetDetailsView hide\r
-     inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "https://www.microsoft.com/en-us/download/confirmation.aspx?id=49982" "$INSTDIR\dotnetfx.exe" /end\r
-     Pop $1\r
-\r
-     ${If} $1 != "OK"\r
-           Delete "$INSTDIR\dotnetfx.exe"\r
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.6 Framework"\r
-     ${EndIf}\r
-\r
-     ExecWait "$INSTDIR\dotnetfx.exe"\r
-     Delete "$INSTDIR\dotnetfx.exe"\r
-\r
-     SetDetailsView show\r
-  ${EndIf}\r
-  \r
-  ; Install Files\r
-  File "*.exe"\r
-  CreateDirectory "$SMPROGRAMS\HandBrake Nightly"\r
-  CreateShortCut "$SMPROGRAMS\HandBrake Nightly\HandBrake Nightly.lnk" "$INSTDIR\HandBrake.exe"\r
-  CreateShortCut "$DESKTOP\HandBrake Nightly.lnk" "$INSTDIR\HandBrake.exe"\r
-  File "*.dll"\r
-  File "*.template"\r
-  File "*.config"\r
-  File "*.pdb"\r
-\r
-  ; Copy the standard doc set into the doc folder\r
-  SetOutPath "$INSTDIR\doc"\r
-  SetOverwrite ifnewer\r
-  File "doc\*.*"\r
-SectionEnd\r
-\r
-Section -AdditionalIcons\r
-  CreateShortCut "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk" "$INSTDIR\uninst.exe"\r
-SectionEnd\r
-\r
-Section -Post\r
-  WriteUninstaller "$INSTDIR\uninst.exe"\r
-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\HandBrake.exe"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\HandBrake.exe"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"\r
-SectionEnd\r
-\r
-\r
-Function un.onUninstSuccess\r
-  HideWindow\r
-  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK\r
-FunctionEnd\r
-\r
-Function un.onInit\r
-\r
-  ; For Silent Installs, Assume All Users\r
-  IfSilent 0 +2\r
-    SetShellVarContext all  \r
-\r
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2\r
-  Abort\r
-FunctionEnd\r
-\r
-Section Uninstall\r
-  Delete "$INSTDIR\uninst.exe"\r
-  \r
-  Delete "$INSTDIR\*.*"\r
-  Delete "$INSTDIR\doc\*.*"\r
-  RMDir  "$INSTDIR\doc"\r
-  Delete "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk"\r
-  Delete "$DESKTOP\HandBrake Nightly.lnk"\r
-  Delete "$SMPROGRAMS\HandBrake Nightly\HandBrake Nightly.lnk"\r
-  RMDir  "$SMPROGRAMS\HandBrake Nightly"\r
-  RMDir  "$INSTDIR"\r
-\r
-  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"\r
-  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"\r
-  SetAutoClose true\r
-SectionEnd\r
-\r
-;Check for .NET framework\r
-Function CheckFrameWork\r
-  ; Magic numbers from http://msdn.microsoft.com/en-us/library/ee942965.aspx\r
-    ClearErrors\r
-    ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Release"\r
-\r
-    IfErrors NotDetected\r
-\r
-    ${If} $0 >= 393295\r
-        StrCpy $0 "1"\r
-    ${Else}\r
-               NotDetected:\r
-                 StrCpy $0 "2"\r
-    ${EndIf}\r
-\r
-FunctionEnd
\ No newline at end of file
index 4f350073bda14546a65fe735296340a1e2d32b5f..adc43621cb8b683ea0aaf5233d4500946eada2f1 100644 (file)
@@ -1279,6 +1279,24 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to HandBrake requires a 64bit version of Windows 7 or later to run..\r
+        /// </summary>\r
+        public static string OsBitnessWarning {\r
+            get {\r
+                return ResourceManager.GetString("OsBitnessWarning", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to HandBrake requires Windows 7 or later to run. Version 0.9.9 (XP) and 0.10.5 (Vista) was the last version to support these versions..\r
+        /// </summary>\r
+        public static string OsVersionWarning {\r
+            get {\r
+                return ResourceManager.GetString("OsVersionWarning", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Overwrite?.\r
         /// </summary>\r
index 7a995e0ab3c15d89a8e2545cca43a65dbcd4079d..830154c53096cb137e26e4cc9ff1506989812de2 100644 (file)
@@ -872,4 +872,10 @@ Time Remaining: {5},  Elapsed: {6:d\:hh\:mm\:ss}</value>
   <data name="StaticPreviewView_Title" xml:space="preserve">\r
     <value>Preview ({0}% actual size)</value>\r
   </data>\r
+  <data name="OsBitnessWarning" xml:space="preserve">\r
+    <value>HandBrake requires a 64bit version of Windows 7 or later to run.</value>\r
+  </data>\r
+  <data name="OsVersionWarning" xml:space="preserve">\r
+    <value>HandBrake requires Windows 7 or later to run. Version 0.9.9 (XP) and 0.10.5 (Vista) was the last version to support these versions.</value>\r
+  </data>\r
 </root>
\ No newline at end of file
index 0702b1909005fee6cc8abd9607e37ad3390af54d..b5213f05dcf569d7001ec945e72b7bb70bde5310 100644 (file)
@@ -97,17 +97,11 @@ namespace HandBrakeWPF.Services
                     try\r
                     {\r
                         // Figure out which appcast we want to read.\r
-                        string url =\r
-                            VersionHelper.Is64Bit() || Environment.Is64BitOperatingSystem\r
-                                ? Constants.Appcast64\r
-                                : Constants.Appcast32;\r
+                        string url = Constants.Appcast64;\r
 \r
                         if (VersionHelper.IsNightly())\r
                         {\r
-                            url =\r
-                            VersionHelper.Is64Bit() || Environment.Is64BitOperatingSystem\r
-                                ? Constants.AppcastUnstable64\r
-                                : Constants.AppcastUnstable32;\r
+                            url = Constants.AppcastUnstable64;\r
                         }\r
 \r
                         var currentBuild = HandBrakeUtils.Build;\r
index df3ef0ebec93dfc15d19c5244933397d8b3ebc12..e50b3ae38af9de21b60ab6c27fcb7338f5339fbf 100644 (file)
 \r
   <!-- Post Build Events -->\r
   <Target Name="NightlyPostBuild">\r
-    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x86\Release /Y" Condition="$(Platform) == 'x86'" />\r
     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />\r
-    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x86'" />\r
     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />\r
-    <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x86\Release\doc /I /Y" Condition="$(Platform) == 'x86'" />\r
     <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" Condition="$(Platform) == 'x64'" />\r
-    <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x86\Release\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />\r
     <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />\r
     <Exec Command="&quot;$(SighToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;"  Condition="'$(SignThumbprint)' != ''" />\r
   </Target>\r
 \r
   <Target Name="ReleasePostBuild">\r
-    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\Installer.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x86\Release /Y" Condition="$(Platform) == 'x86'" />\r
     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\Installer64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />\r
-    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x86\Release /Y" Condition="$(Platform) == 'x86'" />\r
     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />\r
-    <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x86\Release\doc /I /Y" Condition="$(Platform) == 'x86'" />\r
     <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" Condition="$(Platform) == 'x64'" />\r
-    <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x86\Release\Installer.nsi" Condition="$(Platform) == 'x86'" />\r
     <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />\r
     <Exec Command="&quot;$(SighToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;"  Condition="'$(SignThumbprint)' != ''" />\r
   </Target>\r