Changeset 923

Show
Ignore:
Timestamp:
11/18/07 15:20:43 (1 year ago)
Author:
glslang
Message:

+ build update

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/installer/jahplayer.nsi

    r921 r923  
    116116SectionEnd 
    117117 
    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"' 
     118Section "MSXML6 SP1" 
     119 
     120  SectionIn 1 
     121  SetOutPath $INSTDIR 
     122 
     123  SetOverwrite on 
     124  SetShellVarContext all 
     125 
     126  SetDetailsPrint textonly 
     127  DetailPrint "Installing MSXML6 SP1..." 
     128  SetDetailsPrint listonly 
     129 
     130  SetOutPath $INSTDIR 
     131  File "..\installer\msxml6_x86.msi" 
     132 
     133  ExecWait 'MsiExec.exe /qn /i "$INSTDIR\msxml6.msi /qb"' 
    136134   
    137135;  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "msxml2" "" 
    138136 
    139 ;  SetDetailsPrint both 
    140  
    141 ;SectionEnd 
     137  SetDetailsPrint both 
     138 
     139SectionEnd 
    142140 
    143141Section "OpenAL" openal