From 1136d66036a5999757551a3a131dcff65e276602 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 27 May 2009 14:55:58 +0000
Subject: [PATCH 1/1] DEVEL15-windows-install-20090527

LICENSE MIT

Install ptclient.exe and pt_util.exe as part of the server installation


(cherry picked from commit d28e5fd04def989dcfb98ccd2b99ef44f5667167)
---
 src/WINNT/install/NSIS/OpenAFS.nsi | 6 +++++-
 src/WINNT/install/wix/feature.wxi  | 2 ++
 src/WINNT/install/wix/files.wxi    | 6 ++++++
 src/WINNT/install/wix/platform.wxi | 4 ++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi
index 692a5a5..aea4201 100644
--- a/src/WINNT/install/NSIS/OpenAFS.nsi
+++ b/src/WINNT/install/NSIS/OpenAFS.nsi
@@ -558,7 +558,7 @@ Section "!AFS Client" secClient
   !insertmacro ReplaceDLL "${AFS_CLIENT_BUILDDIR}\afsd_service.exe" "$INSTDIR\Client\Program\afsd_service.exe" "$INSTDIR"
   File "${AFS_CLIENT_BUILDDIR}\symlink.exe"
   File "${AFS_DESTDIR}\bin\kpasswd.exe"
-  File "${AFS_SERVER_BUILDDIR}\pts.exe"
+  File "${AFS_DESTDIR}\bin\pts.exe"
   File "${AFS_SERVER_BUILDDIR}\bos.exe"
   File "${AFS_SERVER_BUILDDIR}\kas.exe"
   File "${AFS_SERVER_BUILDDIR}\vos.exe"
@@ -870,6 +870,8 @@ skipCheck:
   File "${AFS_SERVER_BUILDDIR}\vlserver.exe"
   File "${AFS_SERVER_BUILDDIR}\volinfo.exe"
   File "${AFS_SERVER_BUILDDIR}\volserver.exe"
+  File "${AFS_DESTDIR}\bin\ptclient.exe"
+  File "${AFS_DESTDIR}\bin\pt_util.exe"
  
  ;AFS Server common files
  SetOutPath "$INSTDIR\Common"
@@ -1209,6 +1211,8 @@ DoServer:
   File "${AFS_ETC_BUILDDIR}\fms.pdb"
   File "${AFS_SERVER_BUILDDIR}\kaserver.pdb"
   File "${AFS_SERVER_BUILDDIR}\ptserver.pdb"
+  File "${AFS_DESTDIR}\bin\ptclient.pdb"
+  File "${AFS_DESTDIR}\bin\pt_util.pdb"
   File "${AFS_SERVER_BUILDDIR}\salvager.pdb"
   File "${AFS_SERVER_BUILDDIR}\upclient.pdb"
   File "${AFS_SERVER_BUILDDIR}\upserver.pdb"
diff --git a/src/WINNT/install/wix/feature.wxi b/src/WINNT/install/wix/feature.wxi
index d502ba5..da42ec2 100644
--- a/src/WINNT/install/wix/feature.wxi
+++ b/src/WINNT/install/wix/feature.wxi
@@ -156,6 +156,8 @@
                 <ComponentRef Id="cmf_butc_EXE" />
                 <ComponentRef Id="cmf_kaserver_EXE" />
                 <ComponentRef Id="cmf_ptserver_EXE" />
+                <ComponentRef Id="cmf_ptclient_EXE" />
+                <ComponentRef Id="cmf_pt_util_EXE" />
                 <ComponentRef Id="cmf_salvager_EXE" />
                 <ComponentRef Id="cmf_upclient_EXE" />
                 <ComponentRef Id="cmf_upserver_EXE" />
diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index 338015b..db1288e 100644
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -1328,6 +1328,12 @@
                             <Component Win64="$(var.Win64)" Id="cmf_ptserver_EXE" Guid="$(var.cmf_ptserver_EXE_guid)">
                                 <File Id="fileptserver_EXE" Name="ptser.exe" LongName="ptserver.exe" KeyPath="yes" DiskId="1" />
                             </Component>
+                             <Component Win64="$(var.Win64)" Id="cmf_ptclient_EXE" Guid="$(var.cmf_ptclient_EXE_guid)">
+                                <File Id="fileptclient_EXE" Name="ptclient.exe" LongName="ptclient.exe" KeyPath="yes" DiskId="1" src="$(var.BinDir)\ptclient.exe" />
+                            </Component>
+                             <Component Win64="$(var.Win64)" Id="cmf_pt_util_EXE" Guid="$(var.cmf_pt_util_EXE_guid)">
+                                <File Id="filept_util_EXE" Name="pt_util.exe" LongName="pt_util.exe" KeyPath="yes" DiskId="1" src="$(var.BinDir)\pt_util.exe" />
+                            </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_salvager_EXE" Guid="$(var.cmf_salvager_EXE_guid)">
                                 <File Id="filesalvager_EXE" Name="salva.exe" LongName="salvager.exe" KeyPath="yes" DiskId="1" />
                             </Component>
diff --git a/src/WINNT/install/wix/platform.wxi b/src/WINNT/install/wix/platform.wxi
index 86e9bf4..43bbefa 100644
--- a/src/WINNT/install/wix/platform.wxi
+++ b/src/WINNT/install/wix/platform.wxi
@@ -95,6 +95,8 @@
 	<?define cmf_butc_EXE_guid="2E03B583-AAEE-4674-AA53-98D6596C6668"?>
 	<?define cmf_kaserver_EXE_guid="29D8D9DC-5C12-48E4-ACEF-797380EFE794"?>
 	<?define cmf_ptserver_EXE_guid="78199FF4-33AF-4A7E-9316-4E90522EA93F"?>
+	<?define cmf_ptclient_EXE_guid="B5C877B4-65DD-46DE-B20A-2713EB444333"?>
+	<?define cmf_pt_util_EXE_guid="62A501E3-79AC-4351-BF48-AA0E506D6997"?>
 	<?define cmf_salvager_EXE_guid="01C16D4F-ABCD-476D-B678-BCF87F1F1599"?>
 	<?define cmf_upclient_EXE_guid="DE392019-13E0-45FD-BA82-E4C0148AC654"?>
 	<?define cmf_upserver_EXE_guid="4201E9FE-56BC-4852-992A-18E5D75C3B39"?>
@@ -201,6 +203,8 @@
 	<?define cmf_butc_EXE_guid="96DAC5A8-FD16-4FF5-8BD5-92F25880E557"?>
 	<?define cmf_kaserver_EXE_guid="73117045-0BB8-4F57-8A75-909F35C2D723"?>
 	<?define cmf_ptserver_EXE_guid="CDBDE41D-24DF-44E5-97D2-EFA71CDBEECB"?>
+	<?define cmf_ptclient_EXE_guid="71F7F7A4-67FC-4169-8BB6-82E5753AB69A"?>
+	<?define cmf_pt_util_EXE_guid="CEB2A768-5EC9-4056-88D4-2D341A95073E"?>
 	<?define cmf_salvager_EXE_guid="E3F3ACE5-B556-4FEF-9DA2-78B194AA6639"?>
 	<?define cmf_upclient_EXE_guid="321BB9BF-5FF0-4363-9927-41C60BD526E9"?>
 	<?define cmf_upserver_EXE_guid="3CBD2EF5-43BC-4CA2-B367-87E82DED1406"?>
-- 
1.9.4