Changeset 904
- Timestamp:
- 09/25/07 04:29:07 (1 year ago)
- Location:
- trunk
- Files:
-
- 10 modified
-
installer/jahplayer.nsi (modified) (12 diffs)
-
installer/run_jahplayer.cmd (modified) (2 diffs)
-
installer/run_jplayer.cmd (modified) (2 diffs)
-
jahplayer/bootstrap.py (modified) (2 diffs)
-
jahplayer/control.py (modified) (1 diff)
-
jahplayer/footer.py (modified) (1 diff)
-
jahplayer/setup.py (modified) (2 diffs)
-
jahplayer/viewport.py (modified) (2 diffs)
-
jahtools/encoder/bootstrap.py (modified) (2 diffs)
-
jahtools/encoder/setup.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/installer/jahplayer.nsi
r902 r904 4 4 5 5 !ifndef VERSION 6 !define VERSION 20070828 7 !endif 8 9 !ifndef OLIBS_PATH 10 !define OLIBS_PATH "$%OLIBS_DEVEL_ROOT%" 6 !define /date VERSION "%Y%m%d" 11 7 !endif 12 8 … … 17 13 OutFile "${OUTFILE}" 18 14 !else 19 OutFile jahplayer-${VERSION} .exe15 OutFile jahplayer-${VERSION}-installer.exe 20 16 !endif 21 17 … … 56 52 !insertmacro MUI_PAGE_WELCOME 57 53 !insertmacro MUI_PAGE_LICENSE "..\COPYING" 58 !insertmacro MUI_PAGE_COMPONENTS59 !insertmacro MUI_PAGE_DIRECTORY54 ;!insertmacro MUI_PAGE_COMPONENTS 55 ;!insertmacro MUI_PAGE_DIRECTORY 60 56 !insertmacro MUI_PAGE_INSTFILES 61 57 … … 115 111 SetOutPath $INSTDIR 116 112 File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe" 117 File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\product.xml"118 ExecWait '"$INSTDIR\vcredist_x86.exe "'113 ;File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\product.xml" 114 ExecWait '"$INSTDIR\vcredist_x86.exe /q:a"' 119 115 120 116 SetDetailsPrint both … … 135 131 136 132 SetOutPath $INSTDIR 137 File "$ {OLIBS_PATH}\installer\msxml4.msi"133 File "$%OLIBS_DEVEL_ROOT%\installer\msxml4.msi" 138 134 139 135 ExecWait 'MsiExec.exe /qn /x{2AEBE10C-D819-4EBF-BC60-03BF2327D340}' ; uninstall MSXML4 if it's there … … 179 175 180 176 SetOutPath $INSTDIR\openlibraries\bin 181 File "$ {OLIBS_PATH}\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_1.dll"182 File "$ {OLIBS_PATH}\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_1.dll"183 File "$ {OLIBS_PATH}\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-0_4_1.dll"184 File "$ {OLIBS_PATH}\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-0_4_1.dll"185 File "$ {OLIBS_PATH}\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-0_4_1.dll"177 File "$%OLIBS_DEVEL_ROOT%\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_1.dll" 178 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_1.dll" 179 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-0_4_1.dll" 180 File "$%OLIBS_DEVEL_ROOT%\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-0_4_1.dll" 181 File "$%OLIBS_DEVEL_ROOT%\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-0_4_1.dll" 186 182 187 183 ; dependencies … … 189 185 File "C:\Program Files\FFmpeg\lib\avformat-51.dll" 190 186 File "C:\Program Files\FFmpeg\lib\avutil-49.dll" 187 File "C:\Program Files\FFmpeg\lib\libogg-0.dll" 188 File "C:\openexr-1.4.0-vs2005\bin\Half_dll_d.dll" 191 189 File "C:\openexr-1.4.0-vs2005\bin\Half_dll.dll" 190 File "C:\openexr-1.4.0-vs2005\bin\IlmImf_dll_d.dll" 192 191 File "C:\openexr-1.4.0-vs2005\bin\IlmImf_dll.dll" 192 File "C:\openexr-1.4.0-vs2005\bin\Iex_dll_d.dll" 193 193 File "C:\openexr-1.4.0-vs2005\bin\Iex_dll.dll" 194 File "C:\openexr-1.4.0-vs2005\bin\Imath_dll_d.dll" 194 195 File "C:\openexr-1.4.0-vs2005\bin\Imath_dll.dll" 195 196 File "C:\openexr-1.4.0-vs2005\bin\zlib1.dll" 197 File "C:\openexr-1.4.0-vs2005\bin\zlib1d.dll" 198 File "C:\openexr-1.4.0-vs2005\bin\IlmThread_dll_d.dll" 196 199 File "C:\openexr-1.4.0-vs2005\bin\IlmThread_dll.dll" 197 File "C:\SDL-1.2.1 1\lib\SDL.dll"200 File "C:\SDL-1.2.12\lib\SDL.dll" 198 201 File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll" 199 202 File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll" … … 202 205 File "C:\windows\system32\glew32.dll" 203 206 File "C:\windows\system32\glut32.dll" 204 File "c:\windows\system32\python2 4.dll"207 File "c:\windows\system32\python25.dll" 205 208 File "C:\Qt\3.3.6\bin\qt-mt336.dll" 206 File "c:\boost\lib\boost_python-vc80-mt-1_3 3_1.dll"209 File "c:\boost\lib\boost_python-vc80-mt-1_34_1.dll" 207 210 208 211 ; Python 209 212 SetOutPath $INSTDIR\openlibraries\python 210 File "$ {OLIBS_PATH}\src\openpluginlib\py\Multi-threaded Release DLL\openpluginlib.pyd"211 File "$ {OLIBS_PATH}\src\openimagelib\py\Multi-threaded Release DLL\openimagelib.pyd"212 File "$ {OLIBS_PATH}\src\openmedialib\py\Multi-threaded Release DLL\openmedialib.pyd"213 File "$ {OLIBS_PATH}\src\openassetlib\py\Multi-threaded Release DLL\openassetlib.pyd"213 File "$%OLIBS_DEVEL_ROOT%\src\openpluginlib\py\Multi-threaded Release DLL\openpluginlib.pyd" 214 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\py\Multi-threaded Release DLL\openimagelib.pyd" 215 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\py\Multi-threaded Release DLL\openmedialib.pyd" 216 File "$%OLIBS_DEVEL_ROOT%\src\openassetlib\py\Multi-threaded Release DLL\openassetlib.pyd" 214 217 215 218 SetOutPath $INSTDIR\openlibraries\plugins\release 216 File "$ {OLIBS_PATH}\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"217 File "$ {OLIBS_PATH}\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-0_4_1.dll"218 File "$ {OLIBS_PATH}\src\openimagelib\plugins\dds\dds_plugin.opl"219 File "$ {OLIBS_PATH}\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-0_4_1.dll"220 File "$ {OLIBS_PATH}\src\openimagelib\plugins\dpx\dpx_plugin.opl"221 File "$ {OLIBS_PATH}\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-0_4_1.dll"222 File "$ {OLIBS_PATH}\src\openimagelib\plugins\exr\exr_plugin.opl"223 File "$ {OLIBS_PATH}\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-0_4_1.dll"224 File "$ {OLIBS_PATH}\src\openimagelib\plugins\gdi+\gdi_plugin.opl"225 File "$ {OLIBS_PATH}\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-0_4_1.dll"226 File "$ {OLIBS_PATH}\src\openimagelib\plugins\hdr\hdr_plugin.opl"227 File "$ {OLIBS_PATH}\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-0_4_1.dll"228 File "$ {OLIBS_PATH}\src\openimagelib\plugins\sgi\sgi_plugin.opl"229 File "$ {OLIBS_PATH}\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_1.dll"230 File "$ {OLIBS_PATH}\src\openimagelib\plugins\tga\tga_plugin.opl"231 File "$ {OLIBS_PATH}\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-0_4_1.dll"232 File "$ {OLIBS_PATH}\src\openimagelib\plugins\qim\qim_plugin.opl"233 File "$ {OLIBS_PATH}\src\openimagelib\plugins\qim\Multi-threaded Release DLL\openimagelib_qim-vc80-r-0_4_1.dll"234 File "$ {OLIBS_PATH}\src\openmedialib\plugins\avformat\avformat_plugin.opl"235 File "$ {OLIBS_PATH}\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-0_4_1.dll"236 File "$ {OLIBS_PATH}\src\openmedialib\plugins\glew\glew_plugin.opl"237 File "$ {OLIBS_PATH}\src\openmedialib\plugins\glew\Multi-threaded Release DLL\openmedialib_glew-vc80-r-0_4_1.dll"238 File "$ {OLIBS_PATH}\src\openmedialib\plugins\oil\oil_plugin.opl"239 File "$ {OLIBS_PATH}\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-0_4_1.dll"240 File "$ {OLIBS_PATH}\src\openmedialib\plugins\openal\openal_plugin.opl"241 File "$ {OLIBS_PATH}\src\openmedialib\plugins\openal\Multi-threaded Release DLL\openmedialib_openal-vc80-r-0_4_1.dll"242 File "$ {OLIBS_PATH}\src\openmedialib\plugins\template\template_plugin.opl"243 File "$ {OLIBS_PATH}\src\openmedialib\plugins\template\Multi-threaded Release DLL\openmedialib_template-vc80-r-0_4_1.dll"244 File "$ {OLIBS_PATH}\src\openmedialib\plugins\gensys\gensys_plugin.opl"245 File "$ {OLIBS_PATH}\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-0_4_1.dll"246 File "$ {OLIBS_PATH}\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"247 File "$ {OLIBS_PATH}\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-0_4_1.dll"248 File "$ {OLIBS_PATH}\src\openmedialib\plugins\sdl\sdl_plugin.opl"249 File "$ {OLIBS_PATH}\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-0_4_1.dll"250 File "$ {OLIBS_PATH}\src\openobjectlib\plugins\3ds\3ds_plugin.opl"251 File "$ {OLIBS_PATH}\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-0_4_1.dll"252 File "$ {OLIBS_PATH}\src\openobjectlib\plugins\obj\obj_plugin.opl"253 File "$ {OLIBS_PATH}\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-0_4_1.dll"254 File "$ {OLIBS_PATH}\src\openobjectlib\plugins\tsto\tsto_plugin.opl"255 File "$ {OLIBS_PATH}\src\openobjectlib\plugins\tsto\Multi-threaded Release DLL\openobjectlib_tsto-vc80-r-0_4_1.dll"256 File "$ {OLIBS_PATH}\src\openobjectlib\plugins\X3D\x3d_plugin.opl"257 File "$ {OLIBS_PATH}\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-0_4_1.dll"258 File "$ {OLIBS_PATH}\src\openobjectlib\plugins\Collada\collada_plugin.opl"259 File "$ {OLIBS_PATH}\src\openobjectlib\plugins\Collada\Multi-threaded Release DLL\openobjectlib_collada-vc80-r-0_4_1.dll"260 File "$ {OLIBS_PATH}\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"261 File "$ {OLIBS_PATH}\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-0_4_1.dll"262 File "$ {OLIBS_PATH}\src\openassetlib\plugins\filesystem_storage_plugin\filesystem_storage_plugin.opl"263 File "$ {OLIBS_PATH}\src\openassetlib\plugins\filesystem_storage_plugin\Multi-threaded Release DLL\openassetlib_filesystem-vc80-r-0_4_1.dll"264 File "$ {OLIBS_PATH}\src\openassetlib\plugins\sqlite3_metadata_plugin\sqlite3_metadata_plugin.opl"265 File "$ {OLIBS_PATH}\src\openassetlib\plugins\sqlite3_metadata_plugin\Multi-threaded Release DLL\openassetlib_sqlite3-vc80-r-0_4_1.dll"219 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl" 220 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-0_4_1.dll" 221 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\dds\dds_plugin.opl" 222 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-0_4_1.dll" 223 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\dpx\dpx_plugin.opl" 224 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-0_4_1.dll" 225 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\exr\exr_plugin.opl" 226 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-0_4_1.dll" 227 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\gdi+\gdi_plugin.opl" 228 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-0_4_1.dll" 229 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\hdr\hdr_plugin.opl" 230 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-0_4_1.dll" 231 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\sgi\sgi_plugin.opl" 232 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_1.dll" 233 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\tga\tga_plugin.opl" 234 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-0_4_1.dll" 235 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\qim\qim_plugin.opl" 236 File "$%OLIBS_DEVEL_ROOT%\src\openimagelib\plugins\qim\Multi-threaded Release DLL\openimagelib_qim-vc80-r-0_4_1.dll" 237 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\avformat\avformat_plugin.opl" 238 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-0_4_1.dll" 239 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\glew\glew_plugin.opl" 240 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\glew\Multi-threaded Release DLL\openmedialib_glew-vc80-r-0_4_1.dll" 241 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\oil\oil_plugin.opl" 242 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-0_4_1.dll" 243 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\openal\openal_plugin.opl" 244 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\openal\Multi-threaded Release DLL\openmedialib_openal-vc80-r-0_4_1.dll" 245 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\template\template_plugin.opl" 246 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\template\Multi-threaded Release DLL\openmedialib_template-vc80-r-0_4_1.dll" 247 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\gensys\gensys_plugin.opl" 248 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-0_4_1.dll" 249 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\quicktime\quicktime_plugin.opl" 250 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-0_4_1.dll" 251 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\sdl\sdl_plugin.opl" 252 File "$%OLIBS_DEVEL_ROOT%\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-0_4_1.dll" 253 File "$%OLIBS_DEVEL_ROOT%\src\openobjectlib\plugins\3ds\3ds_plugin.opl" 254 File "$%OLIBS_DEVEL_ROOT%\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-0_4_1.dll" 255 File "$%OLIBS_DEVEL_ROOT%\src\openobjectlib\plugins\obj\obj_plugin.opl" 256 File "$%OLIBS_DEVEL_ROOT%\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-0_4_1.dll" 257 File "$%OLIBS_DEVEL_ROOT%\src\openobjectlib\plugins\tsto\tsto_plugin.opl" 258 File "$%OLIBS_DEVEL_ROOT%\src\openobjectlib\plugins\tsto\Multi-threaded Release DLL\openobjectlib_tsto-vc80-r-0_4_1.dll" 259 File "$%OLIBS_DEVEL_ROOT%\src\openobjectlib\plugins\X3D\x3d_plugin.opl" 260 File "$%OLIBS_DEVEL_ROOT%\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-0_4_1.dll" 261 File "$%OLIBS_DEVEL_ROOT%\src\openobjectlib\plugins\Collada\collada_plugin.opl" 262 File "$%OLIBS_DEVEL_ROOT%\src\openobjectlib\plugins\Collada\Multi-threaded Release DLL\openobjectlib_collada-vc80-r-0_4_1.dll" 263 File "$%OLIBS_DEVEL_ROOT%\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl" 264 File "$%OLIBS_DEVEL_ROOT%\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-0_4_1.dll" 265 File "$%OLIBS_DEVEL_ROOT%\src\openassetlib\plugins\filesystem_storage_plugin\filesystem_storage_plugin.opl" 266 File "$%OLIBS_DEVEL_ROOT%\src\openassetlib\plugins\filesystem_storage_plugin\Multi-threaded Release DLL\openassetlib_filesystem-vc80-r-0_4_1.dll" 267 File "$%OLIBS_DEVEL_ROOT%\src\openassetlib\plugins\sqlite3_metadata_plugin\sqlite3_metadata_plugin.opl" 268 File "$%OLIBS_DEVEL_ROOT%\src\openassetlib\plugins\sqlite3_metadata_plugin\Multi-threaded Release DLL\openassetlib_sqlite3-vc80-r-0_4_1.dll" 266 269 267 270 SetOutPath $INSTDIR\openlibraries\kernels 268 File "$ {OLIBS_PATH}\effects\kernels\sepia.gpu_kernel"271 File "$%OLIBS_DEVEL_ROOT%\effects\kernels\sepia.gpu_kernel" 269 272 270 273 SetOutPath $INSTDIR\openlibraries\shaders 271 File "$ {OLIBS_PATH}\effects\shaders\sepia.cg"272 File "$ {OLIBS_PATH}\effects\shaders\sepia.frag"273 File "$ {OLIBS_PATH}\effects\shaders\fixed_function.vert"274 File "$ {OLIBS_PATH}\effects\shaders\passthrough.vert"275 File "$ {OLIBS_PATH}\effects\shaders\passthrough.cg"276 File "$ {OLIBS_PATH}\effects\shaders\rgb_to_yuv444.frag"277 File "$ {OLIBS_PATH}\effects\shaders\yuv444_to_rgb.frag"278 File "$ {OLIBS_PATH}\effects\shaders\yuv444_to_rgb.cg"279 File "$ {OLIBS_PATH}\effects\shaders\yuv444_to_rgb_deinterlace.cg"280 File "$ {OLIBS_PATH}\effects\shaders\yuv444_to_rgb_deinterlace.frag"281 File "$ {OLIBS_PATH}\effects\shaders\histogram.cg"282 File "$ {OLIBS_PATH}\effects\shaders\histogram.frag"283 File "$ {OLIBS_PATH}\effects\shaders\channel_selector.cg"284 File "$ {OLIBS_PATH}\effects\shaders\channel_selector.frag"274 File "$%OLIBS_DEVEL_ROOT%\effects\shaders\sepia.cg" 275 File "$%OLIBS_DEVEL_ROOT%\effects\shaders\sepia.frag" 276 File "$%OLIBS_DEVEL_ROOT%\effects\shaders\fixed_function.vert" 277 File "$%OLIBS_DEVEL_ROOT%\effects\shaders\passthrough.vert" 278 File "$%OLIBS_DEVEL_ROOT%\effects\shaders\passthrough.cg" 279 File "$%OLIBS_DEVEL_ROOT%\effects\shaders\rgb_to_yuv444.frag" 280 File "$%OLIBS_DEVEL_ROOT%\effects\shaders\yuv444_to_rgb.frag" 281 File "$%OLIBS_DEVEL_ROOT%\effects\shaders\yuv444_to_rgb.cg" 282 File "$%OLIBS_DEVEL_ROOT%\effects\shaders\yuv444_to_rgb_deinterlace.cg" 283 File "$%OLIBS_DEVEL_ROOT%\effects\shaders\yuv444_to_rgb_deinterlace.frag" 284 File "$%OLIBS_DEVEL_ROOT%\effects\shaders\histogram.cg" 285 File "$%OLIBS_DEVEL_ROOT%\effects\shaders\histogram.frag" 286 File "$%OLIBS_DEVEL_ROOT%\effects\shaders\channel_selector.cg" 287 File "$%OLIBS_DEVEL_ROOT%\effects\shaders\channel_selector.frag" 285 288 286 289 SetDetailsPrint both … … 297 300 298 301 SetDetailsPrint textonly 299 DetailPrint "Installing jahPlayer & jPlayer..."302 DetailPrint "Installing jahPlayer..." 300 303 SetDetailsPrint listonly 301 304 … … 310 313 SetDetailsPrint both 311 314 315 ; SetOutPath $INSTDIR\jahPlayer 316 ; CreateShortCut "$SMPROGRAMS\jahPlayer.lnk" "$INSTDIR\jahPlayer\run_jahPlayer.cmd" '' "$INSTDIR\jahPlayer\jahPlayer.exe" 0 SW_SHOWMINIMIZED 317 ; CreateShortCut "$DESKTOP\jahPlayer.lnk" "$INSTDIR\jahPlayer\run_jahPlayer.cmd" '' "$INSTDIR\jahPlayer\jahPlayer.exe" 0 SW_SHOWMINIMIZED 318 312 319 SetOutPath $INSTDIR\jahPlayer 313 CreateShortCut "$SMPROGRAMS\jahPlayer.lnk" "$INSTDIR\jahPlayer\run_jahPlayer.cmd" '' "$INSTDIR\jahPlayer\jahPlayer.exe" 0 SW_SHOWMINIMIZED 314 CreateShortCut "$DESKTOP\jahPlayer.lnk" "$INSTDIR\jahPlayer\run_jahPlayer.cmd" '' "$INSTDIR\jahPlayer\jahPlayer.exe" 0 SW_SHOWMINIMIZED 320 CreateDirectory "$SMPROGRAMS\jahPlayer" 321 CreateShortCut "$SMPROGRAMS\jahPlayer\jahPlayer.lnk" "$INSTDIR\jahPlayer\run_jahPlayer.cmd" '' '$INSTDIR\jahPlayer\jahPlayer.exe' 0 SW_SHOWMINIMIZED 322 CreateShortCut "$DESKTOP\jahPlayer.lnk" "$INSTDIR\jahPlayer\run_jahPlayer.cmd" '' '$INSTDIR\jahPlayer\jahPlayer.exe' 0 SW_SHOWMINIMIZED 323 324 SetOutPath $INSTDIR 325 CreateShortCut "$SMPROGRAMS\jahPlayer\Uninstall jahPlayer.lnk" "$INSTDIR\uninst-jahplayer.exe" 315 326 316 327 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jahPlayer" "DisplayName" "jahPlayer" … … 332 343 ;Descriptions 333 344 334 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN335 !insertmacro MUI_DESCRIPTION_TEXT ${ms_crt_dlls} "Windows CRT DLLs"336 !insertmacro MUI_DESCRIPTION_TEXT ${msxml2} "MSXML2 SP2"337 !insertmacro MUI_DESCRIPTION_TEXT ${openal} "OpenAL"338 !insertmacro MUI_DESCRIPTION_TEXT ${olibs} "OpenLibraries runtime files"339 !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "jahPlayer runtime files"340 !insertmacro MUI_FUNCTION_DESCRIPTION_END345 ;!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN 346 ; !insertmacro MUI_DESCRIPTION_TEXT ${ms_crt_dlls} "Windows CRT DLLs" 347 ; !insertmacro MUI_DESCRIPTION_TEXT ${msxml2} "MSXML2 SP2" 348 ; !insertmacro MUI_DESCRIPTION_TEXT ${openal} "OpenAL" 349 ; !insertmacro MUI_DESCRIPTION_TEXT ${olibs} "OpenLibraries runtime files" 350 ; !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "jahPlayer runtime files" 351 ;!insertmacro MUI_FUNCTION_DESCRIPTION_END 341 352 342 353 ;-------------------------------- … … 361 372 ;-- Remove desktop and start->Programs->jahPlayer shortcuts 362 373 Delete $DESKTOP\jahPlayer.lnk 363 RMDir /r $SMPROGRAMS\jah shaka374 RMDir /r $SMPROGRAMS\jahPlayer 364 375 365 376 ;-- Remove install directory -
trunk/installer/run_jahplayer.cmd
r903 r904 1 @rem Setup jahplayer.exe environment1 rem Setup jahplayer.exe environment 2 2 setlocal 3 3 … … 10 10 set PYTHONPATH=%OLIBSPATH%\python;%PYTHONPATH% 11 11 12 @rem run jahplayer12 rem run jahplayer 13 13 cd %JAHPLAYERPATH% 14 14 start /b jahplayer.exe %* -
trunk/installer/run_jplayer.cmd
r903 r904 1 @rem Setup jplayer.exe environment1 rem Setup jplayer.exe environment 2 2 setlocal 3 3 … … 10 10 set PYTHONPATH=%OLIBSPATH%\python;%PYTHONPATH% 11 11 12 @rem run jplayer12 rem run jplayer 13 13 cd %JPLAYERPATH% 14 14 start /b jplayer.exe %* -
trunk/jahplayer/bootstrap.py
r868 r904 10 10 # to use the preinstalled openlibraries python bindings 11 11 if platform.system() == "Windows" or platform.system() == 'Microsoft': 12 sys.path.append(os.environ['PYTHONPATH']) 12 #sys.path.append(os.path.join(os.getcwd(), "..", "openlibraries", "python")) 13 #sys.path.append(os.environ['PYTHONPATH']) 14 pass 13 15 14 16 # Initialise the dynamic linking functionality - note that the ubuntu amd64 … … 37 39 38 40 openpluginlib.init( plugin_paths ) 41 elif platform.system() == "Windows" or platform.system() == 'Microsoft': 42 olibspath = os.path.join(os.getcwd(), "..", "openlibraries") 43 openpluginlib.init( os.path.join( olibspath, "plugins", "release" ), 44 os.path.join( olibspath, "kernels" ), 45 os.path.join( olibspath, "shaders" )) 39 46 else: 40 47 openpluginlib.init() -
trunk/jahplayer/control.py
r890 r904 239 239 size = int( str( media.asset.find( "frames" ).second ) ) 240 240 self.ignore_points = True 241 self.length_prop.set( size - 1)241 self.length_prop.set( size ) 242 242 self.in_point.set( media.in_point ) 243 243 self.out_point.set( media.out_point - 1 ) -
trunk/jahplayer/footer.py
r868 r904 126 126 elif platform.system() == "Windows" or platform.system() == 'Microsoft': 127 127 subprocess.Popen( [ os.environ[ "JAHTOOLSPATH" ] + "\encoder\encoder.exe", pickle_file ], env=os.environ ) 128 #subprocess.Popen( [ 'c:/python25/python.exe', utilities.get_absolute_path(os.path.join( os.environ['JAH_DEVEL_ROOT'], 'jahtools/encoder/encoder.py')), pickle_file ], env=os.environ ) 128 129 else: 129 130 print "launching: %s" % ( "python %s" % ( utilities.get_absolute_path( "encoder.py" ) ) ) -
trunk/jahplayer/setup.py
r654 r904 22 22 "py2exe": 23 23 { 24 'dll_excludes': [ 'openassetlib_al-vc71-r-0_4_1.dll', 25 'openimagelib_il-vc71-r-0_4_1.dll', 26 'openmedialib_ml-vc71-r-0_4_1.dll', 27 'openpluginlib_pl-vc71-r-0_4_1.dll', 28 'openobjectlib_sg-vc80-r-0_4_1.dll', 29 'msvcr80.dll', 30 'msvcp80.dll'], 24 'dll_excludes': [ 'openassetlib_al-vc80-r-0_4_1.dll', 25 'openimagelib_il-vc80-r-0_4_1.dll', 26 'openmedialib_ml-vc80-r-0_4_1.dll', 27 'openpluginlib_pl-vc80-r-0_4_1.dll', 28 'openobjectlib_sg-vc80-r-0_4_1.dll', 29 'boost_python-vc80-mt-1_33_1.dll', 30 'Half_dll.dll', 31 'Iex_dll.dll', 32 'IlmImf_dll.dll', 33 'IlmThread_dll.dll', 34 'glew32.dll', 35 'msvcr71.dll', 36 'msvcp80.dll', 37 'MSVCR80.dll', 38 'qt-mt336.dll' ], 31 39 'excludes': ["openassetlib","openimagelib","openmedialib","openpluginlib"] 32 40 } 33 41 }, 34 42 name='jahPlayer', 35 version = "0.2. 2",43 version = "0.2.3", 36 44 description='jahPlayer', 37 45 url='http://www.jahshaka.org/', … … 45 53 ) 46 54 47 shutil.copy("C:/Program Files/Microsoft Visual Studio 8/VC/redist/x86/Microsoft.VC80.CRT/msvcr80.dll", os.path.join(os.getcwd(), "dist", "msvcr80.dll"))48 shutil.copy("C:/Program Files/Microsoft Visual Studio 8/VC/redist/x86/Microsoft.VC80.CRT/msvcp80.dll", os.path.join(os.getcwd(), "dist", "msvcp80.dll"))49 50 55 dir = os.path.join(os.getcwd(), "dist", "styles") 51 56 os.mkdir(dir) -
trunk/jahplayer/viewport.py
r620 r904 9 9 import utilities 10 10 import re 11 import os 12 import os.path 11 13 12 14 # … … 339 341 result = jahwidgets.create_media( uri ) 340 342 sequence = str( media.asset.find( "sequence" ).first ) != "" 341 if result is not None and result.open( ): 342 result.reel = media.reel 343 result.asset = media.asset 344 result.zoom_active = True 345 #result.reel.set_sequence( result ) 346 if active: 347 self.player.show_all_frames = sequence or result.length <= 1 348 speed = 1 349 if result.length <= 1: 350 speed = 0 343 if result is not None: 344 try: 345 media_location = media.asset.find( "location" ).second 346 if not os.path.exists( media_location ) and ( media_location.find("/sequence:") == -1 ): 347 #if not os.path.exists( media.asset.find( "location" ).second ): 348 result = jahwidgets.create_media( utilities.get_absolute_path( "missingmedia.png" ) ) 349 result.reel = media.reel 350 result.asset = media.asset 351 result.zoom_active = True 352 self.player.show_all_frames = True 353 self.state.prepare_media( result ) 354 self.player.play( result, 0 ) 355 elif result.open( ): 356 result.reel = media.reel 357 result.asset = media.asset 358 result.zoom_active = True 359 #result.reel.set_sequence( result ) 360 #if active: 361 self.player.show_all_frames = sequence or result.length <= 1 362 speed = 1 363 if result.length <= 1: 364 speed = 0 365 self.state.prepare_media( result ) 366 self.player.play( result, speed ) 367 else: 368 return previous 369 except: 370 result = jahwidgets.create_media( utilities.get_absolute_path( "missingmedia.png" ) ) 371 result.reel = media.reel 372 result.asset = media.asset 373 result.zoom_active = True 374 self.player.show_all_frames = True 351 375 self.state.prepare_media( result ) 352 self.player.play( result, speed)376 self.player.play( result, 0 ) 353 377 else: 354 378 return previous -
trunk/jahtools/encoder/bootstrap.py
r714 r904 9 9 # This is required for the executable generated from py2exe 10 10 # to use the preinstalled openlibraries python bindings 11 if platform.system() == "Windows": 12 sys.path.append(os.environ['PYTHONPATH']) 11 if platform.system() == "Windows" or platform.system() == 'Microsoft': 12 #sys.path.append(os.path.join(os.getcwd(), "..", "openlibraries", "python")) 13 #sys.path.append(os.environ['PYTHONPATH']) 14 pass 13 15 14 16 # Initialise the dynamic linking functionality - note that the ubuntu amd64 … … 37 39 38 40 openpluginlib.init( plugin_paths ) 41 elif platform.system() == "Windows" or platform.system() == 'Microsoft': 42 olibspath = os.path.join(os.getcwd(), "..", "openlibraries") 43 openpluginlib.init( os.path.join( olibspath, "plugins", "release" ), 44 os.path.join( olibspath, "kernels" ), 45 os.path.join( olibspath, "shaders" )) 39 46 else: 40 47 openpluginlib.init() -
trunk/jahtools/encoder/setup.py
r654 r904 22 22 "py2exe": 23 23 { 24 'dll_excludes': [ 'openassetlib_al-vc71-r-0_4_1.dll', 25 'openimagelib_il-vc71-r-0_4_1.dll', 26 'openmedialib_ml-vc71-r-0_4_1.dll', 27 'openpluginlib_pl-vc71-r-0_4_1.dll', 28 'openobjectlib_sg-vc80-r-0_4_1.dll', 29 'msvcr80.dll', 30 'msvcp80.dll'], 31 'excludes': ["openassetlib","openimagelib","openmedialib","openpluginlib"] 24 'dll_excludes': [ 'openassetlib_al-vc80-r-0_4_1.dll', 25 'openimagelib_il-vc80-r-0_4_1.dll', 26 'openmedialib_ml-vc80-r-0_4_1.dll', 27 'openpluginlib_pl-vc80-r-0_4_1.dll', 28 'openobjectlib_sg-vc80-r-0_4_1.dll', 29 'boost_python-vc80-mt-1_33_1.dll', 30 'Half_dll.dll', 31 'Iex_dll.dll', 32 'IlmImf_dll.dll', 33 'IlmThread_dll.dll', 34