put build back to tviewsrv

scripts/build_config.sh

@@ -91,8 +91,8 @@ function _config_source_file
 # no  = FALSEHOOD
 
 # config for the master build script
-#ZMAP_MASTER_HOST=tviewsrv
-ZMAP_MASTER_HOST=deskpro16113
+ZMAP_MASTER_HOST=tviewsrv
+#ZMAP_MASTER_HOST=deskpro16113
 ZMAP_MASTER_BUILD_DOCS=yes
 ZMAP_MASTER_BUILD_DOXYGEN_DOCS=yes
 ZMAP_MASTER_BUILD_DIST=yes
@@ -106,8 +106,8 @@ ZMAP_MASTER_NOTIFY_MAIL=zmapdev@sanger.ac.uk
 ZMAP_MASTER_BUILD_CANVAS_DIST=no
 
 ZMAP_CLUSTER_CONFIG_FILE=~zmap/cluster.config.sh
-#ZMAP_BUILD_MACHINES="tviewsrv mac18480i cbi4"
-ZMAP_BUILD_MACHINES="deskpro16113 mac18480i cbi4"
+ZMAP_BUILD_MACHINES="tviewsrv mac18480i cbi4"
+#ZMAP_BUILD_MACHINES="deskpro16113 mac18480i cbi4"
 ZMAP_SSH_OPTIONS="-oStrictHostKeyChecking=no \
 -oConnectTimeout=3 \
 -oSetupTimeOut=3 \
@@ -154,8 +154,8 @@ ZMAP_WEBSITE_SINGLE_FILES="src/zmapServer/acedb/models.wrm:user_doc/models.wrm.s
 WEBROOT=/nfs/WWWdev/SANGER_docs/htdocs
 WEBUSER=zmap
 # Should be the machine where /nfs/WWWdev is exported!
-#WEBHOST=tviewsrv
-WEBHOST=deskpro16113
+WEBHOST=tviewsrv
+#WEBHOST=deskpro16113
 ZMAP_WEBSITE_TARGET=$WEBROOT/Software/analysis/ZMap
 
 # bootstrap (autotools locations)

scripts/zmap_build_rt_release_notes.sh

@@ -218,8 +218,8 @@ $NO_RELEASE_B
 EOF
 
 # Can no longer run on scratchy.. rt is now installed in /software/acedb/bin for i386
-#RTSERVER=tviewsrv
-RTSERVER=deskpro16113
+RTSERVER=tviewsrv
+#RTSERVER=deskpro16113
 RTHTTPSERVER="https://rt.sanger.ac.uk"
 RTUSER=zmap
 RTRESULTS=rt_tickets.out

scripts/zmap_do_build.sh

@@ -9,8 +9,8 @@
 # Configuring variables
 
 # ================== CONFIG ================== 
-#SRC_MACHINE=tviewsrv
-SRC_MACHINE=deskpro16113
+SRC_MACHINE=tviewsrv
+#SRC_MACHINE=deskpro16113
 CVS_CHECKOUT_SCRIPT=./build_bootstrap.sh
 GLOBAL_LOG=~/BUILDS/latest.build.log
 ERROR_RECIPIENT=zmapdev@sanger.ac.uk