win-pvdrivers

changeset 311:c25d8b936290

testing service control from installer
author James Harper <james.harper@bendigoit.com.au>
date Fri Jun 13 22:47:38 2008 +1000 (2008-06-13)
parents 60372bd2582d
children bb891f6d10e4
files common.inc installer.nsi xenvbd/xenvbd.inx
line diff
     1.1 --- a/common.inc	Fri Jun 13 14:16:50 2008 +1000
     1.2 +++ b/common.inc	Fri Jun 13 22:47:38 2008 +1000
     1.3 @@ -1,4 +1,4 @@
     1.4 -VERSION=0.9.8.7
     1.5 +VERSION=0.9.8.8
     1.6  TARGETPATH=..\Target\$(DDK_TARGET_OS)
     1.7  MSC_WARNING_LEVEL=/W4
     1.8  INCLUDES = ..\common\include;..\common\include\public
     2.1 --- a/installer.nsi	Fri Jun 13 14:16:50 2008 +1000
     2.2 +++ b/installer.nsi	Fri Jun 13 22:47:38 2008 +1000
     2.3 @@ -3,7 +3,7 @@
     2.4  
     2.5  !define AppName "Xen PV Drivers"
     2.6  !define StartMenu "$SMPROGRAMS\${AppName}"
     2.7 -!define Version "0.9.8"
     2.8 +!define Version "0.9.9-pre2"
     2.9  #!define Version "$%VERSION%"
    2.10  Name "${AppName}"
    2.11  InstallDir "$PROGRAMFILES\${AppName}"
    2.12 @@ -37,16 +37,18 @@ Section "Common Files"
    2.13    CreateShortCut "${StartMenu}\Wiki Page.lnk" "http://wiki.xensource.com/xenwiki/XenWindowsGplPv" 
    2.14    WriteUninstaller $INSTDIR\Uninstall.exe
    2.15    CreateShortCut "${StartMenu}\Uninstall.lnk" "$INSTDIR\uninstall.exe"
    2.16 +
    2.17  SectionEnd
    2.18  
    2.19  Section "Shutdown Monitor Service" shutdownmon
    2.20    SetOutPath $INSTDIR
    2.21  
    2.22 -  # stop shutdownmon service
    2.23 +  ExecWait 'NET STOP XenShutdownMon'
    2.24    File .\target\ShutdownMon.exe
    2.25 -  CreateShortCut "${StartMenu}\Install Shutdown Service.lnk" "$INSTDIR\ShutdownMon.exe" "-i"
    2.26 -  CreateShortCut "${StartMenu}\UnInstall Shutdown Service.lnk" "$INSTDIR\ShutdownMon.exe" "-u"
    2.27 -  # start shutdownmon service
    2.28 +#  CreateShortCut "${StartMenu}\Install Shutdown Service.lnk" "$INSTDIR\ShutdownMon.exe" "-i"
    2.29 +#  CreateShortCut "${StartMenu}\UnInstall Shutdown Service.lnk" "$INSTDIR\ShutdownMon.exe" "-u"
    2.30 +  ExecWait '"$INSTDIR\ShutdownMon.exe" -i'
    2.31 +  ExecWait 'NET START XenShutdownMon'
    2.32  SectionEnd
    2.33    
    2.34  Section "Windows 2000" win2k
    2.35 @@ -63,6 +65,7 @@ Section "Windows 2000" win2k
    2.36    File .\target\win2k\i386\xenvbd.sys
    2.37    File .\target\win2k\i386\xenscsi.sys
    2.38    File .\target\win2k\i386\xenstub.sys
    2.39 +  File .\target\win2k\i386\xenconfig.sys
    2.40  SectionEnd
    2.41  
    2.42  Section "Windows XP" winxp
    2.43 @@ -79,6 +82,7 @@ Section "Windows XP" winxp
    2.44    File .\target\winxp\i386\xenvbd.sys
    2.45    File .\target\winxp\i386\xenscsi.sys
    2.46    File .\target\winxp\i386\xenstub.sys
    2.47 +  File .\target\winxp\i386\xenconfig.sys
    2.48  SectionEnd
    2.49  
    2.50  Section "Windows 2003 x32" win2k3x32
    2.51 @@ -95,6 +99,7 @@ Section "Windows 2003 x32" win2k3x32
    2.52    File .\target\winnet\i386\xenvbd.sys
    2.53    File .\target\winnet\i386\xenscsi.sys
    2.54    File .\target\winnet\i386\xenstub.sys
    2.55 +  File .\target\winnet\i386\xenconfig.sys
    2.56  SectionEnd
    2.57  
    2.58  Section "Windows 2003 x64" win2k3x64
    2.59 @@ -111,6 +116,7 @@ Section "Windows 2003 x64" win2k3x64
    2.60    File .\target\winnet\amd64\xenvbd.sys
    2.61    File .\target\winnet\amd64\xenscsi.sys
    2.62    File .\target\winnet\amd64\xenstub.sys
    2.63 +  File .\target\winnet\amd64\xenconfig.sys
    2.64  SectionEnd
    2.65  
    2.66  Section "Windows 2008 x32" win2k8x32
    2.67 @@ -127,6 +133,7 @@ Section "Windows 2008 x32" win2k8x32
    2.68    File .\target\winlh\i386\xenvbd.sys
    2.69    File .\target\winlh\i386\xenscsi.sys
    2.70    File .\target\winlh\i386\xenstub.sys
    2.71 +  File .\target\winlh\i386\xenconfig.sys
    2.72  SectionEnd
    2.73  
    2.74  Section "Windows 2008 x64" win2k8x64
     3.1 --- a/xenvbd/xenvbd.inx	Fri Jun 13 14:16:50 2008 +1000
     3.2 +++ b/xenvbd/xenvbd.inx	Fri Jun 13 22:47:38 2008 +1000
     3.3 @@ -26,9 +26,11 @@ CopyFiles=XenVbd.CopyFiles
     3.4  
     3.5  [XenVbd.CopyFiles]
     3.6  xenvbd.sys
     3.7 +xenconfig.sys
     3.8  
     3.9  [XenVbd_Inst.NT.Services]
    3.10  AddService=XenVbd,2,XenVbd_Service, XenVbd_EventLog
    3.11 +AddService=XenConfig,0,XenConfig_Service
    3.12  
    3.13  [XenVbd_Service]
    3.14  DisplayName    = %XenVbd.SVCDESC%                            
    3.15 @@ -69,15 +71,6 @@ HKR,"XenConfig\grants", "value", %FLG_AD
    3.16  [XenVbd_UpperFilter_AddReg]
    3.17  HKR,,UpperFilters,0x10000,XenConfig
    3.18  
    3.19 -[XenConfig_Inst.NT.HW]
    3.20 -CopyFiles=XenConfig.CopyFiles
    3.21 -
    3.22 -[XenConfig.CopyFiles]
    3.23 -xenconfig.sys
    3.24 -
    3.25 -[XenConfig_Inst.NT.Services]
    3.26 -AddService=XenConfig,0,XenConfig_Service
    3.27 -
    3.28  [XenConfig_Service]
    3.29  DisplayName    = %XenConfig.SVCDESC%                            
    3.30  ServiceType    = 1
    3.31 @@ -104,7 +97,7 @@ 1 = %DISK_NAME%,,,.\amd64
    3.32  XenGplPv = "Xen GPL PV Driver Developers"
    3.33  XenVbd.SVCDESC = "Xen Block Device Driver"
    3.34  XenVbd.DRVDESC = "Xen Block Device Driver"
    3.35 -XenConfig.DRVDESC = "Xen Config Resource Generator"
    3.36 +XenConfig.SVCDESC = "Xen Config Resource Generator"
    3.37  DISK_NAME = "Xen Block Device Driver Install Disk"
    3.38  FLG_ADDREG_TYPE_DWORD = 0x00010001
    3.39  XEN_INIT_TYPE_END = 0