[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 1/3] [XenVbd] Allow rebranding file copyright string



From: Owen Smith <owen.smith@xxxxxxxxxx>

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

Signed-off-by: Owen Smith <owen.smith@xxxxxxxxxx>
---
 build.ps1              | 4 ++++
 include/version.tmpl   | 1 +
 scripts/genfiles.ps1   | 1 +
 src/xencrsh/xencrsh.rc | 2 +-
 src/xendisk/xendisk.rc | 2 +-
 src/xenvbd/xenvbd.rc   | 2 +-
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/build.ps1 b/build.ps1
index 27efa38..31ba9a8 100644
--- 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 d6f9a48..ce056d3 100644
--- 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 3f0cbaf..093b5ee 100644
--- 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 65bbff9..111d7cc 100644
--- 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 a74ce0c..3d1f421 100644
--- 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 1b0148b..02a35d7 100644
--- 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
-- 
2.39.0.windows.1




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.