From: Paul Durrant Date: Mon, 9 Sep 2013 16:20:38 +0000 (+0100) Subject: Fix things for upstream X-Git-Tag: 8.1.0-rc1~33 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fadf0c1b046999d34a0f9d879f65c001c9582e5c;p=pvdrivers%2Fwin%2Fxeniface.git Fix things for upstream Modified the INF file for the new binding and fixed the branding there and in xeniface.rc. Also switched over to test-signing. Signed-off-by: Paul Durrant --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b389700 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +# Cscope/Tags +cscope.files +cscope.out +tags + +# Output +xeniface diff --git a/build.py b/build.py index eb82652..b889f6e 100644 --- a/build.py +++ b/build.py @@ -246,7 +246,7 @@ def callfnout(cmd): if ret != 0: raise(Exception("Error %d in : %s" % (ret, cmd))) - print("------------------------------------------------------------") + return output.decode('utf-8') def archive(filename, files, tgz=False): @@ -256,7 +256,6 @@ def archive(filename, files, tgz=False): tar = tarfile.open(filename, access) for name in files : try: - print('adding '+name) tar.add(name) except: pass @@ -288,8 +287,6 @@ if __name__ == '__main__': symstore_add('xeniface', 'x86', debug[sys.argv[1]]) symstore_add('xeniface', 'x64', debug[sys.argv[1]]) - - listfile = callfnout(['git','ls-tree', '-r', '--name-only', 'HEAD']) archive('xeniface\\source.tgz', listfile.splitlines(), tgz=True) archive('xeniface.tar', ['xeniface', 'revision']) diff --git a/clean.py b/clean.py index 3846f03..609aeac 100644 --- a/clean.py +++ b/clean.py @@ -33,11 +33,11 @@ import os, sys -file = os.popen('hg status') +file = os.popen('git status --untracked-files --short') for line in file: item = line.split(' ') - if item[0] == '?': + if item[0] == '??': path = ' '.join(item[1:]).rstrip() print(path) os.remove(path) diff --git a/kdfiles.sh b/kdfiles.sh deleted file mode 100644 index 793e534..0000000 --- a/kdfiles.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -x - -# Copyright (c) Citrix Systems Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, -# with or without modification, are permitted provided -# that the following conditions are met: -# -# * Redistributions of source code must retain the above -# copyright notice, this list of conditions and the -# following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the -# following disclaimer in the documentation and/or other -# materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND -# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. - - -CWD=$(pwd) - -PKG="xeniface" -TARGET="\\systemroot\\system32\\drivers" -SOURCE=$(cygpath --windows ${CWD}) - -MAP=${CWD}/kdfiles32.txt -> ${MAP} - -cd ${PKG}/x86 -for DRIVER in *.sys -do - echo "map" >> ${MAP} - echo "${TARGET}\\${DRIVER}" >> ${MAP} - echo "${SOURCE}\\${PKG}\\x86\\${DRIVER}" >> ${MAP} - echo >> ${MAP} -done - -cd ${CWD} - -MAP=${CWD}/kdfiles64.txt -> ${MAP} - -cd ${PKG}/x64 -for DRIVER in *.sys -do - echo "map" >> ${MAP} - echo "${TARGET}\\${DRIVER}" >> ${MAP} - echo "${SOURCE}\\${PKG}\\x64\\${DRIVER}" >> ${MAP} - echo >> ${MAP} -done - - diff --git a/proj/msbuild.bat b/proj/msbuild.bat index f4c59ce..6965b80 100644 --- a/proj/msbuild.bat +++ b/proj/msbuild.bat @@ -1,3 +1,3 @@ call "%VS%\VC\vcvarsall.bat" x86 -msbuild.exe /p:Configuration="%CONFIGURATION%" /p:Platform="%PLATFORM%" /t:"%TARGET%" /p:SignMode="ProductionSign" %SOLUTION%.sln +msbuild.exe /p:Configuration="%CONFIGURATION%" /p:Platform="%PLATFORM%" /t:"%TARGET%" %SOLUTION%.sln diff --git a/proj/package/package.vcxproj b/proj/package/package.vcxproj index 0cca2f1..70f9115 100644 --- a/proj/package/package.vcxproj +++ b/proj/package/package.vcxproj @@ -120,8 +120,8 @@ true - Vista_$(DDKPlatform);7_$(DDKPlatform);Server2008_$(DDKPlatform);Server2008R2_$(DDKPlatform) - Vista_$(DDKPlatform);7_$(DDKPlatform);Server2008_$(DDKPlatform) + Vista_x64;7_x64;Server2008_x64;Server2008R2_x64;Server8_x64 + Vista_x86;7_x86;Server2008_x86;8_x86 DbgengKernelDebugger diff --git a/proj/package/package.vcxproj.user b/proj/package/package.vcxproj.user index c0fb6de..5abd8fd 100644 --- a/proj/package/package.vcxproj.user +++ b/proj/package/package.vcxproj.user @@ -1,8 +1,8 @@ - ProductionSign - CN="Citrix Systems, Inc.", OU=Digital ID Class 3 - Microsoft Software Validation v2, O="Citrix Systems, Inc.", L=Santa Clara, S=California, C=US | 9505C081954CC0A3E8B904458ACACD72EABD98B5 + TestSign + ..\xeniface.pfx http://timestamp.verisign.com/scripts/timstamp.dll \ No newline at end of file diff --git a/proj/xeniface.pfx b/proj/xeniface.pfx new file mode 100644 index 0000000..4c6ea8d Binary files /dev/null and b/proj/xeniface.pfx differ diff --git a/proj/xeniface/xeniface.vcxproj.user b/proj/xeniface/xeniface.vcxproj.user index c0fb6de..5abd8fd 100644 --- a/proj/xeniface/xeniface.vcxproj.user +++ b/proj/xeniface/xeniface.vcxproj.user @@ -1,8 +1,8 @@ - ProductionSign - CN="Citrix Systems, Inc.", OU=Digital ID Class 3 - Microsoft Software Validation v2, O="Citrix Systems, Inc.", L=Santa Clara, S=California, C=US | 9505C081954CC0A3E8B904458ACACD72EABD98B5 + TestSign + ..\xeniface.pfx http://timestamp.verisign.com/scripts/timstamp.dll \ No newline at end of file diff --git a/src/xeniface.inf b/src/xeniface.inf index ff77ab7..004c590 100644 --- a/src/xeniface.inf +++ b/src/xeniface.inf @@ -47,9 +47,12 @@ DefaultDestDir = 12 %Citrix%=Citrix,NT$ARCH$ [Citrix.NT$ARCH$] -; DisplayName Section DeviceId -; ----------- ------- -------- -%XenIfaceDevice.DeviceDesc%=XenIface_Device, XENBUS\CLASS_IFACE&REV_02 +; DisplayName Section DeviceID +; ----------- ------- -------- + +%XenIfaceDevice.DeviceDesc% =XenIface_Device, XENBUS\VEN_XSC000&DEV_IFACE&REV_00000001 +%XenIfaceDevice.DeviceDesc% =XenIface_Device, XENBUS\VEN_XS0001&DEV_IFACE&REV_00000001 +%XenIfaceDevice.DeviceDesc% =XenIface_Device, XENBUS\VEN_XS0002&DEV_IFACE&REV_00000001 [XenIface_Device.NT$ARCH$] CopyFiles=XenIface_Device.NT.Copy @@ -63,7 +66,7 @@ xeniface.sys AddService = xeniface, %SPSVCINST_ASSOCSERVICE%, xeniface_Service_Inst [xeniface_Service_Inst] -DisplayName = %xeniface.SVCDESC% +DisplayName = %XenIfaceDevice.DeviceDesc% ServiceType = 1 ; SERVICE_KERNEL_DRIVER StartType = 3 ; SERVICE_DEMAND_START ErrorControl = 1 ; SERVICE_ERROR_NORMAL @@ -80,8 +83,6 @@ xeniface.sys = 1,, [Strings] SPSVCINST_ASSOCSERVICE= 0x00000002 Citrix= "Citrix Systems, Inc." -ClassName = "XenIface" -DiskId1 = "Citrix Tools for Virtual Machines" -XenIfaceDevice.DeviceDesc = "Citrix Xen Interface" -xeniface.SVCDESC = "Citrix Xen Interface Device Driver" +DiskId1 = "XenServer Tools for Virtual Machines" +XenIfaceDevice.DeviceDesc = "XenServer Interface" diff --git a/src/xeniface/xeniface.rc b/src/xeniface/xeniface.rc index 0666f97..1f17ac4 100644 --- a/src/xeniface/xeniface.rc +++ b/src/xeniface/xeniface.rc @@ -42,12 +42,12 @@ #include "..\..\include\version.h" -#define VER_PRODUCTNAME_STR "Citrix PV Tools for Virtual Machines" +#define VER_PRODUCTNAME_STR "XENIFACE" #define VER_PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,MICRO_VERSION,BUILD_NUMBER #define VER_PRODUCTVERSION_STR MAJOR_VERSION_STR "." MINOR_VERSION_STR "." MICRO_VERSION_STR "." BUILD_NUMBER_STR #define VER_INTERNALNAME_STR "XENIFACE.SYS" -#define VER_FILEDESCRIPTION_STR "Citrix PV Interface Driver" +#define VER_FILEDESCRIPTION_STR "XENIFACE" #define VER_FILETYPE VFT_DRV #define VER_FILESUBTYPE VFT2_DRV_SYSTEM