From 4ccec42125f3dd6e0c13077a220544cd96469f09 Mon Sep 17 00:00:00 2001
From: serras <trupill@gmail.com>
Date: Mon, 9 Jan 2012 16:42:05 +0100
Subject: [PATCH] Add po and plugins folders to setup

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

diff --git a/SparkleShare/Windows/SparkleShare.wxs b/SparkleShare/Windows/SparkleShare.wxs
index dc00effc..61423a1b 100644
--- a/SparkleShare/Windows/SparkleShare.wxs
+++ b/SparkleShare/Windows/SparkleShare.wxs
@@ -30,6 +30,10 @@
             </Component>
             <Directory Id='MSYSGIT_DIR' Name='msysgit'>
             </Directory>
+            <Directory Id='PO_DIR' Name='po'>
+            </Directory>
+            <Directory Id='PLUGINS_DIR' Name='plugins'>
+            </Directory>
           </Directory>
         </Directory>
       </Directory>
@@ -56,6 +60,8 @@
       <ComponentRef Id="ApplicationShortcut" />
       <ComponentRef Id="Autostart" />
       <ComponentGroupRef Id='msysGitComponentGroup' />
+      <ComponentGroupRef Id='poComponentGroup' />
+      <ComponentGroupRef Id='pluginsComponentGroup' />
     </Feature>
 
     <UI>
@@ -63,7 +69,7 @@
       <Publish Dialog="ExitDialog"
                Control="Finish"
                Event="DoAction"
-               Value="LaunchApplication" />
+               Value="LaunchApplication">1</Publish>
     </UI>
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
     <WixVariable Id="WixUILicenseRtf" Value="..\..\LICENSE.rtf" />
diff --git a/SparkleShare/Windows/build.cmd b/SparkleShare/Windows/build.cmd
index 7831694b..6c2a4db7 100644
--- a/SparkleShare/Windows/build.cmd
+++ b/SparkleShare/Windows/build.cmd
@@ -17,9 +17,13 @@ set wixBinDir=%WIX%\bin
 if "%1"=="installer" (
 	if exist "%wixBinDir%" (
 		"%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
 		"%wixBinDir%\candle" "%~dp0\SparkleShare.wxs" -ext WixUIExtension -ext WixUtilExtension
 		"%wixBinDir%\candle" "%~dp0\msysgit.wxs" -ext WixUIExtension -ext WixUtilExtension
-		"%wixBinDir%\light" -ext WixUIExtension -ext WixUtilExtension Sparkleshare.wixobj msysgit.wixobj -droot="%~dp0\..\.." -dmsysgitpath="%~dp0\..\..\bin\msysgit" -o SparkleShare.msi 
+		"%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.
 	) else (
 		echo Not building installer ^(could not find wix, Windows Installer XML toolset^)