From: Jeffrey Altman <jaltman@mit.edu>
Date: Wed, 23 Jun 2004 09:30:19 +0000 (+0000)
Subject: wix-use-loopback-dll-20040622
X-Git-Tag: openafs-devel-1_3_65~19
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=5d133b13a78f79fc9eb4ba6a3f905b644ab7795e;p=packages%2Fo%2Fopenafs.git

wix-use-loopback-dll-20040622


alter wix installer to use msi interface to afsloopback.dll instead
of instloop.exe
---

diff --git a/src/WINNT/install/wix/openafs.wxs b/src/WINNT/install/wix/openafs.wxs
index 03560a77d..541090305 100644
--- a/src/WINNT/install/wix/openafs.wxs
+++ b/src/WINNT/install/wix/openafs.wxs
@@ -61,32 +61,30 @@
         <Binary
          Id="BIN_Instloop"
          src="$(var.MediaBinDir)instloop.exe"/>
+        <Binary
+         Id="BIN_afsLoopback"
+         src="$(var.MediaBinDir)afsloopback.dll"/>
         <Binary
 		 Id="BIN_afsCustom"
 		 src="$(var.MediaDllDir)afscustom.dll"/>
         <CustomAction
          Id="InstallLoopback"
-         BinaryKey="BIN_Instloop"
-         ExeCommand="-i"
-         Execute="deferred"
-         Impersonate="no"
+         BinaryKey="BIN_afsLoopback"
+         DllEntry="installLoopbackMSI"
+         Execute="deferred" 
          />
 	<?ifdef RemoveLoopback?>
         <CustomAction
          Id="RemoveLoopback"
-         BinaryKey="BIN_Instloop"
-         ExeCommand="-u"
-         Execute="deferred"
-         Return="ignore"
-         Impersonate="no"
+         BinaryKey="BIN_afsLoopback"
+         DllEntry="uninstallLoopbackMSI"
+         Execute="deferred" 
          />
         <CustomAction
          Id="RollbackLoopback"
-         BinaryKey="BIN_Instloop"
-         ExeCommand="-u"
-         Execute="rollback"
-         Return="ignore"
-         Impersonate="no"
+         BinaryKey="BIN_afsLoopback"
+         DllEntry="uninstallLoopbackMSI"
+         Execute="deferred" 
          />
 	<?endif?>
         <CustomAction