From: Paul Durrant Date: Thu, 14 Aug 2014 13:56:59 +0000 (+0100) Subject: Update branding X-Git-Tag: 8.1.0-rc1~35 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=634d81b4d854bf5384100b6f85b115cb4bc0912a;p=pvdrivers%2Fwin%2Fxennet.git Update branding Remove the use of the 'XenServer' product name except where it is still appropriate. Remove use of 'Citrix' from all places except source file copyrights. Allow company and product name to be set at build time. Signed-off-by: Paul Durrant --- diff --git a/CHANGELOG b/CHANGELOG index ca78a6c..dc0830c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,6 @@ 7.2.0 (2013-09-27): * Drivers compatible with upstream Xen, QEMU and Linux dom0 -7.3.0 (2014-07-16): +8.0.0 (2014-08-14): * Drivers with new API version scheme diff --git a/MAINTAINERS b/MAINTAINERS index 09e9f65..88cc97a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6,19 +6,34 @@ who will advise you on the precise procedure they wish to use. We also request you follow these basic guidelines: -1. Make sure you test your changes on both 32- and 64-bit versions of Windows. +1. Make sure you test your changes on both a 32- and 64-bit version of Windows. + (The more versions of Windows you can test on the better). 2. Make sure your changes do not introduce any new prefast warnings. -3. All submissions must be made under the terms of the "Developer's Certificate - of Origin" (DC) and should include a Signed-off-by: line. +3. Make a patch available to the relevant maintainer in the list. Use 'diff -u' + to make the patch easy to merge. Be prepared to get your changes sent back + with seemingly silly requests about formatting and variable names. These + aren't as silly as they seem. One job the maintainers do is to keep things + looking the same. -2. All Submissions should use Unix line endings for consitency with the rest of - the XenServer project. + NOTE that all source should have Unix line endings. -3. Each patch should include a descriptive commit comment that helps understand - why the patch is necessary and why it works. This will be used both for - initial review and for new people to understand how the code works later + PLEASE see http://wiki.xen.org/wiki/Submitting_Xen_Patches for hints on how + to submit a patch in a suitable form. Whilst the PV driver source + repositories are distinct from the Xen Project hypervisor source, we will + follow the same general patch submission and review process. + + PLEASE try to include any credit lines you want added with the patch. It + avoids people being missed off by mistake and makes it easier to know who + wants adding and who doesn't. + + PLEASE document known bugs. If it doesn't work for everything or does + something very odd once a month document it. + + PLEASE remember that submissions must be made under the terms of the + "Developer's Certificate of Origin" (DCO) and should include a + Signed-off-by: line. 4. Make sure you have the right to submit any changes you make. If you do changes at work you may find your employer owns the patches instead of diff --git a/README.md b/README.md index d9d7273..cc92607 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -XenNet - The XenServer Paravitual Network Device Driver for Windows -=================================================================== +XenNet - The Xen Paravitual Network Device Driver for Windows +============================================================= The XenNet package consists of a single device driver: * xennet.sys is an NDIS6 miniport driver which attaches to a virtual - device created by XenVif (see https://github.com/xenserver/win-xenvif) - and uses the *netif* wire protocol implementation in XenVif to - interface to a paravirtual network backend. + device created by XenVif and uses the *netif* wire protocol + implementation in XenVif to interface to a paravirtual network + backend. Quick Start Guide ================= diff --git a/build.py b/build.py index 77ac55c..c1a86c9 100644 --- a/build.py +++ b/build.py @@ -28,6 +28,11 @@ def make_header(): now = datetime.datetime.now() file = open('include\\version.h', 'w') + + file.write('#define COMPANY_NAME_STR\t"' + os.environ['COMPANY_NAME'] + '"\n') + file.write('#define PRODUCT_NAME_STR\t"' + os.environ['PRODUCT_NAME'] + '"\n') + file.write('\n') + file.write('#define MAJOR_VERSION\t' + os.environ['MAJOR_VERSION'] + '\n') file.write('#define MAJOR_VERSION_STR\t"' + os.environ['MAJOR_VERSION'] + '"\n') file.write('\n') @@ -46,12 +51,15 @@ def make_header(): file.write('#define YEAR\t' + str(now.year) + '\n') file.write('#define YEAR_STR\t"' + str(now.year) + '"\n') + file.write('\n') file.write('#define MONTH\t' + str(now.month) + '\n') file.write('#define MONTH_STR\t"' + str(now.month) + '"\n') + file.write('\n') file.write('#define DAY\t' + str(now.day) + '\n') file.write('#define DAY_STR\t"' + str(now.day) + '"\n') + file.write('\n') file.close() @@ -65,6 +73,8 @@ def copy_inf(name): line = re.sub('@MINOR_VERSION@', os.environ['MINOR_VERSION'], line) line = re.sub('@MICRO_VERSION@', os.environ['MICRO_VERSION'], line) line = re.sub('@BUILD_NUMBER@', os.environ['BUILD_NUMBER'], line) + line = re.sub('@COMPANY_NAME@', os.environ['COMPANY_NAME'], line) + line = re.sub('@PRODUCT_NAME@', os.environ['PRODUCT_NAME'], line) dst.write(line) dst.close() @@ -361,8 +371,14 @@ if __name__ == '__main__': sdv = { 'nosdv': False, None: True } driver = 'xennet' - os.environ['MAJOR_VERSION'] = '7' - os.environ['MINOR_VERSION'] = '3' + if 'COMPANY_NAME' not in os.environ.keys(): + os.environ['COMPANY_NAME'] = 'Xen Project' + + if 'PRODUCT_NAME' not in os.environ.keys(): + os.environ['PRODUCT_NAME'] = 'Xen' + + os.environ['MAJOR_VERSION'] = '8' + os.environ['MINOR_VERSION'] = '0' os.environ['MICRO_VERSION'] = '0' if 'BUILD_NUMBER' not in os.environ.keys(): diff --git a/src/xennet.inf b/src/xennet.inf index 44acfcf..8831784 100644 --- a/src/xennet.inf +++ b/src/xennet.inf @@ -32,7 +32,7 @@ Signature="$Windows NT$" Class=Net ClassGUID={4d36e972-e325-11ce-bfc1-08002be10318} -Provider=%Citrix% +Provider=%Company% CatalogFile=xennet.cat DriverVer=01/01/1900,0.0.0.0 @@ -54,9 +54,9 @@ xennet.sys xennet_coinst_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.dll,xennet_coinst.dll [Manufacturer] -%Citrix%=Citrix,NT$ARCH$ +%Company%=Inst,NT$ARCH$ -[Citrix.NT$ARCH$] +[Inst.NT$ARCH$] ; DisplayName Section DeviceID ; ----------- ------- -------- @@ -188,9 +188,9 @@ HKR,,CoInstallers32,0x00010000,"xennet_coinst_@MAJOR_VERSION@_@MINOR_VERSION@_@M [Strings] -Citrix="Citrix Systems Inc." -DiskDesc="XenServer Tools for Virtual Machines" -XenNetDesc="XenServer PV Network Device" +Company="@COMPANY_NAME@" +DiskDesc="@PRODUCT_NAME@ PV Network Device Package" +XenNetDesc="@PRODUCT_NAME@ PV Network Device" IPChecksumOffloadIPv4="IPv4 Checksum Offload" TCPChecksumOffloadIPv4="TCP Checksum Offload (IPv4)" UDPChecksumOffloadIPv4="UDP Checksum Offload (IPv4)" diff --git a/src/xennet/adapter.c b/src/xennet/adapter.c index 6a852ee..7cc49fb 100644 --- a/src/xennet/adapter.c +++ b/src/xennet/adapter.c @@ -977,7 +977,7 @@ AdapterQueryInformation ( break; case OID_GEN_VENDOR_DESCRIPTION: - info = "Citrix"; + info = COMPANY_NAME_STR; bytesAvailable = (ULONG)strlen(info) + 1; break; diff --git a/src/xennet/xennet.rc b/src/xennet/xennet.rc index d5728c9..ffa9802 100644 --- a/src/xennet/xennet.rc +++ b/src/xennet/xennet.rc @@ -38,11 +38,11 @@ #undef VER_PRODUCTVERSION #undef VER_PRODUCTVERSION_STR -#define VER_COMPANYNAME_STR "Citrix Systems Inc." -#define VER_LEGALCOPYRIGHT_STR "Copyright " YEAR_STR VER_COMPANYNAME_STR - #include +#define VER_COMPANYNAME_STR COMPANY_NAME_STR +#define VER_LEGALCOPYRIGHT_STR "Copyright (c) Citrix Systems Inc." + #define VER_PRODUCTNAME_STR "XENNET" #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