Context Navigation

← Previous Changeset
Next Changeset →

Changeset 915

Timestamp:

11/10/07 11:25:39 (1 year ago)

Author:

glslang

Message:

+ build and installer updates

Location:

trunk

Files:

: 2 removed
: 6 modified

installer/add_to_path.nsh (deleted)
installer/jahplayer.nsi (modified) (12 diffs)
installer/write_env_str.nsh (deleted)
jahplayer/jahplayer_vc8.vcproj (modified) (2 diffs)
jahwidgets/src/qt3/python/python_vc8.vcproj (modified) (2 diffs)
jahwidgets/src/qt3/themes/themes_vc8.vcproj (modified) (2 diffs)
jahwidgets/src/qt3/widgets/widgets_vc8.vcproj (modified) (2 diffs)
jahwidgets/src/qt3/wrapper/wrapper_vc8.vcproj (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/installer/jahplayer.nsi

r907	r915
4	4
5	5	!ifndef VERSION
6		;!define /date VERSION "%Y%m%d"
7		!define VERSION "0.0.0"
8		!endif
9
10		!ifndef OLIB_VERSION
11		!define OLIB_VERSION 0.4.1
	6	!define VERSION 0.3.0
12	7	!endif
13	8
…	…
25	20	InstType "Full"
26	21
27		InstallDir $PROGRAMFILES\jahshaka
28		InstallDirRegKey HKLM Software\jahPlayer ""
	22	InstallDir $PROGRAMFILES\Jahshaka
	23	InstallDirRegKey HKLM Software\JahPlayer ""
29	24
30	25	;--------------------------------
…	…
35	30	!include "MUI.nsh"
36	31	!include "Sections.nsh"
37		~~!include "add_to_path.nsh"~~
38		~~!include "write_env_str.nsh"~~
39	32
40	33	;Names
41		Name "jahPlayer"
42		Caption "jahPlayer (v.${VERSION}) Setup"
	34	Name "JahPlayer"
	35	Caption "JahPlayer (v.${VERSION}) Setup"
43	36
44	37	;Interface Settings
…	…
52	45
53	46	;Pages
54		!define MUI_WELCOMEPAGE_TITLE "Welcome to the jahPlayer (v.${VERSION}) Setup Wizard"
55		!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of jahPlayer.\r\n\r\n$_CLICK"
	47	!define MUI_WELCOMEPAGE_TITLE "Welcome to the JahPlayer (v.${VERSION}) Setup Wizard"
	48	!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of JahPlayer.\r\n\r\n$_CLICK"
56	49
57	50	!insertmacro MUI_PAGE_WELCOME
…	…
76	69	Function .onInit
77	70
78		ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" "UninstallString"
	71	ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JahPlayer" "UninstallString"
79	72	StrCmp $R0 "" done
80	73	MessageBox MB_OKCANCEL\|MB_ICONEXCLAMATION \
81		"jahPlayer is already installed. $\n$\nClick `OK` to remove the \
	74	"JahPlayer is already installed. $\n$\nClick `OK` to remove the \
82	75	previous version or `Cancel` to cancel this upgrade." \
83	76	IDOK uninst
…	…
87	80	ClearErrors
88	81	SetDetailsPrint textonly
89		DetailPrint "Uninstalling previous jahPlayer installation..."
	82	DetailPrint "Uninstalling previous JahPlayer installation..."
90	83	SetDetailsPrint listonly
91	84	ExecWait '$R0 _?=$INSTDIR'
…	…
95	88	no_remove_uninstaller:
96	89	MessageBox MB_ICONEXCLAMATION \
97		"Unable to remove previous version of jahPlayer$\nTry uninstalling via the control panel."
	90	"Unable to remove previous version of JahPlayer$\nTry uninstalling via the control panel."
98	91	Abort
99	92
…	…
115	108
116	109	SetOutPath $INSTDIR
117		~~;File "$%VSINSTALLDIR%\SDK\v2.0\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe"~~
118	110	File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe"
119		ExecWait '"$INSTDIR\vcredist_x86.exe /q:a"'
120
121		SetDetailsPrint both
122
123		SectionEnd
124
125		Section "MSXML4 SP2" msxml2
126
127		SectionIn 1
128		SetOutPath $INSTDIR
129
130		SetOverwrite on
131		SetShellVarContext all
132
133		SetDetailsPrint textonly
134		DetailPrint "Installing MSXML4 SP2..."
135		SetDetailsPrint listonly
136
137		SetOutPath $INSTDIR
138		File "$%OLIBS_DEVEL_ROOT%\installer\msxml4.msi"
139
140		ExecWait 'MsiExec.exe /qn /x{2AEBE10C-D819-4EBF-BC60-03BF2327D340}' ; uninstall MSXML4 if it's there
141		ExecWait 'MsiExec.exe /qn /x{35343FF7-939B-401A-87B3-FF90A5123D88}' ; uninstall MSXML4 SP1 if it's there
142		ExecWait 'MsiExec.exe /qn /i "$INSTDIR\msxml4.msi"'
143
144		WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "msxml2" ""
145
146		SetDetailsPrint both
147
148		SectionEnd
	111	File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\product.xml"
	112	ExecWait '"$INSTDIR\vcredist_x86.exe" /q:a /c:"msiexec /i vcredist.msi /qn"'
	113
	114	SetDetailsPrint both
	115
	116	SectionEnd
	117
	118	;Section "MSXML4 SP2" msxml2
	119
	120	; SectionIn 1
	121	; SetOutPath $INSTDIR
	122
	123	; SetOverwrite on
	124	; SetShellVarContext all
	125
	126	; SetDetailsPrint textonly
	127	; DetailPrint "Installing MSXML4 SP2..."
	128	; SetDetailsPrint listonly
	129
	130	; SetOutPath $INSTDIR
	131	; File "$%OLIBS_DEVEL_ROOT%\installer\msxml4.msi"
	132
	133	; ExecWait 'MsiExec.exe /qn /x{2AEBE10C-D819-4EBF-BC60-03BF2327D340}' ; uninstall MSXML4 if it's there
	134	; ExecWait 'MsiExec.exe /qn /x{35343FF7-939B-401A-87B3-FF90A5123D88}' ; uninstall MSXML4 SP1 if it's there
	135	; ExecWait 'MsiExec.exe /qn /i "$INSTDIR\msxml4.msi"'
	136
	137	; WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "msxml2" ""
	138
	139	; SetDetailsPrint both
	140
	141	;SectionEnd
149	142
150	143	Section "OpenAL" openal
…	…
168	161	SectionEnd
169	162
170		Section "~~OpenLibraries" olib~~
171
172		SectionIn 1
	163	Section "JahPlayer" SecCore
	164
	165	SectionIn 1 2 3 RO
173	166	SetOutPath $INSTDIR
174	167
175	168	SetOverwrite on
176	169	SetShellVarContext all
177
178		SetDetailsPrint textonly
179		DetailPrint "Installing OpenLibraries..."
180		SetDetailsPrint listonly
181
182		SetOutPath $INSTDIR
183		File "$%OLIBS_DEVEL_ROOT%\installer\openlibraries-${OLIB_VERSION}-runtime.exe"
184		ExecWait '"$INSTDIR\openlibraries-${OLIB_VERSION}-runtime.exe" /S /D'
185
186		SetDetailsPrint both
187
188		SectionEnd
189
190		Section "jahPlayer" SecCore
191
192		SectionIn 1 2 3 RO
193		SetOutPath $INSTDIR
194
195		SetOverwrite on
196		SetShellVarContext all
197
198		SetDetailsPrint textonly
199		DetailPrint "Installing jahPlayer..."
200		SetDetailsPrint listonly
201
202		SetOutPath $INSTDIR\jahPlayer
203		File /r "..\jahPlayer\dist\*"
204
205		SetOutPath $INSTDIR\jahTools
206		SetOutPath $INSTDIR\jahTools\encoder
207		File /r "..\jahTools\encoder\dist\*"
208
209		SetDetailsPrint both
210
211		SetOutPath $INSTDIR\jahPlayer
212		CreateDirectory "$SMPROGRAMS\jahPlayer"
213		CreateShortCut "$SMPROGRAMS\jahPlayer\jahPlayer.lnk" "$INSTDIR\jahPlayer\jahPlayer.exe"
214		CreateShortCut "$DESKTOP\jahPlayer.lnk" "$INSTDIR\jahPlayer\jahPlayer.exe"
215
216		SetOutPath $INSTDIR
217		CreateShortCut "$SMPROGRAMS\jahPlayer\Uninstall jahPlayer.lnk" "$INSTDIR\uninst-jahplayer.exe"
218
219		WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" "DisplayName" "jahPlayer"
220		WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" "UninstallString" "$INSTDIR\uninst-jahPlayer.exe"
221
222		Push "JAHTOOLSPATH"
223		Push "$INSTDIR\jahTools"
224		Call WriteEnvStr
	170
	171	SetDetailsPrint textonly
	172	DetailPrint "Installing JahPlayer..."
	173	SetDetailsPrint listonly
	174
	175	SetOutPath $INSTDIR\JahPlayer
	176	File "..\Release\jahplayer.exe"
	177	File "..\Release\*.dll"
	178	File "..\Release\*.pyd"
	179
	180	SetOutPath $INSTDIR\JahPlayer
	181	File "..\jahplayer\*.ui"
	182	File "..\jahplayer\*.py"
	183	File "..\jahplayer\*.jpg"
	184	File "..\jahplayer\*.png"
	185	File "..\Release\jahplayer.exe"
	186	File "..\Release\*.dll"
	187	File "..\Release\*.pyd"
	188	File "C:\Python25\python.exe"
	189	File /r "C:\Python25\Lib\*"
	190	File /r "C:\Program Files\OpenLibraries\bin"
	191
	192	; SetOutPath $INSTDIR\JahTools
	193	; SetOutPath $INSTDIR\JahTools\encoder
	194	; File /r "..\JahTools\encoder\dist\*"
	195
	196	SetDetailsPrint both
	197
	198	SetOutPath $INSTDIR\JahPlayer
	199	CreateDirectory "$SMPROGRAMS\JahPlayer"
	200	CreateShortCut "$SMPROGRAMS\JahPlayer\JahPlayer.lnk" "$INSTDIR\JahPlayer\JahPlayer.exe"
	201	CreateShortCut "$DESKTOP\JahPlayer.lnk" "$INSTDIR\JahPlayer\JahPlayer.exe"
	202
	203	SetOutPath $INSTDIR
	204	CreateShortCut "$SMPROGRAMS\JahPlayer\Uninstall JahPlayer.lnk" "$INSTDIR\uninst-jahplayer.exe"
	205
	206	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JahPlayer" "DisplayName" "JahPlayer"
	207	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JahPlayer" "UninstallString" "$INSTDIR\uninst-JahPlayer.exe"
	208
	209	; Push "JAHTOOLSPATH"
	210	; Push "$INSTDIR\jahTools"
	211	; Call WriteEnvStr
225	212
226	213	SectionEnd
…	…
228	215	Section -post
229	216
230		WriteUninstaller $INSTDIR\uninst-jahPlayer.exe
	217	WriteUninstaller $INSTDIR\uninst-jahplayer.exe
231	218
232	219	SectionEnd
…	…
255	242
256	243	;-- Remove registry keys
257		DeleteRegKey HKLM "Software\jahPlayer"
258		DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer"
	244	DeleteRegKey HKLM "Software\JahPlayer"
	245	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JahPlayer"
259	246
260	247	;-- remove JAHTOOLSPATH
261		Push "JAHTOOLSPATH"
262		Call un.DeleteEnvStr
	248	; Push "JAHTOOLSPATH"
	249	; Call un.DeleteEnvStr
263	250
264	251	;-- Remove desktop and start->Programs->jahPlayer shortcuts
265		Delete $DESKTOP\jahPlayer.lnk
266		RMDir /r $SMPROGRAMS\jahPlayer
	252	Delete $DESKTOP\JahPlayer.lnk
	253	RMDir /r $SMPROGRAMS\JahPlayer
267	254
268	255	;-- Remove install directory
…	…
272	259
273	260	SectionEnd
274
275

trunk/jahplayer/jahplayer_vc8.vcproj

r914	r915
18	18	<Configuration
19	19	Name="Debug\|Win32"
20		OutputDirectory="$(ConfigurationName)"
	20	OutputDirectory="$(SolutionDir)$(ConfigurationName)"
21	21	IntermediateDirectory="$(ConfigurationName)"
22	22	ConfigurationType="1"
…	…
96	96	<Configuration
97	97	Name="Release\|Win32"
98		OutputDirectory="$(ConfigurationName)"
	98	OutputDirectory="$(SolutionDir)$(ConfigurationName)"
99	99	IntermediateDirectory="$(ConfigurationName)"
100	100	ConfigurationType="1"

trunk/jahwidgets/src/qt3/python/python_vc8.vcproj

r912	r915
18	18	<Configuration
19	19	Name="Debug\|Win32"
20		OutputDirectory="~~Debug~~"
21		IntermediateDirectory="~~Debug~~"
	20	OutputDirectory="$(SolutionDir)$(ConfigurationName)"
	21	IntermediateDirectory="$(ConfigurationName)"
22	22	ConfigurationType="2"
23	23	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
…	…
105	105	<Configuration
106	106	Name="Release\|Win32"
107		OutputDirectory="~~Release~~"
108		IntermediateDirectory="~~Release~~"
	107	OutputDirectory="$(SolutionDir)$(ConfigurationName)"
	108	IntermediateDirectory="$(ConfigurationName)"
109	109	ConfigurationType="2"
110	110	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

trunk/jahwidgets/src/qt3/themes/themes_vc8.vcproj

r912	r915
18	18	<Configuration
19	19	Name="Debug\|Win32"
20		OutputDirectory="~~Debug~~"
21		IntermediateDirectory="~~Debug~~"
	20	OutputDirectory="$(SolutionDir)$(ConfigurationName)"
	21	IntermediateDirectory="$(ConfigurationName)"
22	22	ConfigurationType="2"
23	23	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
…	…
104	104	<Configuration
105	105	Name="Release\|Win32"
106		OutputDirectory="~~Release~~"
107		IntermediateDirectory="~~Release~~"
	106	OutputDirectory="$(SolutionDir)$(ConfigurationName)"
	107	IntermediateDirectory="$(ConfigurationName)"
108	108	ConfigurationType="2"
109	109	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

trunk/jahwidgets/src/qt3/widgets/widgets_vc8.vcproj

r912	r915
18	18	<Configuration
19	19	Name="Debug\|Win32"
20		OutputDirectory="~~Debug~~"
21		IntermediateDirectory="~~Debug~~"
	20	OutputDirectory="$(SolutionDir)$(ConfigurationName)"
	21	IntermediateDirectory="$(ConfigurationName)"
22	22	ConfigurationType="2"
23	23	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
…	…
105	105	<Configuration
106	106	Name="Release\|Win32"
107		OutputDirectory="~~Release~~"
108		IntermediateDirectory="~~Release~~"
	107	OutputDirectory="$(SolutionDir)$(ConfigurationName)"
	108	IntermediateDirectory="$(ConfigurationName)"
109	109	ConfigurationType="2"
110	110	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

trunk/jahwidgets/src/qt3/wrapper/wrapper_vc8.vcproj

r912	r915
18	18	<Configuration
19	19	Name="Debug\|Win32"
20		OutputDirectory="~~Debug~~"
21		IntermediateDirectory="~~Debug~~"
	20	OutputDirectory="$(SolutionDir)$(ConfigurationName)"
	21	IntermediateDirectory="$(ConfigurationName)"
22	22	ConfigurationType="2"
23	23	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
…	…
105	105	<Configuration
106	106	Name="Release\|Win32"
107		OutputDirectory="~~Release~~"
108		IntermediateDirectory="~~Release~~"
	107	OutputDirectory="$(SolutionDir)$(ConfigurationName)"
	108	IntermediateDirectory="$(ConfigurationName)"
109	109	ConfigurationType="2"
110	110	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

Context Navigation

Changeset 915

Legend:

trunk/installer/jahplayer.nsi

trunk/jahplayer/jahplayer_vc8.vcproj

trunk/jahwidgets/src/qt3/python/python_vc8.vcproj

trunk/jahwidgets/src/qt3/themes/themes_vc8.vcproj

trunk/jahwidgets/src/qt3/widgets/widgets_vc8.vcproj

trunk/jahwidgets/src/qt3/wrapper/wrapper_vc8.vcproj

Download in other formats: