From c9932a49a129dd4236d37b8afed5d741a9296cba Mon Sep 17 00:00:00 2001 From: Mihaela Stoica Date: Thu, 20 Jul 2017 14:40:04 +0100 Subject: [PATCH] Move PRODUCT_MICRO_VERSION_OVERRIDE to branding (#1706) Signed-off-by: Mihaela Stoica --- Branding/branding.sh | 8 ++++++++ mk/xenadmin-build.sh | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Branding/branding.sh b/Branding/branding.sh index b83c5f34a..21c1cb60e 100755 --- a/Branding/branding.sh +++ b/Branding/branding.sh @@ -30,6 +30,14 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +#============================================================== +#Micro version override - please keep at the top of the script +#============================================================== +#Set and uncomment this to override the 3rd value of the product number +#normally fetched from branding +# +#PRODUCT_MICRO_VERSION_OVERRIDE= + # bring versions from the server branding repo ROOT="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )" OUTPUT_DIR=${ROOT}/output diff --git a/mk/xenadmin-build.sh b/mk/xenadmin-build.sh index 5dc990b45..00432d530 100755 --- a/mk/xenadmin-build.sh +++ b/mk/xenadmin-build.sh @@ -32,14 +32,6 @@ set -ex -#============================================================== -#Micro version override - please keep at the top of the script -#============================================================== -#Set and uncomment this to override the 3rd value of the product number -#normally fetched from branding -# -#PRODUCT_MICRO_VERSION_OVERRIDE= - SET_ENV_FILE="/cygdrive/c/env.sh" if [ -f ${SET_ENV_FILE} ]; then . ${SET_ENV_FILE}