Merge branch 'issue_82'

.travis.yml

@@ -20,7 +20,7 @@ env:
    - ST=Pharo-3.0
    - ST=Squeak-4.3
    - ST=Squeak-4.4
-   - ST=Squeak-4.5 SCREENSHOT=30
+   - ST=Squeak-4.5
    - ST=GemStone-2.4.4.1
    - ST=GemStone-2.4.4.8
    - ST=GemStone-2.4.5

build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # build.sh -- Builds GemStone repository and Pharo/Squeak images
 #   scripts. Best to be used together with Jenkins.

build_client.sh

@@ -11,6 +11,7 @@
 
 # Environment variables now defined in .travis.yml
 
+set -e # exit on error
 # vm configuration
 case "$(uname -s)" in
 	"Linux")
@@ -235,13 +236,13 @@ if [ $pid ] ; then
                   	echo "$(basename $0): has take over 30 minutes before finishing ... terminating job"
 			exit 1
 		fi
-		let "tictoc = $COUNTER % 60"
+		tictoc=$(($COUNTER % 60))
 		if [ "$tictoc" -eq 0 ] ; then
                     echo "travis ... be patient PLEASE: https://github.com/dalehenrich/builderCI/issues/38"
         fi
 
         if [ $SCREENSHOT ]; then
-            let "tictoctuc = $COUNTER % $SCREENSHOT"
+	    tictoctuc=$(($COUNTER % $SCREENSHOT))
             if [ "$tictoctuc" -eq 0 ] ; then
                     echo "capturing and uploading screenshot ..."
                     FILENAME=$(date +%s)

build_client_image.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # build_client_image.sh -- Downloads and installs the desired Smalltalk
 #   installation: PharoCore-1-3, Pharo-1.4, Pharo-2.0, Squeak-4.3, Squeak-4.4
@@ -67,26 +67,28 @@ case "$ST" in
     unzip PharoCore-1.1.2.zip
     cd PharoCore-1.1.2
     IMAGE_BASE_NAME=PharoCore-1.1.2-11422
+    mv *.sources $SOURCES_PATH
   ;;
   # PharoCore-1.3 - don't use zeroconf script as the newer vms apparently cause package load errors...see Issue #69
   PharoCore-1.3)
-  cd $IMAGES_PATH
-  wget -q https://gforge.inria.fr/frs/download.php/30567/PharoCore-1.3-13328.zip
-  unzip PharoCore-1.3-13328.zip
-  cd PharoCore-1.3
+    cd $IMAGES_PATH
+    wget -q https://gforge.inria.fr/frs/download.php/30567/PharoCore-1.3-13328.zip
+    unzip PharoCore-1.3-13328.zip
+    cd PharoCore-1.3
+    mv *.sources $SOURCES_PATH
   ;;
   Pharo*)
     cd $IMAGES_PATH
     mkdir $ST
     cd $ST
-    wget --quiet -O - get.pharo.org/travis+vm | bash
+    wget --quiet -O - get.pharo.org/vm | bash
     wget --quiet -O - ${pharoGetURL} | bash
     IMAGE_BASE_NAME=Pharo
     # move VM to $IMAGES_PATH 
     mv pharo ..
     mv pharo-vm ..    
   ;;
-# Squeak-4.3 ... allow Squeak4.3 for backwards compatibility
+  # Squeak-4.3 ... allow Squeak4.3 for backwards compatibility
   Squeak-4.3|Squeak4.3)
     cd $IMAGES_PATH
     wget -q http://ftp.squeak.org/4.3/Squeak4.3.zip
@@ -95,6 +97,7 @@ case "$ST" in
     wget -q http://ftp.squeak.org/sources_files/SqueakV41.sources.gz
     gunzip SqueakV41.sources.gz
     IMAGE_BASE_NAME=Squeak4.3
+    mv *.sources $SOURCES_PATH
     ;;
   # Squeak-4.4
   Squeak-4.4)
@@ -108,6 +111,7 @@ case "$ST" in
     wget -q http://ftp.squeak.org/sources_files/SqueakV41.sources.gz
     gunzip SqueakV41.sources.gz
     IMAGE_BASE_NAME=Squeak4.4-12327
+    mv *.sources $SOURCES_PATH
     ;;
   # Squeak-4.5
   Squeak-4.5)
@@ -121,6 +125,7 @@ case "$ST" in
     wget -q http://ftp.squeak.org/sources_files/SqueakV41.sources.gz
     gunzip SqueakV41.sources.gz
     IMAGE_BASE_NAME=Squeak4.5-13680
+    mv *.sources $SOURCES_PATH
     ;;
   # Squeak-Trunk
   Squeak-Trunk)
@@ -132,6 +137,7 @@ case "$ST" in
     wget -q http://ftp.squeak.org/sources_files/SqueakV41.sources.gz
     gunzip SqueakV41.sources.gz
     IMAGE_BASE_NAME=TrunkImage
+    mv *.sources $SOURCES_PATH
     ;;
 
   # unknown
@@ -141,7 +147,6 @@ case "$ST" in
   esac
 
 # move the image components into the correct location
-mv *.sources $SOURCES_PATH
 mv ${IMAGE_BASE_NAME}.changes ../${IMAGE_TARGET_NAME}.changes
 mv ${IMAGE_BASE_NAME}.image ../${IMAGE_TARGET_NAME}.image
 

build_image.sh

@@ -11,6 +11,7 @@
 # Copyright (c) 2012,2013 VMware, Inc. All Rights Reserved <dhenrich@vmware.com>.
 #
 
+set -e # exit on error
 case "$ST" in
 
   Pharo*|Squeak*)

installGemstone.sh

@@ -27,6 +27,7 @@
 #    Remind user to source defSeaside
 #=========================================================================
 
+set -e # exit on error
 # Change these to change the specific version that will be installed
 # and the download location on Amazon S3.
 if [ "$1x" = "x" ] ; then

testBuilderCI.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # Test driver script for builderCI itself
 #

testTravisCI.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # Generic test driver script for builderCI
 #