]> xenbits.xensource.com Git - pvdrivers/win/xeniface.git/commitdiff
Fix things for upstream
authorPaul Durrant <paul.durrant@citrix.com>
Mon, 9 Sep 2013 16:20:38 +0000 (17:20 +0100)
committerPaul Durrant <paul.durrant@citrix.com>
Mon, 9 Sep 2013 16:20:38 +0000 (17:20 +0100)
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 <paul.durrant@citrix.com>
.gitignore [new file with mode: 0644]
build.py
clean.py
kdfiles.sh [deleted file]
proj/msbuild.bat
proj/package/package.vcxproj
proj/package/package.vcxproj.user
proj/xeniface.pfx [new file with mode: 0644]
proj/xeniface/xeniface.vcxproj.user
src/xeniface.inf
src/xeniface/xeniface.rc

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..b389700
--- /dev/null
@@ -0,0 +1,7 @@
+# Cscope/Tags
+cscope.files
+cscope.out
+tags
+
+# Output
+xeniface
index eb8265227f585da346086406aacd4bbda6e7ebb1..b889f6e47a29ed3d1a56946f85e65e3fb9208529 100644 (file)
--- 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'])
index 3846f037be640313f47bd8ea0d30f1874ab6f3a9..609aeaca370f803b151c49a5098d6cb23114f5e3 100644 (file)
--- a/clean.py
+++ b/clean.py
 
 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 (file)
index 793e534..0000000
+++ /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
-
-
index f4c59cea9e0da9f0913f3dab501ec1d93a1da808..6965b80d1377cde96dec83c2078aa29046c610c3 100644 (file)
@@ -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
 
index 0cca2f1053d236f155700fd2c5bab7caf4b4de30..70f91154f4abaee2315966277f2ebbc5abd17c7b 100644 (file)
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <EnableInf2cat>true</EnableInf2cat>
-    <Inf2CatWindowsVersionList Condition="'$(DDKPlatform)'=='x64'">Vista_$(DDKPlatform);7_$(DDKPlatform);Server2008_$(DDKPlatform);Server2008R2_$(DDKPlatform)</Inf2CatWindowsVersionList>
-    <Inf2CatWindowsVersionList Condition="'$(DDKPlatform)'=='x86'">Vista_$(DDKPlatform);7_$(DDKPlatform);Server2008_$(DDKPlatform)</Inf2CatWindowsVersionList>
+    <Inf2CatWindowsVersionList Condition="'$(Platform)'=='x64'">Vista_x64;7_x64;Server2008_x64;Server2008R2_x64;Server8_x64</Inf2CatWindowsVersionList>
+    <Inf2CatWindowsVersionList Condition="'$(Platform)'=='Win32'">Vista_x86;7_x86;Server2008_x86;8_x86</Inf2CatWindowsVersionList>
   </PropertyGroup>
   <PropertyGroup>
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
index c0fb6de96a65628621a36e807b38f748a7e6d3ec..5abd8fd0cde0e48165b8b8f190c5919baa0aaedb 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <PropertyGroup>\r
-    <SignMode>ProductionSign</SignMode>\r
-    <ProductionCertificate>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</ProductionCertificate>\r
+    <SignMode>TestSign</SignMode>\r
+    <TestCertificate>..\xeniface.pfx</TestCertificate>\r
     <TimeStampServer>http://timestamp.verisign.com/scripts/timstamp.dll</TimeStampServer>\r
   </PropertyGroup>\r
 </Project>
\ No newline at end of file
diff --git a/proj/xeniface.pfx b/proj/xeniface.pfx
new file mode 100644 (file)
index 0000000..4c6ea8d
Binary files /dev/null and b/proj/xeniface.pfx differ
index c0fb6de96a65628621a36e807b38f748a7e6d3ec..5abd8fd0cde0e48165b8b8f190c5919baa0aaedb 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <PropertyGroup>\r
-    <SignMode>ProductionSign</SignMode>\r
-    <ProductionCertificate>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</ProductionCertificate>\r
+    <SignMode>TestSign</SignMode>\r
+    <TestCertificate>..\xeniface.pfx</TestCertificate>\r
     <TimeStampServer>http://timestamp.verisign.com/scripts/timstamp.dll</TimeStampServer>\r
   </PropertyGroup>\r
 </Project>
\ No newline at end of file
index ff77ab75d10e91e733e7b635b699c42516d02f45..004c59079be0ba1ac292eef2edbaedaead2f98b4 100644 (file)
@@ -47,9 +47,12 @@ DefaultDestDir = 12
 %Citrix%=Citrix,NT$ARCH$\r
 \r
 [Citrix.NT$ARCH$]\r
-; DisplayName               Section           DeviceId\r
-; -----------               -------           --------\r
-%XenIfaceDevice.DeviceDesc%=XenIface_Device, XENBUS\CLASS_IFACE&REV_02\r
+; DisplayName              Section           DeviceID\r
+; -----------              -------           --------\r
+\r
+%XenIfaceDevice.DeviceDesc% =XenIface_Device, XENBUS\VEN_XSC000&DEV_IFACE&REV_00000001\r
+%XenIfaceDevice.DeviceDesc% =XenIface_Device, XENBUS\VEN_XS0001&DEV_IFACE&REV_00000001\r
+%XenIfaceDevice.DeviceDesc% =XenIface_Device, XENBUS\VEN_XS0002&DEV_IFACE&REV_00000001\r
 \r
 [XenIface_Device.NT$ARCH$]\r
 CopyFiles=XenIface_Device.NT.Copy\r
@@ -63,7 +66,7 @@ xeniface.sys
 AddService = xeniface, %SPSVCINST_ASSOCSERVICE%, xeniface_Service_Inst\r
 \r
 [xeniface_Service_Inst]\r
-DisplayName    = %xeniface.SVCDESC%\r
+DisplayName    = %XenIfaceDevice.DeviceDesc%\r
 ServiceType    = 1               ; SERVICE_KERNEL_DRIVER\r
 StartType      = 3               ; SERVICE_DEMAND_START \r
 ErrorControl   = 1               ; SERVICE_ERROR_NORMAL\r
@@ -80,8 +83,6 @@ xeniface.sys  = 1,,
 [Strings]\r
 SPSVCINST_ASSOCSERVICE= 0x00000002\r
 Citrix= "Citrix Systems, Inc." \r
-ClassName = "XenIface"\r
-DiskId1 = "Citrix Tools for Virtual Machines"\r
-XenIfaceDevice.DeviceDesc = "Citrix Xen Interface"\r
-xeniface.SVCDESC = "Citrix Xen Interface Device Driver"\r
+DiskId1 = "XenServer Tools for Virtual Machines"\r
+XenIfaceDevice.DeviceDesc = "XenServer Interface"\r
 \r
index 0666f9754370938a5acbc9463064dc2a108ec7dd..1f17ac47c9239b70d76f44dd7253294d89411e79 100644 (file)
 
 #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