Restored branding.sh for local build.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>

.gitignore

@@ -27,6 +27,7 @@ Thumbs.db
 
 packages/*
 !packages/DOTNET_BUILD_LOCATION
+Branding/Hotfixes/*
 
 _ReSharper.*/
 *.opensdf

Branding/branding.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# Copyright (c) Citrix Systems, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms,
+# with or without modification, are permitted provided
+# that the following conditions are met:
+#
+# *   Redistributions of source code must retain the above
+#     copyright notice, this list of conditions and the
+#     following disclaimer.
+# *   Redistributions in binary form must reproduce the above
+#     copyright notice, this list of conditions and the
+#     following disclaimer in the documentation and/or other
+#     materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+BRANDING_COMPANY_NAME_LEGAL="[BRANDING_COMPANY_NAME_LEGAL]"
+BRANDING_COMPANY_NAME_SHORT="[Citrix]"
+BRANDING_PRODUCT_BRAND="[XenServer product]"
+BRANDING_COMPANY_URL=www.citrix.com
+BRANDING_SERVER="[XenServer]"
+BRANDING_COMPANY_AND_PRODUCT="[Citrix XenServer]"
+BRANDING_BRAND_CONSOLE="[XenCenter]"
+BRANDING_BRAND_CONSOLE_NO_SPACE="[XenCenter]"
+BRANDING_BRAND_CONSOLE_SHORT=XenCente
+BRANDING_PV_TOOLS="[Citrix VM Tools]"
+BRANDING_PRODUCT_VERSION_TEXT=0.0.0
+BRANDING_XC_PRODUCT_VERSION=0.0.0

scripts/xenadmin-build.sh

@@ -58,13 +58,7 @@ fi
 mkdir_clean ${SCRATCH_DIR}
 mkdir_clean ${OUTPUT_DIR}
 
-if [ -f ${REPO}/Branding/branding.sh ]; then
+source ${REPO}/Branding/branding.sh
-  source ${REPO}/Branding/branding.sh
-else
-  ROOT="$(cd -P "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd )"
-  source ${ROOT}/xenadmin-branding/citrix/Branding/branding.sh #local dev
-fi
-
 source ${REPO}/scripts/re-branding.sh $1
 
 #packages sources