Changeset 905

Show
Ignore:
Timestamp:
09/27/07 05:20:35 (1 year ago)
Author:
nonhebel
Message:

Changed installer back to using common openlibraries

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/installer/jahplayer.nsi

    r904 r905  
    44 
    55!ifndef VERSION 
    6   !define /date VERSION "%Y%m%d" 
     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 
    712!endif 
    813 
    … …  
    110115 
    111116  SetOutPath $INSTDIR 
     117  ;File "$%VSINSTALLDIR%\SDK\v2.0\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe" 
    112118  File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe" 
    113   ;File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\product.xml" 
    114119  ExecWait '"$INSTDIR\vcredist_x86.exe /q:a"' 
    115120 
    … …  
    163168SectionEnd 
    164169 
    165 Section "OpenLibraries" olibs 
     170Section "OpenLibraries" olib 
     171 
     172  SectionIn 1 
     173  SetOutPath $INSTDIR 
     174 
     175  SetOverwrite on 
     176  SetShellVarContext all 
    166177 
    167178  SetDetailsPrint textonly 
    … …  
    169180  SetDetailsPrint listonly 
    170181 
    171   SectionIn 1 RO 
    172   SetOutPath $INSTDIR 
    173  
    174   SetOverwrite on 
    175  
    176   SetOutPath $INSTDIR\openlibraries\bin 
    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" 
    182  
    183   ; dependencies 
    184   File "C:\Program Files\FFmpeg\lib\avcodec-51.dll" 
    185   File "C:\Program Files\FFmpeg\lib\avformat-51.dll" 
    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" 
    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" 
    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   File "C:\openexr-1.4.0-vs2005\bin\Iex_dll.dll" 
    194   File "C:\openexr-1.4.0-vs2005\bin\Imath_dll_d.dll" 
    195   File "C:\openexr-1.4.0-vs2005\bin\Imath_dll.dll" 
    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" 
    199   File "C:\openexr-1.4.0-vs2005\bin\IlmThread_dll.dll" 
    200   File "C:\SDL-1.2.12\lib\SDL.dll" 
    201   File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll" 
    202   File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll" 
    203   File "C:\windows\system32\msvcp71.dll" 
    204   File "C:\windows\system32\msvcr71.dll" 
    205   File "C:\windows\system32\glew32.dll" 
    206   File "C:\windows\system32\glut32.dll" 
    207   File "c:\windows\system32\python25.dll" 
    208   File "C:\Qt\3.3.6\bin\qt-mt336.dll" 
    209   File "c:\boost\lib\boost_python-vc80-mt-1_34_1.dll" 
    210  
    211   ; Python 
    212   SetOutPath $INSTDIR\openlibraries\python 
    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" 
    217    
    218   SetOutPath $INSTDIR\openlibraries\plugins\release 
    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" 
    269    
    270   SetOutPath $INSTDIR\openlibraries\kernels 
    271   File "$%OLIBS_DEVEL_ROOT%\effects\kernels\sepia.gpu_kernel" 
    272    
    273   SetOutPath $INSTDIR\openlibraries\shaders 
    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" 
    288   
     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 
    289186  SetDetailsPrint both 
    290187 
    … …  
    305202  SetOutPath $INSTDIR\jahPlayer 
    306203  File /r "..\jahPlayer\dist\*" 
    307   File "run_jahplayer.cmd" 
    308204 
    309205  SetOutPath $INSTDIR\jahTools 
    … …  
    313209  SetDetailsPrint both 
    314210 
    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  
    319211  SetOutPath $INSTDIR\jahPlayer 
    320212  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 
     213  CreateShortCut "$SMPROGRAMS\jahPlayer\jahPlayer.lnk" "$INSTDIR\jahPlayer\jahPlayer.exe" 
     214  CreateShortCut "$DESKTOP\jahPlayer.lnk" "$INSTDIR\jahPlayer\jahPlayer.exe" 
    323215 
    324216  SetOutPath $INSTDIR