Enabled back the exection of devtools and improved the logging

XenAdmin/XenAdmin.csproj

@@ -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)"

devtools/check-roaming.sh

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

devtools/deadcheck/deadcheck.sh

@@ -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

devtools/spellcheck/spellcheck.sh

@@ -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 )"
 

mk/build.sh

@@ -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

mk/bumpBuildNumber.sh

@@ -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
+if curl -n -s --fail "${url}" -o out.tmp ; then
-  echo "URL exists: ${url}"
+  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

mk/colour.sh

@@ -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
 

xe/Xe.csproj

@@ -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>

xva_verify/xva_verify.csproj

@@ -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>