Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into CP-19888-copy

Browse Source 
# Conflicts:
#	mk/build.sh (used master)
#	mk/tests-checks-cover.sh
This commit is contained in:
Callum McIntyre 2016-12-19 17:19:04 +00:00
commit 7fc58882d8
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mk/build.sh
View File

@ -53,7 +53,7 @@ function check_deps ()
fi
}
check_deps nunit-console.exe zip unzip mkisofs wget curl hg git patch mt.exe candle.exe light.exe ncover
check_deps nunit-console.exe zip unzip wget curl hg git patch mt.exe candle.exe light.exe
if [ "${BUILD_KIND:+$BUILD_KIND}" != production ]
then
@ -73,35 +73,6 @@ XENADMIN_DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
source ${XENADMIN_DIR}/mk/declarations.sh
if test -z "${XC_BRANDING}"; then XC_BRANDING=citrix; fi
rm -rf ${ROOT}/xenadmin-branding
BRAND_REMOTE=https://code.citrite.net/scm/xsc/xenadmin-branding.git
if [ -z $(git ls-remote --heads ${BRAND_REMOTE} | grep ${XS_BRANCH}) ] ; then
echo "Branch ${XS_BRANCH} not found on xenadmin-branding.git. Reverting to master."
git clone -b master ${BRAND_REMOTE} ${ROOT}/xenadmin-branding
else
git clone -b ${XS_BRANCH} ${BRAND_REMOTE} ${ROOT}/xenadmin-branding
fi
if [ -d ${ROOT}/xenadmin-branding/${XC_BRANDING} ]; then
echo "Overwriting Branding folder"
rm -rf ${XENADMIN_DIR}/Branding/*
cp -rf ${ROOT}/xenadmin-branding/${XC_BRANDING}/* ${XENADMIN_DIR}/Branding/
fi
# overwrite archive-push.sh and push-latest-successful-build.sh files, if they exist in Branding folder
if [ -f ${XENADMIN_DIR}/Branding/branding-archive-push.sh ]; then
echo "Overwriting mk/archive-push.sh with Branding/branding-archive-push.sh."
cp ${XENADMIN_DIR}/Branding/branding-archive-push.sh ${XENADMIN_DIR}/mk/archive-push.sh
fi
if [ -f ${XENADMIN_DIR}/Branding/branding-push-latest-successful-build.sh ]; then
echo "Overwriting mk/push-latest-successful-build.sh with Branding/branding-push-latest-successful-build.sh."
cp ${XENADMIN_DIR}/Branding/branding-push-latest-successful-build.sh ${XENADMIN_DIR}/mk/push-latest-successful-build.sh
fi
run_tests()
{
if [ -n "${REPORT_COVERAGE+x}" ]; then