• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

タグ
未設定

よく使われているワード(クリックで追加)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonwindowsphpgamebathyscapheguic翻訳omegattwitterframeworkbtronvb.net計画中(planning stage)testdomarduinodirectxpreviewerゲームエンジン

githubのコードからのfolk


コミットメタ情報

リビジョンb6461c208c21a3728caee840a26c43e7ab0895fa (tree)
日時2011-03-03 19:47:02
作者hylom <hylom@user...>
コミッターhylom

ログメッセージ

fix to compile without subwcrev.exe

変更サマリ

差分

--- a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -139,8 +139,6 @@
139139 -->
140140 <PropertyGroup>
141141 <PreBuildEvent>
142- subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
143- subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
144142 </PreBuildEvent>
145143 </PropertyGroup>
146144 </Project>
\ No newline at end of file
--- /dev/null
+++ b/win/C#/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs
@@ -0,0 +1,42 @@
1+/* AssemblyInfo.cs $
2+ This file is part of the HandBrake source code.
3+ Homepage: <http://handbrake.fr>.
4+ It may be used under the terms of the GNU General Public License. */
5+
6+using System.Reflection;
7+using System.Resources;
8+using System.Runtime.CompilerServices;
9+using System.Runtime.InteropServices;
10+
11+// General Information about an assembly is controlled through the following
12+// set of attributes. Change these attribute values to modify the information
13+// associated with an assembly.
14+[assembly: AssemblyTitle("HandBrake")]
15+[assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")]
16+[assembly: AssemblyConfiguration("")]
17+[assembly: AssemblyCompany("HandBrake Team")]
18+[assembly: AssemblyProduct("HandBrake")]
19+[assembly: AssemblyCopyright("Copyright © 2011")]
20+[assembly: AssemblyTrademark("")]
21+[assembly: AssemblyCulture("")]
22+
23+// Setting ComVisible to false makes the types in this assembly not visible
24+// to COM components. If you need to access a type in this assembly from
25+// COM, set the ComVisible attribute to true on that type.
26+[assembly: ComVisible(false)]
27+
28+// The following GUID is for the ID of the typelib if this project is exposed to COM
29+[assembly: Guid("5e4e3f97-5252-41f6-aae9-3846f62cbc66")]
30+
31+// Version information for an assembly consists of the following four values:
32+//
33+// Major Version
34+// Minor Version
35+// Build Number
36+// Revision
37+//
38+// You can specify all the values or you can default the Build and Revision Numbers
39+// by using the '*' as shown below:
40+// [assembly: AssemblyVersion("1.0.*")]
41+[assembly: AssemblyVersion("0.9.5.3735")]
42+[assembly: NeutralResourcesLanguage("")]
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -426,7 +426,7 @@
426426 </BootstrapperPackage>
427427 <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
428428 <Visible>False</Visible>
429- <ProductName>Windows Installer 3.1</ProductName>
429+ <ProductName>Windows インストーラー 3.1</ProductName>
430430 <Install>true</Install>
431431 </BootstrapperPackage>
432432 </ItemGroup>
@@ -505,8 +505,6 @@
505505 </PropertyGroup>
506506 <PropertyGroup>
507507 <PreBuildEvent>
508- subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
509- subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
510-subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Installer\MakeNightly.nsi.tmpl" "$(ProjectDir)Installer\MakeNightly.nsi"</PreBuildEvent>
508+ </PreBuildEvent>
511509 </PropertyGroup>
512510 </Project>
\ No newline at end of file
--- /dev/null
+++ b/win/C#/Installer/MakeNightly.nsi
@@ -0,0 +1,359 @@
1+/* Resources.Designer.cs $
2+
3+ This file is part of the HandBrake source code.
4+ Homepage: <http://handbrake.fr/>.
5+ It may be used under the terms of the GNU General Public License. */
6+
7+; Script generated by the HM NIS Edit Script Wizard.
8+
9+; HM NIS Edit Wizard helper defines
10+!define PRODUCT_NAME "Handbrake"
11+!define PRODUCT_VERSION "3735 Nightly"
12+!define PRODUCT_VERSION_NUMBER "svn3735"
13+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
14+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
15+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
16+
17+;Required .NET framework
18+!define MIN_FRA_MAJOR "3"
19+!define MIN_FRA_MINOR "5"
20+!define MIN_FRA_BUILD "*"
21+
22+SetCompressor lzma
23+
24+; MUI 1.67 compatible ------
25+!include "MUI.nsh"
26+
27+; MUI Settings
28+!define MUI_ABORTWARNING
29+!define MUI_ICON "handbrakepineapple.ico"
30+!define MUI_UNICON "handbrakepineapple.ico"
31+
32+; Welcome page
33+!insertmacro MUI_PAGE_WELCOME
34+; License page
35+!insertmacro MUI_PAGE_LICENSE "doc\COPYING"
36+; Directory page
37+!insertmacro MUI_PAGE_DIRECTORY
38+; Instfiles page
39+!insertmacro MUI_PAGE_INSTFILES
40+; Finish page
41+!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe"
42+!insertmacro MUI_PAGE_FINISH
43+
44+; Uninstaller pages
45+!insertmacro MUI_UNPAGE_INSTFILES
46+
47+; Language files
48+!insertmacro MUI_LANGUAGE "English"
49+
50+; MUI end ------
51+
52+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
53+OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-Win_GUI.exe"
54+
55+!include WordFunc.nsh
56+!insertmacro VersionCompare
57+!include LogicLib.nsh
58+
59+InstallDir "$PROGRAMFILES\Handbrake"
60+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
61+ShowInstDetails show
62+ShowUnInstDetails show
63+
64+Var InstallDotNET
65+
66+Function .onInit
67+
68+ ; Begin Only allow one version
69+ System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'
70+ Pop $R0
71+
72+ StrCmp $R0 0 +3
73+ MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running."
74+ Abort
75+
76+ ;Remove previous version
77+ ReadRegStr $R0 HKLM \
78+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \
79+ "UninstallString"
80+ StrCmp $R0 "" done
81+
82+ MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
83+ "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \
84+ previous version or `Cancel` to continue." \
85+ IDOK uninst
86+ goto done
87+
88+ ;Run the uninstaller
89+ uninst:
90+ Exec $INSTDIR\uninst.exe
91+ done:
92+FunctionEnd
93+
94+Section "Handbrake" SEC01
95+ SetOutPath "$INSTDIR"
96+ SetOverwrite ifnewer
97+
98+ ; Begin Check .NET version
99+ StrCpy $InstallDotNET "No"
100+ Call CheckFramework
101+ StrCmp $0 "1" +3
102+ StrCpy $InstallDotNET "Yes"
103+ 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}."
104+ Pop $0
105+
106+ ; Get .NET if required
107+ ${If} $InstallDotNET == "Yes"
108+ SetDetailsView hide
109+ 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
110+ Pop $1
111+
112+ ${If} $1 != "OK"
113+ Delete "$INSTDIR\dotnetfx.exe"
114+ Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 3.5 Framework"
115+ ${EndIf}
116+
117+ ExecWait "$INSTDIR\dotnetfx.exe"
118+ Delete "$INSTDIR\dotnetfx.exe"
119+
120+ SetDetailsView show
121+ ${EndIf}
122+
123+ ; Install Files
124+ File "Handbrake.exe"
125+ File "HandBrakeCLI.exe"
126+ CreateDirectory "$SMPROGRAMS\Handbrake"
127+ CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
128+ CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
129+ File "Interop.QTOLibrary.dll"
130+ File "Interop.QTOControlLib.dll"
131+ File "AxInterop.QTOControlLib.dll"
132+ File "Growl.Connector.dll"
133+ File "Growl.CoreLibrary.dll"
134+ File "Handbrake.exe.config"
135+ File "HandBrake.ApplicationServices.dll"
136+ File "HandBrake.Framework.dll"
137+ File "Microsoft.WindowsAPICodePack.Shell.dll"
138+ File "Microsoft.WindowsAPICodePack.dll"
139+
140+ ;File "Caliburn.Castle.dll"
141+ ;File "Caliburn.Core.dll"
142+ ;File "Castle.Core.dll"
143+ ;File "Castle.DynamicProxy2.dll"
144+ ;File "Castle.MicroKernel.dll"
145+ ;File "Castle.Windsor.dll"
146+ ;File "Microsoft.Practices.ServiceLocation.dll"
147+
148+ ; Copy the standard doc set into the doc folder
149+ SetOutPath "$INSTDIR\doc"
150+ SetOverwrite ifnewer
151+ File "doc\AUTHORS"
152+ File "doc\COPYING"
153+ File "doc\CREDITS"
154+ File "doc\NEWS"
155+ File "doc\THANKS"
156+ File "doc\TRANSLATIONS"
157+SectionEnd
158+
159+Section -AdditionalIcons
160+ CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe"
161+SectionEnd
162+
163+Section -Post
164+ WriteUninstaller "$INSTDIR\uninst.exe"
165+ WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe"
166+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
167+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
168+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe"
169+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
170+SectionEnd
171+
172+
173+Function un.onUninstSuccess
174+ HideWindow
175+ MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
176+FunctionEnd
177+
178+Function un.onInit
179+ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
180+ Abort
181+FunctionEnd
182+
183+Section Uninstall
184+ Delete "$INSTDIR\uninst.exe"
185+
186+ Delete "$INSTDIR\Interop.QTOLibrary.dll"
187+ Delete "$INSTDIR\Interop.QTOControlLib.dll"
188+ Delete "$INSTDIR\AxInterop.QTOControlLib.dll"
189+ Delete "$INSTDIR\HandBrakeCLI.exe"
190+ Delete "$INSTDIR\handbrakepineapple.ico"
191+ Delete "$INSTDIR\Handbrake.exe"
192+ Delete "$INSTDIR\Handbrake.exe.config"
193+ Delete "$INSTDIR\Growl.Connector.dll"
194+ Delete "$INSTDIR\Growl.CoreLibrary.dll"
195+ Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
196+ Delete "$INSTDIR\HandBrake.ApplicationServices.dll"
197+ Delete "$INSTDIR\HandBrake.Framework.dll"
198+ Delete "$INSTDIR\Microsoft.WindowsAPICodePack.Shell.dll"
199+ Delete "$INSTDIR\Microsoft.WindowsAPICodePack.dll"
200+
201+ Delete "$INSTDIR\Caliburn.Castle.dll"
202+ Delete "$INSTDIR\Caliburn.Core.dll"
203+ Delete "$INSTDIR\Castle.Core.dll"
204+ Delete "$INSTDIR\Castle.DynamicProxy2.dll"
205+ Delete "$INSTDIR\Castle.MicroKernel.dll"
206+ Delete "$INSTDIR\Castle.Windsor.dll"
207+ Delete "$INSTDIR\Microsoft.Practices.ServiceLocation.dll"
208+
209+ Delete "$INSTDIR\doc\AUTHORS"
210+ Delete "$INSTDIR\doc\COPYING"
211+ Delete "$INSTDIR\doc\CREDITS"
212+ Delete "$INSTDIR\doc\NEWS"
213+ Delete "$INSTDIR\doc\THANKS"
214+ Delete "$INSTDIR\doc\TRANSLATIONS"
215+ RMDir "$INSTDIR"
216+ Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
217+ Delete "$DESKTOP\Handbrake.lnk"
218+ Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"
219+ RMDir "$SMPROGRAMS\Handbrake"
220+ RMDir "$INSTDIR"
221+
222+ DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
223+ DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
224+ SetAutoClose true
225+SectionEnd
226+
227+;Check for .NET framework
228+Function CheckFrameWork
229+
230+ ;Save the variables in case something else is using them
231+ Push $0
232+ Push $1
233+ Push $2
234+ Push $3
235+ Push $4
236+ Push $R1
237+ Push $R2
238+ Push $R3
239+ Push $R4
240+ Push $R5
241+ Push $R6
242+ Push $R7
243+ Push $R8
244+
245+ StrCpy $R5 "0"
246+ StrCpy $R6 "0"
247+ StrCpy $R7 "0"
248+ StrCpy $R8 "0.0.0"
249+ StrCpy $0 0
250+
251+ loop:
252+
253+ ;Get each sub key under "SOFTWARE\Microsoft\NET Framework Setup\NDP"
254+ EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
255+ StrCmp $1 "" done ;jump to end if no more registry keys
256+ IntOp $0 $0 + 1
257+ StrCpy $2 $1 1 ;Cut off the first character
258+ StrCpy $3 $1 "" 1 ;Remainder of string
259+
260+ ;Loop if first character is not a 'v'
261+ StrCmpS $2 "v" start_parse loop
262+
263+ ;Parse the string
264+ start_parse:
265+ StrCpy $R1 ""
266+ StrCpy $R2 ""
267+ StrCpy $R3 ""
268+ StrCpy $R4 $3
269+
270+ StrCpy $4 1
271+
272+ parse:
273+ StrCmp $3 "" parse_done ;If string is empty, we are finished
274+ StrCpy $2 $3 1 ;Cut off the first character
275+ StrCpy $3 $3 "" 1 ;Remainder of string
276+ StrCmp $2 "." is_dot not_dot ;Move to next part if it's a dot
277+
278+ is_dot:
279+ IntOp $4 $4 + 1 ; Move to the next section
280+ goto parse ;Carry on parsing
281+
282+ not_dot:
283+ IntCmp $4 1 major_ver
284+ IntCmp $4 2 minor_ver
285+ IntCmp $4 3 build_ver
286+ IntCmp $4 4 parse_done
287+
288+ major_ver:
289+ StrCpy $R1 $R1$2
290+ goto parse ;Carry on parsing
291+
292+ minor_ver:
293+ StrCpy $R2 $R2$2
294+ goto parse ;Carry on parsing
295+
296+ build_ver:
297+ StrCpy $R3 $R3$2
298+ goto parse ;Carry on parsing
299+
300+ parse_done:
301+
302+ IntCmp $R1 $R5 this_major_same loop this_major_more
303+ this_major_more:
304+ StrCpy $R5 $R1
305+ StrCpy $R6 $R2
306+ StrCpy $R7 $R3
307+ StrCpy $R8 $R4
308+
309+ goto loop
310+
311+ this_major_same:
312+ IntCmp $R2 $R6 this_minor_same loop this_minor_more
313+ this_minor_more:
314+ StrCpy $R6 $R2
315+ StrCpy $R7 R3
316+ StrCpy $R8 $R4
317+ goto loop
318+
319+ this_minor_same:
320+ IntCmp $R3 $R7 loop loop this_build_more
321+ this_build_more:
322+ StrCpy $R7 $R3
323+ StrCpy $R8 $R4
324+ goto loop
325+
326+ done:
327+
328+ ;Have we got the framework we need?
329+ IntCmp $R5 ${MIN_FRA_MAJOR} max_major_same fail OK
330+ max_major_same:
331+ IntCmp $R6 ${MIN_FRA_MINOR} max_minor_same fail OK
332+ max_minor_same:
333+ IntCmp $R7 ${MIN_FRA_BUILD} OK fail OK
334+
335+ ;Version on machine is greater than what we need
336+ OK:
337+ StrCpy $0 "1"
338+ goto end
339+
340+ fail:
341+ StrCmp $R8 "0.0.0" end
342+
343+
344+ end:
345+
346+ ;Pop the variables we pushed earlier
347+ Pop $R8
348+ Pop $R7
349+ Pop $R6
350+ Pop $R5
351+ Pop $R4
352+ Pop $R3
353+ Pop $R2
354+ Pop $R1
355+ Pop $4
356+ Pop $3
357+ Pop $2
358+ Pop $1
359+FunctionEnd
\ No newline at end of file
--- /dev/null
+++ b/win/C#/Properties/AssemblyInfo.cs
@@ -0,0 +1,42 @@
1+/* AssemblyInfo.cs $
2+ This file is part of the HandBrake source code.
3+ Homepage: <http://handbrake.fr>.
4+ It may be used under the terms of the GNU General Public License. */
5+
6+using System.Reflection;
7+using System.Resources;
8+using System.Runtime.InteropServices;
9+
10+// General Information about an assembly is controlled through the following
11+// set of attributes. Change these attribute values to modify the information
12+// associated with an assembly.
13+
14+[assembly: AssemblyTitle("HandBrake")]
15+[assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")]
16+[assembly: AssemblyConfiguration("")]
17+[assembly: AssemblyCompany("HandBrake")]
18+[assembly: AssemblyProduct("HandBrake")]
19+[assembly: AssemblyCopyright("Copyright © 2011")]
20+[assembly: AssemblyTrademark("")]
21+[assembly: AssemblyCulture("")]
22+
23+// Setting ComVisible to false makes the types in this assembly not visible
24+// to COM components. If you need to access a type in this assembly from
25+// COM, set the ComVisible attribute to true on that type.
26+
27+[assembly: ComVisible(false)]
28+
29+// The following GUID is for the ID of the typelib if this project is exposed to COM
30+
31+[assembly: Guid("5e4e3f97-5252-41f6-aae9-3846f62cbc66")]
32+
33+// Version information for an assembly consists of the following four values:
34+//
35+// Major Version
36+// Minor Version
37+// Build Number
38+// Revision
39+//
40+
41+[assembly: AssemblyVersion("0.9.5.3735")]
42+[assembly: NeutralResourcesLanguage("")]
\ No newline at end of file