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 27efa389247b3f3025d15446e253735111b950aa..31ba9a893640282c65144ee3d7221ff6f79463ca 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 3f0cbaf4c9fd88d1ce34ea3bd444f07e47ce495f..093b5eeaa6917b8ac108228b034749abb6f0c549 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/xencrsh/xencrsh.rc b/src/xencrsh/xencrsh.rc
index 65bbff9ec4a029abd2e1566a5e133b9e6f94596b..111d7cc6ca7aed9df7364b3dae63f2c7f98cc9f1 100644 (file)
--- a/src/xencrsh/xencrsh.rc
+++ b/src/xencrsh/xencrsh.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         "XENCRSH"
 #define VER_PRODUCTVERSION          MAJOR_VERSION,MINOR_VERSION,MICRO_VERSION,BUILD_NUMBER

diff --git a/src/xendisk/xendisk.rc b/src/xendisk/xendisk.rc
index a74ce0c61b8da692bf0e4473d5ad5b4e85747032..3d1f42143b89bbe42a2119bf900bcf23bca22bd1 100644 (file)
--- a/src/xendisk/xendisk.rc
+++ b/src/xendisk/xendisk.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         "XENDISK"
 #define VER_PRODUCTVERSION          MAJOR_VERSION,MINOR_VERSION,MICRO_VERSION,BUILD_NUMBER

diff --git a/src/xenvbd/xenvbd.rc b/src/xenvbd/xenvbd.rc
index 1b0148b5518a6ca2d183d57f535472fdf5ea5e4e..02a35d7d87518e674f958b987a834f64779af4db 100644 (file)
--- a/src/xenvbd/xenvbd.rc
+++ b/src/xenvbd/xenvbd.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         "XENVBD"
 #define VER_PRODUCTVERSION          MAJOR_VERSION,MINOR_VERSION,MICRO_VERSION,BUILD_NUMBER