Allow rebranding file copyright string

Pass COPYRIGHT string from environment to override the copyright string
that is embedded in the output binaries.

Signed-off-by: Owen Smith <owen.smith@citrix.com>

diff --git a/build.ps1 b/build.ps1
index 08b9715ce95f9109ae1ea3a9dec32f730a7fc0c0..a34e9a3c32af23424d22384a546f6bcdfdb92e1a 100644 (file)
--- a/build.ps1
+++ b/build.ps1
@@ -88,6 +88,10 @@ if ([string]::IsNullOrEmpty($Env:PRODUCT_NAME)) {
        Set-Item -Path Env:PRODUCT_NAME -Value 'Xen'
 }
 
+if ([string]::IsNullOrEmpty($Env:COPYRIGHT)) {
+       Set-Item -Path Env:COPYRIGHT -Value 'Copyright (c) Xen Project.'
+}
+
 if ([string]::IsNullOrEmpty($Env:BUILD_NUMBER)) {
        if (Test-Path ".build_number") {
                $BuildNum = Get-Content -Path ".build_number"

diff --git a/include/version.tmpl b/include/version.tmpl
index d6f9a481d621927cae90fc7ae520a2e21368b763..ce056d34c22b6d8ac41cf5219ea9ebd81c39b0dc 100644 (file)
--- a/include/version.tmpl
+++ b/include/version.tmpl
@@ -2,6 +2,7 @@
 #define PRODUCT_NAME_STR     "@PRODUCT_NAME@"
 #define VENDOR_PREFIX_STR    "@VENDOR_PREFIX@"
 #define VENDOR_DEVICE_ID_STR "@VENDOR_DEVICE_ID@"
+#define COPYRIGHT_STR        "@COPYRIGHT@"
 
 #define MAJOR_VERSION_STR    "@MAJOR_VERSION@"
 #define MINOR_VERSION_STR    "@MINOR_VERSION@"

diff --git a/scripts/genfiles.ps1 b/scripts/genfiles.ps1
index d402696e48b557be9aeb28b876c6bbaf147cadc5..4c58f0373fb4690ba141862cb388035f31f418bd 100644 (file)
--- a/scripts/genfiles.ps1
+++ b/scripts/genfiles.ps1
@@ -61,6 +61,7 @@ $Replacements = [ordered]@{
        'PRODUCT_NAME' = $Env:PRODUCT_NAME;
        'VENDOR_DEVICE_ID' = $Env:VENDOR_DEVICE_ID;
        'VENDOR_PREFIX' = $Env:VENDOR_PREFIX;
+       'COPYRIGHT' = $Env:COPYRIGHT;
 
        'MAJOR_VERSION' = $Env:MAJOR_VERSION;
        'MINOR_VERSION' = $Env:MINOR_VERSION;

diff --git a/src/monitor/xenbus_monitor.rc b/src/monitor/xenbus_monitor.rc
index 090e5c8c387abeab818945e571b19865b42549b8..457bdc5059dc345ed658e148d7a5f29e6d188add 100644 (file)
--- a/src/monitor/xenbus_monitor.rc
+++ b/src/monitor/xenbus_monitor.rc
@@ -40,7 +40,7 @@
 #include <version.h>
 
 #define VER_COMPANYNAME_STR         VENDOR_NAME_STR
-#define VER_LEGALCOPYRIGHT_STR      "Copyright (c) Citrix Systems Inc."
+#define VER_LEGALCOPYRIGHT_STR      COPYRIGHT_STR
 
 #define VER_PRODUCTNAME_STR         "XENBUS"
 #define VER_PRODUCTVERSION          MAJOR_VERSION,MINOR_VERSION,MICRO_VERSION,BUILD_NUMBER

diff --git a/src/xen/xen.rc b/src/xen/xen.rc
index 95d94b633d7f805da985a2602918255422b59c24..e9ce1b5ff87e4bf348999653cfdb966d8a4df945 100644 (file)
--- a/src/xen/xen.rc
+++ b/src/xen/xen.rc
@@ -41,7 +41,7 @@
 #include <version.h>
 
 #define        VER_COMPANYNAME_STR         VENDOR_NAME_STR
-#define VER_LEGALCOPYRIGHT_STR      "Copyright (c) Citrix Systems Inc."
+#define VER_LEGALCOPYRIGHT_STR      COPYRIGHT_STR
 
 #define VER_PRODUCTNAME_STR         "XEN"
 #define VER_PRODUCTVERSION          MAJOR_VERSION,MINOR_VERSION,MICRO_VERSION,BUILD_NUMBER

diff --git a/src/xenbus/xenbus.rc b/src/xenbus/xenbus.rc
index 9248d87bf3bd0ffc475d4a72c8cd08507255018e..56504eb6de65be74b827519ccc0c47532816bbe0 100644 (file)
--- a/src/xenbus/xenbus.rc
+++ b/src/xenbus/xenbus.rc
@@ -41,7 +41,7 @@
 #include <version.h>
 
 #define        VER_COMPANYNAME_STR         VENDOR_NAME_STR
-#define VER_LEGALCOPYRIGHT_STR      "Copyright (c) Citrix Systems Inc."
+#define VER_LEGALCOPYRIGHT_STR      COPYRIGHT_STR
 
 #define VER_PRODUCTNAME_STR         "XENBUS"
 #define VER_PRODUCTVERSION          MAJOR_VERSION,MINOR_VERSION,MICRO_VERSION,BUILD_NUMBER

diff --git a/src/xenfilt/xenfilt.rc b/src/xenfilt/xenfilt.rc
index 49494923233888d6ce120017f9f8f5b70fb3aa34..3db5fbf3f1a9c3f010639b0a42c83ccb1eee4313 100644 (file)
--- a/src/xenfilt/xenfilt.rc
+++ b/src/xenfilt/xenfilt.rc
@@ -40,7 +40,7 @@
 #include <version.h>
 
 #define        VER_COMPANYNAME_STR         VENDOR_NAME_STR
-#define VER_LEGALCOPYRIGHT_STR      "Copyright (c) Citrix Systems Inc."
+#define VER_LEGALCOPYRIGHT_STR      COPYRIGHT_STR
 
 #define VER_PRODUCTNAME_STR         "XENFILT"
 #define VER_PRODUCTVERSION          MAJOR_VERSION,MINOR_VERSION,MICRO_VERSION,BUILD_NUMBER