livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-13025; Ignore the embeeded version info in SLVoice.exe during install, instead make everything dependent on firestorm-bin.exe. 

- Package Leap.dll conditionally.
meow-7.2.2
Nicky 2014-03-06 13:02:23 +01:00
parent e2d40d4e96
commit 8c2c0a05c9
2 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/installers/windows_x64/build.bat
View File

@ -21,6 +21,14 @@ set HGCHANGE=%9
set PATH=%PATH%;%1\..\..\packages\bin\wix
if exist %VIEWER_BUILDDIR%\Leap.dll (
set PACKAGE_LEAP=PACKAGE_LEAP=1
echo Packaging Leap.dll
) else (
set PACKAGE_LEAP=PACKAGE_LEAP=0
echo Not Packaging Leap.dll
)
heat dir %VIEWER_BUILDDIR%\character -gg -cg fs_character -var var.BUILDDIR -dr INSTALLDIR -out character.wxs
heat dir %VIEWER_BUILDDIR%\fonts -gg -cg fs_fonts -var var.BUILDDIR -dr INSTALLDIR -out fonts.wxs
heat dir %VIEWER_BUILDDIR%\fs_resources -gg -cg fs_fsres -var var.BUILDDIR -dr INSTALLDIR -out fs_resources.wxs
@ -33,7 +41,7 @@ candle -dBUILDDIR=%VIEWER_BUILDDIR%\fonts fonts.wxs
candle -dBUILDDIR=%VIEWER_BUILDDIR%\fs_resources fs_resources.wxs
candle -dPLUGIN_SOURCEDIR=%PLUGIN_SOURCEDIR% %~dp0\llplugin.wxs
candle -dPROGRAM_FILE=%PROGRAM_FILE% -dMAJOR=%MAJOR% -dMINOR=%MINOR% -dHGCHANGE=%HGCHANGE% -dBUILDDIR=%VIEWER_BUILDDIR%\ -dWIX_SOURCEDIR=%~dp0 %~dp0\firestorm.wxs
candle -dPROGRAM_FILE=%PROGRAM_FILE% -dMAJOR=%MAJOR% -dMINOR=%MINOR% -dHGCHANGE=%HGCHANGE% -dBUILDDIR=%VIEWER_BUILDDIR%\ -dWIX_SOURCEDIR=%~dp0 -d%PACKAGE_LEAP% %~dp0\firestorm.wxs
candle -dPROGRAM_FILE=%PROGRAM_FILE% -dPROGRAM_VERSION=%PROGRAM_VERSION% -dCHANNEL_NAME=%CHANNEL_NAME% -dSETTINGS_FILE=%SETTINGS_FILE% -dPROGRAM_NAME=%PROGRAM_NAME% -dBUILDDIR=%VIEWER_BUILDDIR%\ %~dp0\registry.wxs
light -sval -ext WixUIExtension -cultures:en-us -out %VIEWER_BUILDDIR%\%OUTPUT_FILE%.msi firestorm.wixobj character.wixobj fonts.wixobj fs_resources.wixobj llplugin.wixobj registry.wixobj

55
indra/newview/installers/windows_x64/firestorm.wxs
View File

@ -32,40 +32,45 @@
<Directory Id="INSTALLDIR" Name="Firestorm">
<Component Id="firestorm" Guid="{2CDF0673-595F-4fb4-B38A-C338BF9D4DF1}">
<File Source="$(var.BUILDDIR)/$(var.PROGRAM_FILE)" KeyPath="yes"/>
<File Source="$(var.BUILDDIR)/win_crash_logger.exe" />
<File Source="$(var.BUILDDIR)/libcollada14dom22.dll" />
<File Source="$(var.BUILDDIR)/fmodex64.dll" />
<File Source="$(var.BUILDDIR)/glod.dll" />
<File Source="$(var.BUILDDIR)/Leap.dll" />
<File Source="$(var.BUILDDIR)/libapr-1.dll" />
<File Source="$(var.BUILDDIR)/libapriconv-1.dll" />
<File Source="$(var.BUILDDIR)/libaprutil-1.dll" />
<File Source="$(var.BUILDDIR)/libeay32.dll" />
<File Source="$(var.BUILDDIR)/libhunspell.dll" />
<File Source="$(var.BUILDDIR)/growl++.dll" />
<File Source="$(var.BUILDDIR)/growl.dll" />
<File Source="$(var.BUILDDIR)/openjpeg.dll" />
<File Source="$(var.BUILDDIR)/ssleay32.dll" />
<File Id="firestorm" Source="$(var.BUILDDIR)/$(var.PROGRAM_FILE)" KeyPath="yes"/>
<File Source="$(var.BUILDDIR)/win_crash_logger.exe" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/libcollada14dom22.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/fmodex64.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/glod.dll" CompanionFile="firestorm" />
<?if $(var.PACKAGE_LEAP)=1?>
<File Source="$(var.BUILDDIR)/Leap.dll" CompanionFile="firestorm" />
<?endif?>
<File Source="$(var.BUILDDIR)/libapr-1.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/libapriconv-1.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/libaprutil-1.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/libeay32.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/libhunspell.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/growl++.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/growl.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/openjpeg.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/ssleay32.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/featuretable.txt" />
<File Source="$(var.BUILDDIR)/featuretable_xp.txt" />
<File Source="$(var.BUILDDIR)/gpu_table.txt" />
<File Source="$(var.BUILDDIR)/licenses.txt" />
<File Source="$(var.BUILDDIR)/VivoxAUP.txt" />
<File Source="$(var.BUILDDIR)/skins.cab" />
<File Source="$(var.BUILDDIR)/skins.cabdir" />
<File Source="$(var.BUILDDIR)/app_settings.cab" />
<File Source="$(var.BUILDDIR)/app_settings.cabdir" />
</Component>
<Component Id="slvoice" Guid="{6BF56CA8-0D48-4ea8-B3E8-CD38B7C502E6}">
<File Source="$(var.BUILDDIR)/slvoice.exe" KeyPath="yes" />
<File Source="$(var.BUILDDIR)/libsndfile-1.dll" />
<File Source="$(var.BUILDDIR)/ortp.dll" />
<File Source="$(var.BUILDDIR)/vivoxoal.dll" />
<File Source="$(var.BUILDDIR)/vivoxplatform.dll" />
<File Source="$(var.BUILDDIR)/vivoxsdk.dll" />
<File Source="$(var.BUILDDIR)/zlib1.dll" />
<File Source="$(var.BUILDDIR)/slvoice.exe" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/libsndfile-1.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/ortp.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/vivoxoal.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/vivoxplatform.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/vivoxsdk.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/zlib1.dll" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/ca-bundle.crt" />
</Component>
@ -95,8 +100,6 @@
<ComponentRef Id="ApplicationShortcut" />
<ComponentRef Id="ApplicationShortcut_Desktop" />
<ComponentRef Id="slvoice" />
<ComponentRef Id="llplugin_exe" />
<ComponentRef Id="llplugin_libs" />
<ComponentRef Id="llplugin_dir_codec_libs" />