Merge pull request #11 from rossphilipson/remove-win-tools

[windows] Remove all win-tools and add a new user agent.

bootstrapper/bootstrapper.nsi

@@ -99,29 +99,6 @@ Function licenseSkip
   Pop $R0
 FunctionEnd
 
-; Looks in the registry to see whether .NET 4.0 is installed
-; Returns 1 if it is in $R0
-; Returns 0 if it is not in $R0
-Function IsDotNetInstalled
-  push $0
-
-  ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Install" ; Attempt to read the registry key
-  StrCmp $0 1 +1 +3 ; Check that .NET 4.0 is installed
-  StrCpy $R0 1 ; Set .NET 4.0 is installed
-  Goto IsDotNetInstalledEnd ; Skip to end of function
-
-  ClearErrors ; There was an error flag set we should clear from ReadRegDWORD
-  StrCmp $0 "" +3 +1 ; Check that the error is a key could not be found error
-  MessageBox MB_OK "The key HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\Install is not of type DWORD. Installer can not reliably determine the presence of .NET 4.0 of this machine, aborting." ; Something is hideously wrong in the registry...
-  Abort
-
-  StrCpy $R0 0 ; Set .NET 4.0 is not installed
-
-  IsDotNetInstalledEnd:
-    pop $0
-
-FunctionEnd
-
 ; $0 - location of manager, $1 - key counter, $2 - key name, $3 - key value, $4 - parameters
 Function PrepareMachine
 
@@ -224,20 +201,6 @@ section
   ###############################
   ### Install Mode ##############
   ###############################
-
-  Call IsDotNetInstalled ; Find out if .NET 4.0 is installed
-  StrCmp $R0 0 0 DotNetOK ; Decide whether we need to run the .NET installer
-  IfSilent +1 +2 ; Detect if running in silent mode, if true bail out of the install as .NET 4.0 is not installed, else go to give user a choice
-  Quit
-  # Give the user a choice about whether they want to install .NET even though it's mandatory
-  MessageBox MB_YESNO ".NET 4.0 is required by this software, do you wish to install .NET 4.0?" IDYES +2 IDNO +1
-  Quit ; Bail as user said no
-  File "..\iso\windows\dotNetFx40_Full_x86_x64.exe" ; Extract .NET
-  ExecWait '"$TEMP\OpenXT\dotNetFx40_Full_x86_x64.exe"' ; Install .NET
-  System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024) i r1' ; Get the path to our installer
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "restartCitrixSetup"  "$\"$R0$\" /skipagreement" ; Continue install after reboot
-  MessageBox MB_OK "System requires a restart before installation can continue. Click OK to restart the system now."
-  Reboot ; Reboot after install
 
   DotNetOK:
     Call PrepareMachine

installer/installer.wxs

@@ -77,25 +77,6 @@
     <!--Define XCI installation directory-->
     <Directory Id="TARGETDIR" Name="SourceDir">
 
-      <!--Merge Modules that define layout within themselves -->
-      <!-- XenGuestPlugin -->
-      <?if $(var.Platform) = "x86"?>
-        <Merge Id="XenGuestPlugin" 
-               Language="1033" 
-               SourceFile=".\Modules\XenGuestPlugin.msm" 
-               DiskId="1" />
-      <?else ?>
-        <Merge Id="XenGuestPlugin" 
-               Language="1033" 
-               SourceFile=".\Modules\XenGuestPlugin64.msm" 
-               DiskId="1" />
-      <?endif ?>
-
-      <!-- XenGuestAgent (OpenXT Xen Guest Services) -->
-      <Merge Id="XenGuestAgentMSM"
-             Language="1033"
-             SourceFile=".\Modules\XenGuestAgent.msm"
-             DiskId="1" />
 
 	  <!-- 32 Bit Prog Files folder -->
       <Directory Id="ProgramFilesFolder" Name="PFiles">
@@ -129,29 +110,6 @@
 		  <!--%PROGRAMFILES%\OpenXT\XenTools-->
           <Directory Id="XenTools" Name="XenTools">
 
-            <!-- %PROGRAMFILES%\OpenXT\XenTools\OpenXTGuestService -->
-            <Directory Id="XenClientGuestServiceDir" Name="XenClientGuestService">
-              <Merge Id="UdbusBindingsInterfacesLibrariesInstallerMSM"
-                     Language="1033"
-                     SourceFile=".\Modules\Udbus.Bindings.Interfaces.Libraries.Installer.msm"
-                     DiskId="1"
-              />
-              <Merge Id="UdbusBindingsClientLibrariesInstallerMSM"
-                     Language="1033"
-                     SourceFile=".\Modules\Udbus.Bindings.Client.Libraries.Installer.msm"
-                     DiskId="1"
-              />
-              <Merge Id="UdbusBindingsServiceLibrariesInstallerMSM"
-                     Language="1033"
-                     SourceFile=".\Modules\Udbus.Bindings.Service.Libraries.Installer.msm"
-                     DiskId="1"
-              />
-              <Merge Id="XenClientGuestService"
-                     Language="1033"
-                     SourceFile=".\Modules\XenClientGuestService.msm"
-                     DiskId="1"
-              />
-            </Directory><!--XenClientGuestService-->
           </Directory><!--XenTools-->
         </Directory> <!--OpenXT-->
       </Directory> <!--Program Files-->
@@ -166,26 +124,8 @@
 	  <ComponentRef Id="xensetup" />
 	  <ComponentRef Id="wlanprofLaunchKey" />
 
-	  <!-- XenGuest Graphical Agent -->
-	  <MergeRef Id ="XenGuestAgentMSM"/>
-
-      <!-- XenClientGuestService modules -->
-      <MergeRef Id="UdbusBindingsInterfacesLibrariesInstallerMSM"/>
-      <MergeRef Id="UdbusBindingsClientLibrariesInstallerMSM"/>
-      <MergeRef Id="UdbusBindingsServiceLibrariesInstallerMSM"/>
-      <MergeRef Id="XenClientGuestService"/>
     </Feature>
 
-	<!-- Xen Switcher bar feature, can be disabled via command line parameter -->
-	<Feature Id="XenSwitcherBar" Title="OpenXT Switcher Bar" 
-             Description="Installs OpenXT Switcher Bar" 
-             Level="1" AllowAdvertise="no" InstallDefault="local" Display="expand">
-       <Condition Level="0">
-          NOSWITCHERBAR = 1
-       </Condition>
-	   <MergeRef Id ="XenGuestPlugin"/>
-	</Feature>
-
 	<!-- Informs the user if there is not enough disk space for the install -->
     <Property Id="PROMPTROLLBACKCOST" Value="P" />