Cleaned logging

mk/build.sh

@@ -54,7 +54,7 @@ fi
 
 if [ -n "${DEBUG+xxx}" ];
 then
-  echo "DEBUG mode activated (verbose)"
+  echo "INFO:	DEBUG mode activated (verbose)"
   set -x
 fi
 
@@ -111,7 +111,7 @@ private_jenkins_build()
 if [ -z "${PRIVATE_BUILD_MODE+xxx}" ]; then
     production_jenkins_build
 else
-    echo "Running private Jenkins build"
+    echo "INFO:	Running private Jenkins build"
     private_jenkins_build
 fi
 unset PRIVATE_BUILD_MODE

mk/declarations.sh

@@ -40,7 +40,7 @@
 
 if [ -n "${DEBUG+xxx}" ]; 
 then 
-	set -x
+  set -x
 fi
 
 # that's the code to get the branch name of the repository
@@ -58,25 +58,25 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 if [ -z "${JOB_NAME+xxx}" ]
 then 
     JOB_NAME="devbuild"
-    echo "Warning: JOB_NAME env var not set, we will use ${JOB_NAME}"
+    echo "WARN:	JOB_NAME env var not set, we will use ${JOB_NAME}"
 fi
 
 if [ -z "${BUILD_NUMBER+xxx}" ]
 then 
     BUILD_NUMBER="0"
-    echo "Warning: BUILD_NUMBER env var not set, we will use ${BUILD_NUMBER}"
+    echo "WARN:	BUILD_NUMBER env var not set, we will use ${BUILD_NUMBER}"
 fi
 
 if [ -z "${BUILD_ID+xxx}" ]
 then 
     BUILD_ID=$(date +"%Y-%m-%d_%H-%M-%S")
-    echo "Warning: BUILD_ID env var not set, we will use ${BUILD_ID}"
+    echo "WARN:	BUILD_ID env var not set, we will use ${BUILD_ID}"
 fi
 
 if [ -z "${BUILD_URL+xxx}" ]
 then 
     BUILD_URL="n/a"
-    echo "Warning: BUILD_URL env var not set, we will use 'n/a'"
+    echo "WARN:	BUILD_URL env var not set, we will use 'n/a'"
 fi
 
 if [ -d "$DIR/../.git" ]
@@ -84,7 +84,7 @@ then
     if [ -z "${GIT_COMMIT-}" ]
     then
         get_REVISION="none"
-	    echo "Warning: GIT_COMMIT env var not set, we will use 'none'"
+	    echo "WARN:	GIT_COMMIT env var not set, we will use 'none'"
     else
    	    get_REVISION="${GIT_COMMIT}"
     fi
@@ -93,13 +93,13 @@ then
 	if [[ $XS_BRANCH == *"/"* ]]
         then
             XS_BRANCH="trunk"
-            echo "Failed to detect XS_BRANCH we will fallback to `trunk`."
+            echo "WARN:	Failed to detect XS_BRANCH we will fallback to ${XS_BRANCH}"
         fi
 else
 	if [ -z "${MERCURIAL_REVISION+xxx}" ]
 	then 
 	    MERCURIAL_REVISION="none"
-	    echo "Warning: MERCURIAL_REVISION env var not set, we will use $MERCURIAL_REVISION"
+	    echo "WARN:	MERCURIAL_REVISION env var not set, we will use $MERCURIAL_REVISION"
 	fi
 	get_REVISION=${MERCURIAL_REVISION}
 	XS_BRANCH=`cd $DIR;hg showconfig paths.default|sed -e 's@.*carbon/\(.*\)/xenadmin.hg.*@\1@'`
@@ -107,10 +107,10 @@ fi
 
 if [ -z "${XS_BRANCH+xxx}" ]
 then
-    echo Failed to detect the branch, stopping here because this would break things much later.
+    echo "ERROR:	Failed to detect the branch, stopping here because this would break things much later."
     exit 1
 else
-    echo Running on branch: $XS_BRANCH
+    echo "INFO:	Running on branch: $XS_BRANCH"
 fi
 
 #rename Jenkins environment variables to distinguish them from ours; remember to use them as get only
@@ -124,7 +124,7 @@ if [ -z "${WORKSPACE+xxx}" ]
 then 
     DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
     WORKSPACE="${DIR}"
-    echo "Warning: WORKSPACE env var not set, we will use ${WORKSPACE}"
+    echo "WARN:	WORKSPACE env var not set, we will use ${WORKSPACE}"
 fi
 
 if which cygpath >/dev/null; then
@@ -133,7 +133,7 @@ else
     ROOT=${WORKSPACE}
 fi
 
-echo "Workspace located in: $ROOT"
+echo "INFO:	Workspace located in: $ROOT"
 REPO=${XENADMIN_DIR}
 REF_REPO=${ROOT}/xenadmin-ref.hg
 SCRATCH_DIR=${ROOT}/scratch

mk/xenadmin-build.sh

@@ -348,6 +348,7 @@ mv -f ${WIX}/vnccontrol.wxs.tmp ${WIX}/vnccontrol.wxs
 compile_installer "VNCControl" "en-us" && sign_msi "VNCControl"
 
 #build the tests
+echo "INFO: Build the tests..."
 cd ${REPO}/XenAdminTests && $MSBUILD
 #this script is used by XenRT
 cp ${REPO}/mk/xenadmintests.sh ${REPO}/XenAdminTests/bin/Release/
@@ -385,7 +386,7 @@ cp ${REPO}/XenAdmin/bin/Release/{XS56EFP1002,XS56E008,XS60E001,XS62E006,XS65ESP1
    ${REPO}/XenServerHealthCheck/bin/Release/XenServerHealthCheck.pdb \
    ${OUTPUT_DIR}
 
-#create english iso files
+echo "INFO:	Create English iso files"
 ISO_DIR=${SCRATCH_DIR}/iso-staging
 mkdir_clean ${ISO_DIR}
 install -m 755 ${EN_CD_DIR}/XenCenterSetup.exe ${ISO_DIR}/XenCenterSetup.exe
@@ -393,7 +394,7 @@ cp ${REPO}/mk/ISO_files/* ${ISO_DIR}
 cp ${EN_CD_DIR}/XenCenter.ico ${ISO_DIR}/XenCenter.ico
 mkisofs -J -r -v -hfs -probe -publisher "${COMPANY_NAME_LEGAL}" -p "${COMPANY_NAME_LEGAL}" -V "XenCenter" -o "${OUTPUT_DIR}/XenCenter.iso" "${ISO_DIR}"
 
-#create l10n iso file
+echo "INFO:	Create l10n iso file"
 L10N_ISO_DIR=${SCRATCH_DIR}/l10n-iso-staging
 mkdir_clean ${L10N_ISO_DIR}
 # -o root -g root 
@@ -434,7 +435,7 @@ fi
 echo "xc_product_version=${XC_PRODUCT_VERSION}" >> ${OUTPUT_DIR}/xcversion
 echo "build_number=${BUILD_NUMBER}" >> ${OUTPUT_DIR}/xcversion
 
-echo "Build phase succeeded at "
+echo "INFO:	Build phase succeeded at "
 date
 
 set +u