Thread: [Jahshaka-cvs] SF.net SVN: jahshaka: [916] trunk/installer
Status: Beta
Brought to you by:
jahshaka
From: <gl...@us...> - 2007-11-10 20:11:16
|
Revision: 916 http://jahshaka.svn.sourceforge.net/jahshaka/?rev=916&view=rev Author: glslang Date: 2007-11-10 12:11:14 -0800 (Sat, 10 Nov 2007) Log Message: ----------- + nsis installer updates Modified Paths: -------------- trunk/installer/jahplayer.nsi Removed Paths: ------------- trunk/installer/jahplayer_bundle.nsi trunk/installer/run_jahplayer.cmd trunk/installer/run_jplayer.cmd trunk/installer/vm-installer-header.bmp Modified: trunk/installer/jahplayer.nsi =================================================================== --- trunk/installer/jahplayer.nsi 2007-11-10 17:25:39 UTC (rev 915) +++ trunk/installer/jahplayer.nsi 2007-11-10 20:11:14 UTC (rev 916) @@ -176,18 +176,15 @@ File "..\Release\jahplayer.exe" File "..\Release\*.dll" File "..\Release\*.pyd" - - SetOutPath $INSTDIR\JahPlayer File "..\jahplayer\*.ui" File "..\jahplayer\*.py" File "..\jahplayer\*.jpg" File "..\jahplayer\*.png" - File "..\Release\jahplayer.exe" - File "..\Release\*.dll" - File "..\Release\*.pyd" - File "C:\Python25\python.exe" - File /r "C:\Python25\Lib\*" - File /r "C:\Program Files\OpenLibraries\bin" + File "C:\Qt\3.3.8\lib\qt-mt338.dll" + File /r "C:\Program Files\OpenLibraries\bin\*" + + SetOutPath $INSTDIR\JahPlayer\Lib + File /r "C:\Python25\jahplayer-pyc" ; SetOutPath $INSTDIR\JahTools ; SetOutPath $INSTDIR\JahTools\encoder Deleted: trunk/installer/jahplayer_bundle.nsi =================================================================== --- trunk/installer/jahplayer_bundle.nsi 2007-11-10 17:25:39 UTC (rev 915) +++ trunk/installer/jahplayer_bundle.nsi 2007-11-10 20:11:14 UTC (rev 916) @@ -1,390 +0,0 @@ -;-------------------------------- -;NSIS jahPlayer bundle Installation Script -;-------------------------------- - -!ifndef VERSION - !define VERSION 20070822 -!endif - -!ifndef OLIBS_PATH - !define OLIBS_PATH "$%OLIBS_DEVEL_ROOT%" -!endif - -;-------------------------------- -;Configuration - -!ifdef OUTFILE - OutFile "${OUTFILE}" -!else - OutFile jahplayer-${VERSION}-bundle.exe -!endif - -SetCompressor /SOLID lzma - -InstType "Full" - -InstallDir $PROGRAMFILES\jahshaka -InstallDirRegKey HKLM Software\jahPlayer "" - -;-------------------------------- -;Header Files - -!define ALL_USERS - -!include "MUI.nsh" -!include "Sections.nsh" -!include "add_to_path.nsh" -!include "write_env_str.nsh" - -;Names -Name "jahPlayer" -Caption "jahPlayer (v.${VERSION}) Setup" - -;Interface Settings -!define MUI_ABORTWARNING - -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "jah-installer-header.bmp" ; optional -!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp" - -!define MUI_COMPONENTSPAGE_SMALLDESC - -;Pages -!define MUI_WELCOMEPAGE_TITLE "Welcome to the jahPlayer (v.${VERSION}) Setup Wizard" -!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of jahPlayer.\r\n\r\n$_CLICK" - -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "..\COPYING" -!insertmacro MUI_PAGE_COMPONENTS -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES - -!define MUI_FINISHPAGE_LINK "Visit the web site for the latest news, FAQs and support" -!define MUI_FINISHPAGE_LINK_LOCATION "http://www.jahshaka.org/" - -!insertmacro MUI_PAGE_FINISH - -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES - -;-------------------------------- -;Languages - -!insertmacro MUI_LANGUAGE "English" - -Function .onInit - - ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" "UninstallString" - StrCmp $R0 "" done - MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \ - "jahPlayer is already installed. $\n$\nClick `OK` to remove the \ - previous version or `Cancel` to cancel this upgrade." \ - IDOK uninst - Abort - - uninst: - ClearErrors - SetDetailsPrint textonly - DetailPrint "Uninstalling previous jahPlayer installation..." - SetDetailsPrint listonly - ExecWait '$R0 _?=$INSTDIR' - IfErrors no_remove_uninstaller - goto done - - no_remove_uninstaller: - MessageBox MB_ICONEXCLAMATION \ - "Unable to remove previous version of jahPlayer$\nTry uninstalling via the control panel." - Abort - - done: - -FunctionEnd - -Section "Windows CRT DLLs" ms_crt_dlls - - SectionIn 1 - SetOutPath $INSTDIR - - SetOverwrite on - SetShellVarContext all - - SetDetailsPrint textonly - DetailPrint "Installing Windows VC redistributables..." - SetDetailsPrint listonly - - SetOutPath $INSTDIR - File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe" - File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\product.xml" - ExecWait '"$INSTDIR\vcredist_x86.exe"' - - SetDetailsPrint both - -SectionEnd - -Section "MSXML4 SP2" msxml2 - - SectionIn 1 - SetOutPath $INSTDIR - - SetOverwrite on - SetShellVarContext all - - SetDetailsPrint textonly - DetailPrint "Installing MSXML4 SP2..." - SetDetailsPrint listonly - - SetOutPath $INSTDIR - File "${OLIBS_PATH}\installer\msxml4.msi" - - ExecWait 'MsiExec.exe /qn /x{2AEBE10C-D819-4EBF-BC60-03BF2327D340}' ; uninstall MSXML4 if it's there - ExecWait 'MsiExec.exe /qn /x{35343FF7-939B-401A-87B3-FF90A5123D88}' ; uninstall MSXML4 SP1 if it's there - ExecWait 'MsiExec.exe /qn /i "$INSTDIR\msxml4.msi"' - - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "msxml2" "" - - SetDetailsPrint both - -SectionEnd - -Section "OpenAL" openal - - SectionIn 1 - SetOutPath $INSTDIR - - SetOverwrite on - SetShellVarContext all - - SetDetailsPrint textonly - DetailPrint "Installing OpenAL..." - SetDetailsPrint listonly - - SetOutPath $INSTDIR - File "C:\Program Files\OpenAL 1.1 SDK\redist\oalinst.exe" - ExecWait '"$INSTDIR\oalinst.exe" /S /D' - - SetDetailsPrint both - -SectionEnd - -Section "OpenLibraries" olibs - - SetDetailsPrint textonly - DetailPrint "Installing OpenLibraries..." - SetDetailsPrint listonly - - SectionIn 1 RO - SetOutPath $INSTDIR - - SetOverwrite on - - SetOutPath $INSTDIR\openlibraries\bin - File "${OLIBS_PATH}\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-0_4_1.dll" - - ; dependencies - File "C:\Program Files\FFmpeg\lib\avcodec-51.dll" - File "C:\Program Files\FFmpeg\lib\avformat-51.dll" - File "C:\Program Files\FFmpeg\lib\avutil-49.dll" - File "C:\openexr-1.4.0-vs2005\bin\Half_dll.dll" - File "C:\openexr-1.4.0-vs2005\bin\IlmImf_dll.dll" - File "C:\openexr-1.4.0-vs2005\bin\Iex_dll.dll" - File "C:\openexr-1.4.0-vs2005\bin\Imath_dll.dll" - File "C:\openexr-1.4.0-vs2005\bin\zlib1.dll" - File "C:\openexr-1.4.0-vs2005\bin\IlmThread_dll.dll" - File "C:\SDL-1.2.11\lib\SDL.dll" - File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll" - File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll" - File "C:\windows\system32\msvcp71.dll" - File "C:\windows\system32\msvcr71.dll" - File "C:\windows\system32\glew32.dll" - File "C:\windows\system32\glut32.dll" - File "c:\windows\system32\python24.dll" - File "C:\Qt\3.3.6\bin\qt-mt336.dll" - File "c:\boost\lib\boost_python-vc80-mt-1_33_1.dll" - - ; Python - SetOutPath $INSTDIR\openlibraries\python - File "${OLIBS_PATH}\src\openpluginlib\py\Multi-threaded Release DLL\openpluginlib.pyd" - File "${OLIBS_PATH}\src\openimagelib\py\Multi-threaded Release DLL\openimagelib.pyd" - File "${OLIBS_PATH}\src\openmedialib\py\Multi-threaded Release DLL\openmedialib.pyd" - File "${OLIBS_PATH}\src\openassetlib\py\Multi-threaded Release DLL\openassetlib.pyd" - - SetOutPath $INSTDIR\openlibraries\plugins\release - File "${OLIBS_PATH}\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl" - File "${OLIBS_PATH}\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openimagelib\plugins\dds\dds_plugin.opl" - File "${OLIBS_PATH}\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openimagelib\plugins\dpx\dpx_plugin.opl" - File "${OLIBS_PATH}\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openimagelib\plugins\exr\exr_plugin.opl" - File "${OLIBS_PATH}\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openimagelib\plugins\gdi+\gdi_plugin.opl" - File "${OLIBS_PATH}\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openimagelib\plugins\hdr\hdr_plugin.opl" - File "${OLIBS_PATH}\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openimagelib\plugins\sgi\sgi_plugin.opl" - File "${OLIBS_PATH}\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openimagelib\plugins\tga\tga_plugin.opl" - File "${OLIBS_PATH}\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openimagelib\plugins\qim\qim_plugin.opl" - File "${OLIBS_PATH}\src\openimagelib\plugins\qim\Multi-threaded Release DLL\openimagelib_qim-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openmedialib\plugins\avformat\avformat_plugin.opl" - File "${OLIBS_PATH}\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openmedialib\plugins\glew\glew_plugin.opl" - File "${OLIBS_PATH}\src\openmedialib\plugins\glew\Multi-threaded Release DLL\openmedialib_glew-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openmedialib\plugins\oil\oil_plugin.opl" - File "${OLIBS_PATH}\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openmedialib\plugins\openal\openal_plugin.opl" - File "${OLIBS_PATH}\src\openmedialib\plugins\openal\Multi-threaded Release DLL\openmedialib_openal-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openmedialib\plugins\template\template_plugin.opl" - File "${OLIBS_PATH}\src\openmedialib\plugins\template\Multi-threaded Release DLL\openmedialib_template-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openmedialib\plugins\gensys\gensys_plugin.opl" - File "${OLIBS_PATH}\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openmedialib\plugins\quicktime\quicktime_plugin.opl" - File "${OLIBS_PATH}\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openmedialib\plugins\sdl\sdl_plugin.opl" - File "${OLIBS_PATH}\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openobjectlib\plugins\3ds\3ds_plugin.opl" - File "${OLIBS_PATH}\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openobjectlib\plugins\obj\obj_plugin.opl" - File "${OLIBS_PATH}\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openobjectlib\plugins\tsto\tsto_plugin.opl" - File "${OLIBS_PATH}\src\openobjectlib\plugins\tsto\Multi-threaded Release DLL\openobjectlib_tsto-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openobjectlib\plugins\X3D\x3d_plugin.opl" - File "${OLIBS_PATH}\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openobjectlib\plugins\Collada\collada_plugin.opl" - File "${OLIBS_PATH}\src\openobjectlib\plugins\Collada\Multi-threaded Release DLL\openobjectlib_collada-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl" - File "${OLIBS_PATH}\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openassetlib\plugins\filesystem_storage_plugin\filesystem_storage_plugin.opl" - File "${OLIBS_PATH}\src\openassetlib\plugins\filesystem_storage_plugin\Multi-threaded Release DLL\openassetlib_filesystem-vc80-r-0_4_1.dll" - File "${OLIBS_PATH}\src\openassetlib\plugins\sqlite3_metadata_plugin\sqlite3_metadata_plugin.opl" - File "${OLIBS_PATH}\src\openassetlib\plugins\sqlite3_metadata_plugin\Multi-threaded Release DLL\openassetlib_sqlite3-vc80-r-0_4_1.dll" - - SetOutPath $INSTDIR\openlibraries\kernels - File "${OLIBS_PATH}\effects\kernels\sepia.gpu_kernel" - - SetOutPath $INSTDIR\openlibraries\shaders - File "${OLIBS_PATH}\effects\shaders\sepia.cg" - File "${OLIBS_PATH}\effects\shaders\sepia.frag" - File "${OLIBS_PATH}\effects\shaders\fixed_function.vert" - File "${OLIBS_PATH}\effects\shaders\passthrough.vert" - File "${OLIBS_PATH}\effects\shaders\passthrough.cg" - File "${OLIBS_PATH}\effects\shaders\rgb_to_yuv444.frag" - File "${OLIBS_PATH}\effects\shaders\yuv444_to_rgb.frag" - File "${OLIBS_PATH}\effects\shaders\yuv444_to_rgb.cg" - File "${OLIBS_PATH}\effects\shaders\yuv444_to_rgb_deinterlace.cg" - File "${OLIBS_PATH}\effects\shaders\yuv444_to_rgb_deinterlace.frag" - File "${OLIBS_PATH}\effects\shaders\histogram.cg" - File "${OLIBS_PATH}\effects\shaders\histogram.frag" - File "${OLIBS_PATH}\effects\shaders\channel_selector.cg" - File "${OLIBS_PATH}\effects\shaders\channel_selector.frag" - - SetDetailsPrint both - -SectionEnd - -Section "jahPlayer" SecCore - - SectionIn 1 2 3 RO - SetOutPath $INSTDIR - - SetOverwrite on - SetShellVarContext all - - SetDetailsPrint textonly - DetailPrint "Installing jahPlayer & jPlayer..." - SetDetailsPrint listonly - - SetOutPath $INSTDIR\jahPlayer - File /r "..\jahPlayer\dist\*" - File "run_jahplayer.cmd" - - SetOutPath $INSTDIR\jahTools - SetOutPath $INSTDIR\jahTools\encoder - File /r "..\jahTools\encoder\dist\*" - - SetOutPath $INSTDIR\jahTools - SetOutPath $INSTDIR\jahTools\jPlayer - File /r "..\jahTools\jPlayer\dist\*" - File "run_jplayer.cmd" - - SetDetailsPrint both - - SetOutPath $INSTDIR\jahPlayer - CreateDirectory "$SMPROGRAMS\jahshaka" - CreateShortCut "$SMPROGRAMS\jahshaka\jahPlayer.lnk" "$INSTDIR\jahPlayer\run_jahPlayer.cmd" '' "$INSTDIR\jahPlayer\jahPlayer.exe" 0 SW_SHOWMINIMIZED - CreateShortCut "$DESKTOP\jahPlayer.lnk" "$INSTDIR\jahPlayer\run_jahPlayer.cmd" '' "$INSTDIR\jahPlayer\jahPlayer.exe" 0 SW_SHOWMINIMIZED - - SetOutPath $INSTDIR\jahTools\jPlayer - CreateDirectory "$SMPROGRAMS\jahshaka\jahTools" - CreateShortCut "$SMPROGRAMS\jahshaka\jahTools\jPlayer.lnk" "$INSTDIR\jahTools\jPlayer\run_jPlayer.cmd" '' "$INSTDIR\jahTools\jPlayer\jPlayer.exe" 0 SW_SHOWMINIMIZED - CreateShortCut "$DESKTOP\jPlayer.lnk" "$INSTDIR\jahTools\jPlayer\run_jPlayer.cmd" '' "$INSTDIR\jahTools\jPlayer\jPlayer.exe" 0 SW_SHOWMINIMIZED - - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" "DisplayName" "jahPlayer" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" "UninstallString" "$INSTDIR\uninst-jahPlayer.exe" - - Push "$INSTDIR\jahTools\jPlayer" - Call AddToPath - - Push "JAHTOOLSPATH" - Push "$INSTDIR\jahTools" - Call WriteEnvStr - -SectionEnd - -Section -post - - WriteUninstaller $INSTDIR\uninst-jahPlayer.exe - -SectionEnd - -;-------------------------------- -;Descriptions - -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${ms_crt_dlls} "Windows CRT DLLs" - !insertmacro MUI_DESCRIPTION_TEXT ${msxml2} "MSXML2 SP2" - !insertmacro MUI_DESCRIPTION_TEXT ${openal} "OpenAL" - !insertmacro MUI_DESCRIPTION_TEXT ${olibs} "OpenLibraries runtime files" - !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "jahPlayer runtime files" -!insertmacro MUI_FUNCTION_DESCRIPTION_END - -;-------------------------------- -;Uninstaller Section - -Section Uninstall - - SetDetailsPrint textonly - DetailPrint "Deleting Files..." - SetDetailsPrint listonly - - SetShellVarContext all - - ;-- Remove registry keys - DeleteRegKey HKLM "Software\jahPlayer" - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" - - Push "$INSTDIR\jahTools\jPlayer" - Call un.RemoveFromPath - - ;-- remove JAHTOOLSPATH - Push "JAHTOOLSPATH" - Call un.DeleteEnvStr - - ;-- Remove desktop and start->Programs->jahPlayer shortcuts - Delete $DESKTOP\jahPlayer.lnk - Delete $DESKTOP\jPlayer.lnk - RMDir /r $SMPROGRAMS\jahshaka - - ;-- Remove install directory - RMDir /r $INSTDIR - - SetDetailsPrint both - -SectionEnd - - Deleted: trunk/installer/run_jahplayer.cmd =================================================================== --- trunk/installer/run_jahplayer.cmd 2007-11-10 17:25:39 UTC (rev 915) +++ trunk/installer/run_jahplayer.cmd 2007-11-10 20:11:14 UTC (rev 916) @@ -1,16 +0,0 @@ -rem Setup jahplayer.exe environment -setlocal - -cd /d %~dp0 -set JAHPLAYERPATH=%CD% - -cd .. -set OLIBSPATH=%CD%\openlibraries -set PATH=%JAHPLAYERPATH%;%OLIBSPATH%\bin;%PATH% -set PYTHONPATH=%OLIBSPATH%\python;%PYTHONPATH% - -rem run jahplayer -cd %JAHPLAYERPATH% -start /b jahplayer.exe %* - -endlocal Deleted: trunk/installer/run_jplayer.cmd =================================================================== --- trunk/installer/run_jplayer.cmd 2007-11-10 17:25:39 UTC (rev 915) +++ trunk/installer/run_jplayer.cmd 2007-11-10 20:11:14 UTC (rev 916) @@ -1,16 +0,0 @@ -rem Setup jplayer.exe environment -setlocal - -cd /d %~dp0 -set JPLAYERPATH=%CD% - -cd ..\.. -set OLIBSPATH=%CD%\openlibraries -set PATH=%JPLAYERPATH%;%OLIBSPATH%\bin;%PATH% -set PYTHONPATH=%OLIBSPATH%\python;%PYTHONPATH% - -rem run jplayer -cd %JPLAYERPATH% -start /b jplayer.exe %* - -endlocal Deleted: trunk/installer/vm-installer-header.bmp =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-12-20 18:10:55
|
Revision: 929 http://jahshaka.svn.sourceforge.net/jahshaka/?rev=929&view=rev Author: glslang Date: 2007-12-20 10:10:53 -0800 (Thu, 20 Dec 2007) Log Message: ----------- + build fix Modified Paths: -------------- trunk/installer/jahplayer.nsi Added Paths: ----------- trunk/installer/msxml6_x86.msi Modified: trunk/installer/jahplayer.nsi =================================================================== --- trunk/installer/jahplayer.nsi 2007-12-20 10:40:57 UTC (rev 928) +++ trunk/installer/jahplayer.nsi 2007-12-20 18:10:53 UTC (rev 929) @@ -130,7 +130,7 @@ SetOutPath $INSTDIR File "..\installer\msxml6_x86.msi" - ExecWait 'MsiExec.exe /qn /i "$INSTDIR\msxml6.msi /qb"' + ExecWait 'MsiExec.exe /qn /i "$INSTDIR\msxml6_x86.msi /qb"' ; WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "msxml2" "" Added: trunk/installer/msxml6_x86.msi =================================================================== (Binary files differ) Property changes on: trunk/installer/msxml6_x86.msi ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |