Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-12-03 16:41:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enabled back the exection of devtools and improved the logging

Browse Source
This commit is contained in:
Sorin Sbarnea 2015-07-24 15:58:50 +01:00 committed by Mihaela Stoica
parent 8840a7a496
commit 908bacf6c2
9 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/XenAdmin.csproj
View File

@ -6788,7 +6788,7 @@
</Target>
-->
<PropertyGroup>
<PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">"mt.exe" -manifest "$(ProjectDir)$(ProjectName).manifest" -outputresource:"$(TargetDir)..\..\bin\$(Configuration)\$(TargetFileName)";#1</PostBuildEvent>
<PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">mt.exe -nologo -manifest "$(ProjectDir)$(ProjectName).manifest" -outputresource:"$(TargetDir)..\..\bin\$(Configuration)\$(TargetFileName)";#1</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>copy "$(ProjectDir)\ReportViewer\resource_report.rdlc" "$(TargetDir)"

1
devtools/check-roaming.sh Normal file → Executable file
View File

@ -32,6 +32,7 @@
set -eu
echo "INFO: check roaming"
dir=$(readlink -f $(dirname "$0"))
src=$(readlink -f "$dir/../XenAdmin")

2
devtools/deadcheck/deadcheck.sh Normal file → Executable file
View File

@ -32,6 +32,8 @@
set -eu
echo "INFO: deadcheck"
dir="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
src="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../../XenAdmin" && pwd )"
if [ ! -d "${src}" ]; then

2
devtools/spellcheck/spellcheck.sh Normal file → Executable file
View File

@ -32,6 +32,8 @@
set -eu
echo "INFO: spellcheck"
dir="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
src="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"

4
mk/build.sh
View File

@ -52,7 +52,7 @@ if [ -n "${FATAL}" ]; then
fi
if [ -n "${DEBUG+xxx}" ];
if [ -v DEBUG ];
then
echo "INFO: DEBUG mode activated (verbose)"
set -x
@ -84,7 +84,7 @@ fi
production_jenkins_build()
{
#source ${XENADMIN_DIR}/mk/bumpBuildNumber.sh
source ${XENADMIN_DIR}/mk/bumpBuildNumber.sh
source ${XENADMIN_DIR}/devtools/check-roaming.sh
source ${XENADMIN_DIR}/devtools/i18ncheck/i18ncheck.sh
source ${XENADMIN_DIR}/devtools/deadcheck/deadcheck.sh

14
mk/bumpBuildNumber.sh Normal file → Executable file
View File

@ -29,7 +29,7 @@
# SUCH DAMAGE.
set -eu
echo "INFO: bump build number"
if [ $get_JOB_NAME = "devbuild" ] ; then
echo Warning: devbuild detected so we will skip the build number increment. All dev builds will have build number 0.
exit 0
@ -45,17 +45,17 @@ else
fi
url="${JENKINS_SERVER}/job/${get_JOB_NAME}/"
if curl -n -s --head --fail "${url}"; then
echo "URL exists: ${url}"
if curl -n -s --fail "${url}" -o out.tmp ; then
echo "INFO: URL exists: ${url}"
else
echo "URL does not exist: ${url}"
echo "ERROR: URL does not exist: ${url}"
exit 1
fi
NEXT_BN=$(curl -n "http://hg.uk.xensource.com/cgi/next-xenadmin?job=$get_JOB_NAME&number=$get_BUILD_NUMBER&rev=$get_REVISION")
NEXT_BN=$(curl -s -n "http://hg.uk.xensource.com/cgi/next-xenadmin?job=$get_JOB_NAME&number=$get_BUILD_NUMBER&rev=$get_REVISION")
echo NEXT_BN=${NEXT_BN}
echo "INFO: NEXT_BN=${NEXT_BN}"
curl -n --data "nextBuildNumber=${NEXT_BN}" --header "Content-Type: application/x-www-form-urlencoded" ${JENKINS_SERVER}/job/${get_JOB_NAME}/nextbuildnumber/submit
curl -s -n --data "nextBuildNumber=${NEXT_BN}" --header "Content-Type: application/x-www-form-urlencoded" ${JENKINS_SERVER}/job/${get_JOB_NAME}/nextbuildnumber/submit
set +u

4
mk/colour.sh Normal file → Executable file
View File

@ -39,7 +39,7 @@ ROOTURL=https://xenbuilder.uk.xensource.com
DEFAULT_OUTPUT=Red
#Get the cookie
curl -n -q -s -k $ROOTURL/plainlogin -o /dev/null -c /tmp/cookie$$
curl -n -s -k $ROOTURL/plainlogin -o /dev/null -c /tmp/cookie$$
#If this fails then declare the trunk red as there is a problem with the server
#otherwise try to work out the actual color of the trunk
@ -47,7 +47,7 @@ if [ $? -ne 0 ]; then
echo $DEFAULT_OUTPUT
exit 1
else
curl -n -q -s -k $ROOTURL/ -o - -b /tmp/cookie$$ | sed -ne 's/.*Trunk is.*\(Green\|Red\|Orange\).*/\1/Ip'
curl -n -s -k $ROOTURL/ -o - -b /tmp/cookie$$ | sed -ne 's/.*Trunk is.*\(Green\|Red\|Orange\).*/\1/Ip'
rm /tmp/cookie$$
fi

2
xe/Xe.csproj
View File

@ -74,6 +74,6 @@
</Target>
-->
<PropertyGroup>
<PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">"mt.exe" -manifest "$(ProjectDir)$(ProjectName).manifest" -outputresource:"$(TargetDir)..\..\bin\Release\$(TargetFileName)";#1</PostBuildEvent>
<PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">"mt.exe" -nologo -manifest "$(ProjectDir)$(ProjectName).manifest" -outputresource:"$(TargetDir)..\..\bin\Release\$(TargetFileName)";#1</PostBuildEvent>
</PropertyGroup>
</Project>

2
xva_verify/xva_verify.csproj
View File

@ -72,6 +72,6 @@
</Target>
-->
<PropertyGroup>
<PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">"mt.exe" -manifest "$(ProjectDir)$(ProjectName).manifest" -outputresource:"$(TargetDir)..\..\bin\Release\$(TargetFileName)";#1</PostBuildEvent>
<PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">mt.exe -nologo -manifest "$(ProjectDir)$(ProjectName).manifest" -outputresource:"$(TargetDir)..\..\bin\Release\$(TargetFileName)";#1</PostBuildEvent>
</PropertyGroup>
</Project>