Allow rebranding file copyright string

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

Note: Does not change the copyright string in xencontrol.dll, which is
assigned to "Invisible Things Lab". This string is not rebrandable

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

diff --git a/build.ps1 b/build.ps1
index 0d0f6064112fca56a06d92742a9f4fa637137c8b..4943d99e71c7a42af40d4ae97f4a454ed13e4681 100644 (file)
--- a/build.ps1
+++ b/build.ps1
@@ -92,6 +92,10 @@ if ([string]::IsNullOrEmpty($Env:OBJECT_PREFIX)) {
        Set-Item -Path Env:OBJECT_PREFIX -Value 'XenProject'
 }
 
+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 c675b9c5957bb80a3e2225ee6da01e164f103001..a72b1c6e9b3074aba1b81aaf1cc2906a57c671ab 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 OBJECT_PREFIX_STR    "@OBJECT_PREFIX@"
 #define OBJECT_GUID(_Name)   @OBJECT_PREFIX@ ## _Name ## _GUID

diff --git a/scripts/genfiles.ps1 b/scripts/genfiles.ps1
index 64e087c8cc9949bafba71042c6dc3c13e366732f..96a338caa30cf86d331c59527c987c238b6bee34 100644 (file)
--- a/scripts/genfiles.ps1
+++ b/scripts/genfiles.ps1
@@ -62,6 +62,7 @@ $Replacements = [ordered]@{
        'VENDOR_DEVICE_ID' = $Env:VENDOR_DEVICE_ID;
        'VENDOR_PREFIX' = $Env:VENDOR_PREFIX;
        'OBJECT_PREFIX' = $Env:OBJECT_PREFIX;
+       'COPYRIGHT' = $Env:COPYRIGHT;
 
        'MAJOR_VERSION' = $Env:MAJOR_VERSION;
        'MINOR_VERSION' = $Env:MINOR_VERSION;

diff --git a/src/xenagent/xenagent.rc b/src/xenagent/xenagent.rc
index f8d7fc0dd220d20e4fd814d61eba24cb2ffd5f70..ea40aece5298a16d84f2d5d1294c73f7d348161b 100644 (file)
--- a/src/xenagent/xenagent.rc
+++ b/src/xenagent/xenagent.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         "XENIFACE"
 #define VER_PRODUCTVERSION          MAJOR_VERSION,MINOR_VERSION,MICRO_VERSION,BUILD_NUMBER

diff --git a/src/xeniface/xeniface.rc b/src/xeniface/xeniface.rc
index 890279991f71c73b42c5ad0359c65a9a91c66327..c113fac8495bd601c4ef9cb2b30b6e47b499ce72 100644 (file)
--- a/src/xeniface/xeniface.rc
+++ b/src/xeniface/xeniface.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         "XENIFACE"
 #define VER_PRODUCTVERSION          MAJOR_VERSION,MINOR_VERSION,MICRO_VERSION,BUILD_NUMBER