Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 14:27:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1343 from kc284/remove-ref

Browse Source 
Fixing broken build
This commit is contained in:
Gabor Apati-Nagy 2016-12-13 14:59:25 +00:00 committed by GitHub
commit fecb18a377
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Branding/branding.sh
View File

@ -6,6 +6,7 @@ BRANDING_CSET_NUMBER=$(cd ${REPO} && git rev-list HEAD -1 && echo "")
# bring versions from the server branding repo
ROOT="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
OUTPUT_DIR=${ROOT}/output
rm -rf ${ROOT}/branding.git
BRANDING_REMOTE=https://code.citrite.net/scm/xs/branding.git
@ -17,6 +18,9 @@ else
git clone -b ${XS_BRANCH} ${BRANDING_REMOTE} ${ROOT}/branding.git
fi
SERVER_BRANDING_TIP=$(cd ${ROOT}/branding.git && git rev-parse HEAD)
echo "branding branding.git ${SERVER_BRANDING_TIP}" >> ${OUTPUT_DIR}/manifest
TOPLEVEL_VERSIONS=${ROOT}/branding.git/Citrix/XenServer/toplevel-versions
TOPLEVEL_BRANDING=${ROOT}/branding.git/Citrix/XenServer/toplevel-branding

7
mk/build.sh
View File

@ -72,6 +72,10 @@ XENADMIN_DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
source ${XENADMIN_DIR}/mk/declarations.sh
#create manifest
echo "@branch=${XS_BRANCH}" >> ${OUTPUT_DIR}/manifest
echo "xenadmin xenadmin.git ${get_REVISION:0:12}" >> ${OUTPUT_DIR}/manifest
if test -z "${XC_BRANDING}"; then XC_BRANDING=citrix; fi
rm -rf ${ROOT}/xenadmin-branding.git
@ -84,6 +88,9 @@ else
git clone -b ${XS_BRANCH} ${BRAND_REMOTE} ${ROOT}/xenadmin-branding.git
fi
XENADMIN_BRANDING_TIP=$(cd ${ROOT}/xenadmin-branding.git && git rev-parse HEAD)
echo "xenadmin-branding xenadmin-branding.git ${XENADMIN_BRANDING_TIP}" >> ${OUTPUT_DIR}/manifest
if [ -d ${ROOT}/xenadmin-branding.git/${XC_BRANDING} ]; then
echo "Overwriting Branding folder"
rm -rf ${XENADMIN_DIR}/Branding/*

13
mk/xenadmin-build.sh
View File

@ -292,28 +292,15 @@ done
#now package the pdbs
cd ${OUTPUT_DIR} && tar cjf XenCenter.Symbols.tar.bz2 --remove-files *.pdb
#create manifest
echo "@branch=${XS_BRANCH}" >> ${OUTPUT_DIR}/manifest
echo "xenadmin xenadmin.git ${get_REVISION:0:12}" >> ${OUTPUT_DIR}/manifest
#for the time being we download a fixed version of the ovf fixup iso, hence put this in the manifest
echo "xencenter-ovf xencenter-ovf.git 21d3d7a7041f15abfa73f916e5fd596fd7e610c4" >> ${OUTPUT_DIR}/manifest
echo "chroot-lenny chroots.hg 1a75fa5848e8" >> ${OUTPUT_DIR}/manifest
XENADMIN_BRANDING_TIP=$(cd ${ROOT}/xenadmin-branding.git && git rev-parse HEAD)
echo "xenadmin-branding xenadmin-branding.git ${XENADMIN_BRANDING_TIP}" >> ${OUTPUT_DIR}/manifest
SERVER_BRANDING_TIP=$(cd ${ROOT}/branding.git && git rev-parse HEAD)
echo "branding branding.git ${SERVER_BRANDING_TIP}" >> ${OUTPUT_DIR}/manifest
cat ${SCRATCH_DIR}/dotnet-packages-manifest >> ${OUTPUT_DIR}/manifest
get_BUILD_PATH=/usr/groups/xen/carbon/windowsbuilds/WindowsBuilds/${get_JOB_NAME}/${BUILD_NUMBER}
if [ "${BUILD_KIND:+$BUILD_KIND}" = production ]
then
echo ${get_BUILD_URL} > ${OUTPUT_DIR}/latest-secure-build
echo ${get_BUILD_PATH} > ${OUTPUT_DIR}/latest-successful-build
else
echo ${get_BUILD_URL} > ${OUTPUT_DIR}/latest-successful-build
fi
# Write out version information