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 <paul.durrant@citrix.com>

diff --git a/README.md b/README.md
index 6a9e4110c31ddf8834e0046eb19cf6a81a190c7d..05fd321bdcfd0bac377afc891ce2cb38441d79b3 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,12 +1,11 @@
-XenVbd - The XenServer Paravitual Storage Class Driver for Windows
-==================================================================
+XenVbd - The Xen Paravitual Storage Class Driver for Windows
+============================================================
 
 The XenVbd package consists of two single device drivers:
 
 *    xenvbd.sys is a STORPORT miniport driver which attaches to a virtual
-     device created by XenBus (see https://github.com/xenserver/win-xenbus)
-     and creates a child device for each VBD for the generic disk driver to
-     attach to.
+     device created by XenBus and creates a child device for each VBD for
+     the generic disk driver (disk.sys) to attach to.
      It is also a protocol driver for the blkif wire protocol (see
      include\\xen\\io\\blkif.h).
 

diff --git a/proj/coinst/xenvbd_coinst.vcxproj b/proj/coinst/xenvbd_coinst.vcxproj
index 76bf5acf511b1d3ec2a6ede9e1ab0c1c0eab43dd..865baf442d519c02880ffbb13f2815f9054e2fb9 100644 (file)
--- a/proj/coinst/xenvbd_coinst.vcxproj
+++ b/proj/coinst/xenvbd_coinst.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
        <Import Project="..\configs.props" />
        
@@ -69,8 +69,5 @@
        <ItemGroup>
                <None Include="..\..\src\coinst\xenvbd_coinst.def" />
        </ItemGroup>
-       <ItemGroup>
-               <ResourceCompile Include="..\..\src\coinst\xenvbd_coinst.rc" />
-       </ItemGroup>
        <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
\ No newline at end of file

diff --git a/src/coinst/xenvbd_coinst.rc b/src/coinst/xenvbd_coinst.rc
deleted file mode 100644 (file)
index b4409aa..0000000
--- a/src/coinst/xenvbd_coinst.rc
+++ /dev/null
@@ -1,56 +0,0 @@
-/* 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.
- */ 
-
-#include <windows.h>
-#include <ntverp.h>
-
-
-#undef VER_COMPANYNAME_STR
-#undef VER_PRODUCTNAME_STR
-#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 <version.h>
-
-#define VER_PRODUCTNAME_STR         "Citrix PV Tools for Virtual Machines"
-#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        "XENVBD_COINST.DLL"
-#define VER_FILEDESCRIPTION_STR     "Citrix Xen PV Disk Coinstaller"
-
-#define VER_FILETYPE                VFT_DRV
-#define VER_FILESUBTYPE             VFT2_DRV_SYSTEM
-
-#include <common.ver>

diff --git a/src/xencrsh/xencrsh.rc b/src/xencrsh/xencrsh.rc
index d9abcef69248dcdcb23da9362510c7ee7efe9582..d09727099dc00333e7ad8d137852338893291715 100644 (file)
--- a/src/xencrsh/xencrsh.rc
+++ b/src/xencrsh/xencrsh.rc
@@ -38,17 +38,17 @@
 #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 <version.h>
 
-#include "..\..\include\version.h"
+#define        VER_COMPANYNAME_STR         COMPANY_NAME_STR
+#define VER_LEGALCOPYRIGHT_STR      "Copyright (c) Citrix Systems Inc."
 
-#define VER_PRODUCTNAME_STR         "Citrix PV Tools for Virtual Machines"
+#define VER_PRODUCTNAME_STR         "XENCRSH"
 #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        "XENCRSH.SYS"
-#define VER_FILEDESCRIPTION_STR     "Citrix Xen PV Disk Interface (Crash/Hiber)"
+#define VER_FILEDESCRIPTION_STR     "XENCRSH"
 
 #define VER_FILETYPE                VFT_DRV
 #define VER_FILESUBTYPE             VFT2_DRV_SYSTEM

diff --git a/src/xenvbd.inf b/src/xenvbd.inf
index 9bf3f0fd527f5ce4634798cd5d671ecdf7d92fc6..bc8627b3d5c67c2e0aa7dba2a291ad0c12ac9dff 100644 (file)
--- a/src/xenvbd.inf
+++ b/src/xenvbd.inf
@@ -32,7 +32,7 @@
 Signature="$Windows NT$" 
 Class=SCSIAdapter
 ClassGUID={4D36E97B-E325-11CE-BFC1-08002BE10318} 
-Provider=%Citrix% 
+Provider=%Company% 
 CatalogFile=xenvbd.cat
 DriverVer=01/01/1900,0.0.0.0
 
@@ -49,9 +49,9 @@ xencrsh.sys=0,,
 xenvbd_coinst.dll=0,,
 
 [Manufacturer] 
-%Citrix%=Citrix,NT$ARCH$
+%Company%=Inst,NT$ARCH$
 
-[Citrix.NT$ARCH$]
+[Inst.NT$ARCH$]
 %XenVbdDesc%=XenVbd_Inst,XENBUS\VEN_XSC000&DEV_VBD&REV_00000001
 %XenVbdDesc%=XenVbd_Inst,XENBUS\VEN_XS0001&DEV_VBD&REV_00000001
 %XenVbdDesc%=XenVbd_Inst,XENBUS\VEN_XS0002&DEV_VBD&REV_00000001
@@ -92,9 +92,9 @@ HKR,,CoInstallers32,0x00010000,"xenvbd_coinst_@MAJOR_VERSION@_@MINOR_VERSION@_@M
 
 [Strings] 
 
-Citrix= "Citrix Systems, Inc." 
-DiskDesc = "XenServer Tools for Virtual Machines" 
-XenVbdDesc= "XenServer PV Storage Host Adapter"
+Company = "@COMPANY_NAME@"
+DiskDesc = "@PRODUCT_NAME@ PV Storage Host Adapter Package" 
+XenVbdDesc= "@PRODUCT_NAME@ PV Storage Host Adapter"
 
 SERVICE_BOOT_START = 0x0 
 SERVICE_SYSTEM_START = 0x1 

diff --git a/src/xenvbd/xenvbd.rc b/src/xenvbd/xenvbd.rc
index 7875b15e8f52f4f6b0c810da1708a5fb94b37ada..6ac8c502003839454defac8ce1aa0ab543db8654 100644 (file)
--- a/src/xenvbd/xenvbd.rc
+++ b/src/xenvbd/xenvbd.rc
@@ -38,17 +38,17 @@
 #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 <version.h>
 
-#define VER_PRODUCTNAME_STR         "XenServer PV Tools for Virtual Machines"
+#define        VER_COMPANYNAME_STR         COMPANY_NAME_STR
+#define VER_LEGALCOPYRIGHT_STR      "Copyright (c) Citrix Systems Inc."
+
+#define VER_PRODUCTNAME_STR         "XENVBD"
 #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        "XENVBD.SYS"
-#define VER_FILEDESCRIPTION_STR     "XenServer PV Storage Host Adapter"
+#define VER_FILEDESCRIPTION_STR     "XENVBD"
 
 #define VER_FILETYPE                VFT_DRV
 #define VER_FILESUBTYPE             VFT2_DRV_SYSTEM