beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Do not include SmartIrc in installer

Browse source 
Improve installer building
This commit is contained in:
serras 2012-01-22 19:59:46 +01:00
parent 03fe4ae4b6
commit 1048e9fd1c
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SparkleShare/Windows/SparkleShare.wxs
View file

@ -17,8 +17,6 @@
<Directory Id='INSTALLDIR' Name='SparkleShare'>
<Component Id='MainExecutable' Guid='0DA692D5-4DBE-4251-9F62-E7C1A76F10E1'>
<File Id='CefSharp.dll' Name='CefSharp.dll' Source='!(wix.root)\bin\CefSharp.dll' DiskId='1' />
<File Id='Meebey.SmartIrc4net.dll' Name='Meebey.SmartIrc4net.dll' Source='!(wix.root)\bin\Meebey.SmartIrc4net.dll' DiskId='1' />
<File Id='Meebey.SmartIrc4net.xml' Name='Meebey.SmartIrc4net.xml' Source='!(wix.root)\bin\Meebey.SmartIrc4net.xml' DiskId='1' />
<File Id='Gettext.Cs.dll' Name='Gettext.Cs.dll' Source='!(wix.root)\bin\Gettext.Cs.dll' DiskId='1' />
<File Id='SparkleLib.dll' Name='SparkleLib.dll' Source='!(wix.root)\bin\SparkleLib.dll' DiskId='1' />
<File Id='SparkleShare.exe' Name='SparkleShare.exe' Source='!(wix.root)\bin\SparkleShare.exe' KeyPath='yes' DiskId='1' />

3
SparkleShare/Windows/build.cmd
View file

@ -16,6 +16,7 @@ set wixBinDir=%WIX%\bin
if "%1"=="installer" (
if exist "%wixBinDir%" (
if exist "%~dp0\SparkleShare.msi" del "%~dp0\SparkleShare.msi"
"%wixBinDir%\heat.exe" dir "%~dp0\..\..\bin\msysgit" -cg msysGitComponentGroup -gg -scom -sreg -sfrag -srd -dr MSYSGIT_DIR -var wix.msysgitpath -o msysgit.wxs
"%wixBinDir%\heat.exe" dir "%~dp0\..\..\bin\po" -cg poComponentGroup -gg -scom -sreg -sfrag -srd -dr PO_DIR -var wix.podir -o po.wxs
"%wixBinDir%\heat.exe" dir "%~dp0\..\..\bin\plugins" -cg pluginsComponentGroup -gg -scom -sreg -sfrag -srd -dr PLUGINS_DIR -var wix.pluginsdir -o plugins.wxs
@ -24,7 +25,7 @@ if "%1"=="installer" (
"%wixBinDir%\candle" "%~dp0\po.wxs" -ext WixUIExtension -ext WixUtilExtension
"%wixBinDir%\candle" "%~dp0\plugins.wxs" -ext WixUIExtension -ext WixUtilExtension
"%wixBinDir%\light" -ext WixUIExtension -ext WixUtilExtension Sparkleshare.wixobj msysgit.wixobj po.wixobj plugins.wixobj -droot="%~dp0\..\.." -dmsysgitpath="%~dp0\..\..\bin\msysgit" -dpodir="%~dp0\..\..\bin\po" -dpluginsdir="%~dp0\..\..\bin\plugins" -o SparkleShare.msi
echo SparkleShare.msi created.
if exist "%~dp0\SparkleShare.msi" echo SparkleShare.msi created.
) else (
echo Not building installer ^(could not find wix, Windows Installer XML toolset^)
echo wix is available at http://wix.sourceforge.net/