Added MsysGit bundle to WiX installation
This commit is contained in:
parent
e5a4863f30
commit
3d9364209b
|
@ -8,9 +8,16 @@
|
|||
Comments='This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.' Manufacturer='sparkleshare.org'
|
||||
InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
|
||||
|
||||
<Media Id='1' Cabinet='SparkleShare.cab' EmbedCab='yes' DiskPrompt='Bundle CAB' />
|
||||
<Media Id='1' Cabinet='SparkleShare.cab' EmbedCab='yes' DiskPrompt='SparkleShare CAB' />
|
||||
<Media Id='2' Cabinet='MsysGit.cab' EmbedCab='no' DiskPrompt='MsysGit portable CAB' />
|
||||
<Property Id='DiskPrompt' Value="sparkleshare.org Bundle CAB Installation" />
|
||||
|
||||
<Property Id="MSYSGIT_CAB_EXISTS">
|
||||
<DirectorySearch Id="db2CabFile" Path="[SourceDir]">
|
||||
<FileSearch Name="MsysGit.cab"/>
|
||||
</DirectorySearch>
|
||||
</Property>
|
||||
|
||||
<Directory Id='TARGETDIR' Name='SourceDir'>
|
||||
|
||||
<Directory Id='ProgramFilesFolder' Name='PFiles'>
|
||||
|
@ -29,17 +36,27 @@
|
|||
<File Id='debug.log' Name='debug.log' Source='bin/debug.log' DiskId='1' />
|
||||
<File Id='libcef.dll' Name='libcef.dll' Source='bin/libcef.dll' DiskId='1' />
|
||||
</Component>
|
||||
<Directory Id='MSYSGIT_DIR' DiskId='2' Name='msysgit'>
|
||||
</Directory>
|
||||
</Directory>
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
||||
</Directory>
|
||||
|
||||
<Feature Id='Complete' Level='1'>
|
||||
|
||||
|
||||
<Feature Id='SparkleShareFeature' Title='SparkleShare 0.2' Description='This is the SparkleShare executables.' Level='1' AllowAdvertise='no'>
|
||||
<ComponentRef Id='MainExecutable' />
|
||||
</Feature>
|
||||
<Feature Id='MsysGitFeature' Title='MsysGit' Description='MsysGit is the storage and synchronization engine used with SparkleShare. If you already have MsysGit installed, you can uncheck this feature to save disk space.' Level='0' Absent='allow' AllowAdvertise='no'>
|
||||
<ComponentGroupRef Id='msysGitComponentGroup' />
|
||||
<Condition Level='1'>
|
||||
MSYSGIT_CAB_EXISTS
|
||||
</Condition>
|
||||
</Feature>
|
||||
|
||||
<UIRef Id="WixUI_InstallDir" />
|
||||
<UIRef Id="WixUI_FeatureTree" />
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
|
||||
<WixVariable Id="WixUILicenseRtf" Value="LICENSE.rtf" />
|
||||
</Product>
|
||||
|
|
|
@ -4,12 +4,14 @@ set msbuild="%WinDirNet%\v3.5\msbuild.exe"
|
|||
if not exist %msbuild% set msbuild="%WinDirNet%\v4.0.30319\msbuild.exe"
|
||||
set wixBinDir=%WIX%\bin
|
||||
|
||||
%msbuild% /t:Rebuild /p:Configuration=Release /p:Platform="Any CPU" %~dp0\SparkleShare.sln
|
||||
rem %msbuild% /t:Rebuild /p:Configuration=Release /p:Platform="Any CPU" %~dp0\SparkleShare.sln
|
||||
|
||||
if "%1"=="installer" (
|
||||
if exist "%wixBinDir%" (
|
||||
"%wixBinDir%\heat.exe" dir "%git_install_root%." -cg msysGitComponentGroup -gg -scom -sreg -sfrag -srd -dr MSYSGIT_DIR -t addmedia.xlst -var wix.msysgitpath -o msysgit.wxs
|
||||
"%wixBinDir%\candle" "%~dp0\SparkleShare.wxs"
|
||||
"%wixBinDir%\light" -ext WixUIExtension Sparkleshare.wixobj
|
||||
"%wixBinDir%\candle" "msysgit.wxs
|
||||
"%wixBinDir%\light" -ext WixUIExtension Sparkleshare.wixobj msysgit.wixobj -dmsysgitpath=%git_install_root% -o SparkleShare.msi
|
||||
echo SparkleShare.msi created.
|
||||
|
||||
) else (
|
||||
|
|
Loading…
Reference in a new issue