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

added fallback to trunk for unknown branches and an workaround for the msbuild not renaming the splash.pdb into xencenter.pdb

Browse Source
This commit is contained in:
Sorin Sbarnea (tocco) 2015-07-21 16:19:25 +01:00 committed by Mihaela Stoica
parent a5f5298604
commit 47588bc925
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mk/declarations.sh
View File

@ -90,6 +90,11 @@ then
fi
XS_BRANCH=`cd $DIR;git config --get remote.origin.url|sed -e 's@.*carbon/\(.*\)/xenadmin.git.*@\1@'`
if [[ $XS_BRANCH == *"/"* ]]
then
XS_BRANCH="trunk"
echo "Failed to detect XS_BRANCH we will fallback to `trunk`."
fi
else
if [ -z "${MERCURIAL_REVISION+xxx}" ]
then

2
mk/xenadmin-build.sh
View File

@ -374,6 +374,8 @@ cp ${WIX}/outVNCControl/VNCControl.msi ${OUTPUT_DIR}/VNCControl.msi
cd ${REPO}/XenAdmin/TestResources && tar -cf ${OUTPUT_DIR}/XenCenterTestResources.tar *
cp ${REPO}/XenAdminTests/bin/XenAdminTests.tgz ${OUTPUT_DIR}/XenAdminTests.tgz
cp ${REPO}/CFUValidator/bin/CFUValidator.tgz ${OUTPUT_DIR}/CFUValidator.tgz
# next line fixes the weird build with msbuild
cp -f "${REPO}/XenAdmin/bin/Release/splash.pdb" "${REPO}/XenAdmin/bin/Release/XenCenter.pdb"
cp ${REPO}/XenAdmin/bin/Release/{XS56EFP1002,XS56E008,XS60E001,XS62E006,XS65ESP1006}.xsupdate \
${REPO}/XenAdmin/bin/Release/{XS60E001-src-pkgs,XS62E006-src-pkgs}.tar.gz \
${REPO}/XenAdmin/bin/Release/{CommandLib.pdb,XenCenter.pdb,XenCenterLib.pdb,XenCenterMain.pdb,XenCenterVNC.pdb,XenModel.pdb,XenOvf.pdb,XenOvfTransport.pdb} \