From 1048e9fd1c748838b51697ee228698fe92a9a966 Mon Sep 17 00:00:00 2001
From: serras <trupill@gmail.com>
Date: Sun, 22 Jan 2012 19:59:46 +0100
Subject: [PATCH] Do not include SmartIrc in installer Improve installer
 building

---
 SparkleShare/Windows/SparkleShare.wxs | 2 --
 SparkleShare/Windows/build.cmd        | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/SparkleShare/Windows/SparkleShare.wxs b/SparkleShare/Windows/SparkleShare.wxs
index 61423a1b..8a2ce630 100644
--- a/SparkleShare/Windows/SparkleShare.wxs
+++ b/SparkleShare/Windows/SparkleShare.wxs
@@ -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' />
diff --git a/SparkleShare/Windows/build.cmd b/SparkleShare/Windows/build.cmd
index 6c2a4db7..857498cd 100644
--- a/SparkleShare/Windows/build.cmd
+++ b/SparkleShare/Windows/build.cmd
@@ -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/