From 5c5e403d932d6ba4fa0ff3949238d0ff8565ab83 Mon Sep 17 00:00:00 2001 From: hylom Date: Tue, 12 Jul 2011 18:47:33 +0900 Subject: [PATCH] Revert "fix to compile without subwcrev.exe" This reverts commit b6461c208c21a3728caee840a26c43e7ab0895fa. --- .../HandBrake.ApplicationServices.csproj | 2 + .../Properties/AssemblyInfo.cs | 42 --- win/C#/HandBrakeCS.csproj | 6 +- win/C#/Installer/MakeNightly.nsi | 359 --------------------- win/C#/Properties/AssemblyInfo.cs | 42 --- 5 files changed, 6 insertions(+), 445 deletions(-) delete mode 100644 win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs delete mode 100644 win/C#/Installer/MakeNightly.nsi delete mode 100644 win/C#/Properties/AssemblyInfo.cs diff --git a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj index 2f1ebd25..8b9d7e30 100644 --- a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj +++ b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj @@ -139,6 +139,8 @@ --> + subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs" + subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs" \ No newline at end of file diff --git a/win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs b/win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs deleted file mode 100644 index 23ddc517..00000000 --- a/win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,42 +0,0 @@ -/* AssemblyInfo.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ - -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("HandBrake")] -[assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("HandBrake Team")] -[assembly: AssemblyProduct("HandBrake")] -[assembly: AssemblyCopyright("Copyright © 2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("5e4e3f97-5252-41f6-aae9-3846f62cbc66")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.9.5.3735")] -[assembly: NeutralResourcesLanguage("")] diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj index ecda0b57..46323ada 100644 --- a/win/C#/HandBrakeCS.csproj +++ b/win/C#/HandBrakeCS.csproj @@ -426,7 +426,7 @@ False - Windows インストーラー 3.1 + Windows Installer 3.1 true @@ -505,6 +505,8 @@ - + subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs" + subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs" +subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Installer\MakeNightly.nsi.tmpl" "$(ProjectDir)Installer\MakeNightly.nsi" \ No newline at end of file diff --git a/win/C#/Installer/MakeNightly.nsi b/win/C#/Installer/MakeNightly.nsi deleted file mode 100644 index 18682faa..00000000 --- a/win/C#/Installer/MakeNightly.nsi +++ /dev/null @@ -1,359 +0,0 @@ -/* Resources.Designer.cs $ - - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ - -; Script generated by the HM NIS Edit Script Wizard. - -; HM NIS Edit Wizard helper defines -!define PRODUCT_NAME "Handbrake" -!define PRODUCT_VERSION "3735 Nightly" -!define PRODUCT_VERSION_NUMBER "svn3735" -!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_BUILD "*" - -SetCompressor lzma - -; MUI 1.67 compatible ------ -!include "MUI.nsh" - -; MUI Settings -!define MUI_ABORTWARNING -!define MUI_ICON "handbrakepineapple.ico" -!define MUI_UNICON "handbrakepineapple.ico" - -; Welcome page -!insertmacro MUI_PAGE_WELCOME -; License page -!insertmacro MUI_PAGE_LICENSE "doc\COPYING" -; Directory page -!insertmacro MUI_PAGE_DIRECTORY -; Instfiles page -!insertmacro MUI_PAGE_INSTFILES -; Finish page -!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe" -!insertmacro MUI_PAGE_FINISH - -; Uninstaller pages -!insertmacro MUI_UNPAGE_INSTFILES - -; Language files -!insertmacro MUI_LANGUAGE "English" - -; MUI end ------ - -Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-Win_GUI.exe" - -!include WordFunc.nsh -!insertmacro VersionCompare -!include LogicLib.nsh - -InstallDir "$PROGRAMFILES\Handbrake" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" -ShowInstDetails show -ShowUnInstDetails show - -Var InstallDotNET - -Function .onInit - - ; Begin Only allow one version - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e' - Pop $R0 - - StrCmp $R0 0 +3 - MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." - Abort - - ;Remove previous version - ReadRegStr $R0 HKLM \ - "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \ - "UninstallString" - StrCmp $R0 "" done - - MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \ - "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \ - previous version or `Cancel` to continue." \ - IDOK uninst - goto done - - ;Run the uninstaller - uninst: - Exec $INSTDIR\uninst.exe - done: -FunctionEnd - -Section "Handbrake" SEC01 - SetOutPath "$INSTDIR" - SetOverwrite ifnewer - - ; Begin Check .NET version - StrCpy $InstallDotNET "No" - 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}." - 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 - Pop $1 - - ${If} $1 != "OK" - Delete "$INSTDIR\dotnetfx.exe" - Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 3.5 Framework" - ${EndIf} - - ExecWait "$INSTDIR\dotnetfx.exe" - Delete "$INSTDIR\dotnetfx.exe" - - SetDetailsView show - ${EndIf} - - ; Install Files - File "Handbrake.exe" - File "HandBrakeCLI.exe" - CreateDirectory "$SMPROGRAMS\Handbrake" - CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe" - CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe" - File "Interop.QTOLibrary.dll" - File "Interop.QTOControlLib.dll" - File "AxInterop.QTOControlLib.dll" - File "Growl.Connector.dll" - 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 "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 - File "doc\AUTHORS" - File "doc\COPYING" - File "doc\CREDITS" - File "doc\NEWS" - File "doc\THANKS" - File "doc\TRANSLATIONS" -SectionEnd - -Section -AdditionalIcons - CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe" -SectionEnd - -Section -Post - WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" -SectionEnd - - -Function un.onUninstSuccess - HideWindow - MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." -FunctionEnd - -Function un.onInit - MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2 - Abort -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\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" - Delete "$INSTDIR\doc\NEWS" - Delete "$INSTDIR\doc\THANKS" - Delete "$INSTDIR\doc\TRANSLATIONS" - RMDir "$INSTDIR" - Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk" - Delete "$DESKTOP\Handbrake.lnk" - Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk" - RMDir "$SMPROGRAMS\Handbrake" - RMDir "$INSTDIR" - - DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" - DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" - SetAutoClose true -SectionEnd - -;Check for .NET framework -Function CheckFrameWork - - ;Save the variables in case something else is using them - Push $0 - Push $1 - Push $2 - Push $3 - Push $4 - Push $R1 - Push $R2 - Push $R3 - Push $R4 - Push $R5 - Push $R6 - Push $R7 - Push $R8 - - StrCpy $R5 "0" - StrCpy $R6 "0" - StrCpy $R7 "0" - StrCpy $R8 "0.0.0" - StrCpy $0 0 - - loop: - - ;Get each sub key under "SOFTWARE\Microsoft\NET Framework Setup\NDP" - EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0 - StrCmp $1 "" done ;jump to end if no more registry keys - IntOp $0 $0 + 1 - StrCpy $2 $1 1 ;Cut off the first character - StrCpy $3 $1 "" 1 ;Remainder of string - - ;Loop if first character is not a 'v' - StrCmpS $2 "v" start_parse loop - - ;Parse the string - start_parse: - StrCpy $R1 "" - StrCpy $R2 "" - StrCpy $R3 "" - StrCpy $R4 $3 - - StrCpy $4 1 - - parse: - StrCmp $3 "" parse_done ;If string is empty, we are finished - StrCpy $2 $3 1 ;Cut off the first character - StrCpy $3 $3 "" 1 ;Remainder of string - StrCmp $2 "." is_dot not_dot ;Move to next part if it's a dot - - is_dot: - IntOp $4 $4 + 1 ; Move to the next section - goto parse ;Carry on parsing - - not_dot: - IntCmp $4 1 major_ver - IntCmp $4 2 minor_ver - IntCmp $4 3 build_ver - IntCmp $4 4 parse_done - - major_ver: - StrCpy $R1 $R1$2 - goto parse ;Carry on parsing - - minor_ver: - StrCpy $R2 $R2$2 - goto parse ;Carry on parsing - - build_ver: - StrCpy $R3 $R3$2 - goto parse ;Carry on parsing - - parse_done: - - IntCmp $R1 $R5 this_major_same loop this_major_more - this_major_more: - StrCpy $R5 $R1 - StrCpy $R6 $R2 - StrCpy $R7 $R3 - StrCpy $R8 $R4 - - goto loop - - this_major_same: - IntCmp $R2 $R6 this_minor_same loop this_minor_more - this_minor_more: - StrCpy $R6 $R2 - StrCpy $R7 R3 - StrCpy $R8 $R4 - goto loop - - this_minor_same: - IntCmp $R3 $R7 loop loop this_build_more - this_build_more: - StrCpy $R7 $R3 - StrCpy $R8 $R4 - goto loop - - done: - - ;Have we got the framework we need? - IntCmp $R5 ${MIN_FRA_MAJOR} max_major_same fail OK - max_major_same: - IntCmp $R6 ${MIN_FRA_MINOR} max_minor_same fail OK - max_minor_same: - IntCmp $R7 ${MIN_FRA_BUILD} OK fail OK - - ;Version on machine is greater than what we need - OK: - StrCpy $0 "1" - goto end - - fail: - StrCmp $R8 "0.0.0" end - - - end: - - ;Pop the variables we pushed earlier - Pop $R8 - Pop $R7 - Pop $R6 - Pop $R5 - Pop $R4 - Pop $R3 - Pop $R2 - Pop $R1 - Pop $4 - Pop $3 - Pop $2 - Pop $1 -FunctionEnd \ No newline at end of file diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs deleted file mode 100644 index 57d0205f..00000000 --- a/win/C#/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,42 +0,0 @@ -/* AssemblyInfo.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ - -using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("HandBrake")] -[assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("HandBrake")] -[assembly: AssemblyProduct("HandBrake")] -[assembly: AssemblyCopyright("Copyright © 2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. - -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM - -[assembly: Guid("5e4e3f97-5252-41f6-aae9-3846f62cbc66")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// - -[assembly: AssemblyVersion("0.9.5.3735")] -[assembly: NeutralResourcesLanguage("")] \ No newline at end of file -- 2.11.0