Merge pull request #45 from timvideos/travis

Small travis fixes.

.travis.yml

@@ -1,4 +1,3 @@
-#vim :
 sudo: required
 
 language:
@@ -9,13 +8,18 @@ compiler:
 
 install:
  - wget -q -O- https://raw.githubusercontent.com/mithro/travis-trusty/master/setup.sh | bash
- - chmod a+rx $PWD/.travis-*.sh
- - /trusty/run.py $PWD/.travis-setup.sh
+ - chmod a+rx $PWD/.travis/*.sh
+ - /trusty/run.py $PWD/.travis/setup.sh
 
 script:
- - /trusty/run.py $PWD/.travis-run.sh
+ - /trusty/run.py $PWD/.travis/run.sh
 
 notifications:
-  email:
-    - [email protected]
-  irc: "irc.freenode.org#hdmi2usb"
+ email:
+  - [email protected]
+ irc:
+  channels:
+   - "chat.freenode.net#hdmi2usb"
+   - "chat.freenode.net#timvideos"
+  template:
+   - "[%{repository_slug}/%{branch}#%{build_number}] (%{commit}): %{message} (%{build_url})"

.travis-run.sh → .travis/run.sh

@@ -20,8 +20,13 @@ for BOARD in $BOARDS; do
 
 		BOARD=$BOARD TARGET=$TARGET make lm32-firmware
 		echo "---------------------------------------------"
-		BOARD=$BOARD TARGET=$TARGET make fx2-firmware
-		echo "---------------------------------------------"
+
+		# FIXME: Remove this once "make all" does what we need
+		if [ "$TARGET" = "hdmi2usb" ]; then
+			BOARD=$BOARD TARGET=$TARGET make fx2-firmware
+			echo "---------------------------------------------"
+		fi
+
 		BOARD=$BOARD TARGET=$TARGET make clean
 		echo "============================================="
 	done

.travis/setup.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -x
+set -e
+
+sudo apt-get install -y realpath
+
+# Run the script once to check it works
+time scripts/get-env.sh
+# Run the script again to check it doesn't break things
+time scripts/get-env.sh
+
+set +x
+set +e
+. scripts/setup-env.sh

scripts/get-env.sh

@@ -5,15 +5,21 @@ SETUP_SRC=$(realpath ${BASH_SOURCE[0]})
 SETUP_DIR=$(dirname $SETUP_SRC)
 TOP_DIR=$(realpath $SETUP_DIR/..)
 BUILD_DIR=$TOP_DIR/build
-CONDA_DIR=$SETUP_DIR/build/conda
 
 
 set -x
 set -e
 
-mkdir -p $BUILD_DIR
+echo "             This script is: $SETUP_SRC"
+echo "         Firmware directory: $TOP_DIR"
+echo "         Build directory is: $BUILD_DIR"
+
+if [ ! -d $BUILD_DIR ]; then
+	mkdir -p $BUILD_DIR
+fi
 
-# Get and build gcc+binutils for the target
+# gcc+binutils for the target
+CONDA_DIR=$SETUP_DIR/build/conda
 export PATH=$CONDA_DIR/bin:$PATH
 (
 	if [ ! -d $CONDA_DIR ]; then
@@ -29,59 +35,84 @@ export PATH=$CONDA_DIR/bin:$PATH
 	conda install gcc-lm32-elf
 )
 
-# Get iverilog
+# migen
+MIGEN_DIR=$BUILD_DIR/migen
 (
+	# Get iverilog
 	sudo apt-get install -y iverilog
-)
+	# Install gtkwave
+	sudo apt-get install -y gtkwave
 
-# Get migen
-(
-	cd $BUILD_DIR
-	rm -fr migen
-	git clone https://github.com/m-labs/migen.git
-	cd migen
+	if [ ! -d $MIGEN_DIR ]; then
+		cd $BUILD_DIR
+		git clone https://github.com/m-labs/migen.git
+		cd migen
+	else
+		cd $MIGEN_DIR
+		git pull
+	fi
 	cd vpi
 	make all
 	sudo make install
 )
-export PYTHONPATH=$BUILD_DIR/migen:$PYTHONPATH
+export PYTHONPATH=$MIGEN_DIR:$PYTHONPATH
 python3 -c "import migen"
 
-# Get misoc
+# misoc
+MISOC_DIR=$BUILD_DIR/misoc
 (
-	cd $BUILD_DIR
-	rm -fr misoc
-	git clone https://github.com/m-labs/misoc.git
-	cd misoc
+	if [ ! -d $MISOC_DIR ]; then
+		cd $BUILD_DIR
+		git clone https://github.com/m-labs/misoc.git
+		cd misoc
+	else
+		cd $MISOC_DIR
+		git pull
+	fi
 	git submodule init
 	git submodule update
 	cd tools
 	make
 	sudo make install
 )
-export PYTHONPATH=$BUILD_DIR/misoc:$PYTHONPATH
+export PYTHONPATH=$MISOC_DIR:$PYTHONPATH
 python3 -c "import misoclib"
 
-# Get liteeth
+# liteeth
+LITEETH_DIR=$BUILD_DIR/liteeth
 (
-	cd $BUILD_DIR
-	rm -fr liteeth
-	git clone https://github.com/enjoy-digital/liteeth.git
+	if [ ! -d $LITEETH_DIR ]; then
+		cd $BUILD_DIR
+		git clone https://github.com/enjoy-digital/liteeth.git
+		cd liteeth
+	else
+		cd $LITEETH_DIR
+		git pull
+	fi
 )
-export PYTHONPATH=$BUILD_DIR/liteeth:$PYTHONPATH
+export PYTHONPATH=$LITEETH_DIR:$PYTHONPATH
 python3 -c "import liteeth"
 
-# Get libfpgalink
+# libfpgalink
+MAKESTUFF_DIR=$BUILD_DIR/makestuff
 (
-	cd $BUILD_DIR
 	sudo apt-get install -y libreadline-dev libusb-1.0-0-dev python-yaml sdcc fxload
-	rm -fr makestuff
-	wget -qO- http://tiny.cc/msbil | tar zxf -
-	cd makestuff/libs
-	../scripts/msget.sh makestuff/libfpgalink
-	cd libfpgalink
+
+	if [ ! -d $MAKESTUFF_DIR ]; then
+		cd $BUILD_DIR
+		wget -qO- http://tiny.cc/msbil | tar zxf -
+		cd makestuff/libs
+		../scripts/msget.sh makestuff/libfpgalink
+		cd libfpgalink
+	else
+		cd $MAKESTUFF_DIR
+		cd libs/libfpgalink
+	fi
 	make deps
 )
+export LD_LIBRARY_PATH=$MAKESTUFF_DIR/libs/libfpgalink/lin.x64/rel:$LD_LIBRARY_PATH
+export PYTHONPATH=$MAKESTUFF_DIR/libs/libfpgalink/examples/python/:$PYTHONPATH
+python3 -c "import fl"
 
 USER=$(whoami)
 # Load custom udev rules
@@ -98,7 +129,5 @@ USER=$(whoami)
 	sudo apt-get install -y vizzini-dkms
 )
 
-sudo apt-get install -y gtkwave
-
 echo "Completed.  To load environment:"
 echo "source HDMI2USB-misoc-firmware/scripts/setup-env.sh"

scripts/setup-env.sh

@@ -7,12 +7,6 @@ SETUP_SRC=$(realpath ${BASH_SOURCE[0]})
 SETUP_DIR=$(dirname $SETUP_SRC)
 TOP_DIR=$(realpath $SETUP_DIR/..)
 BUILD_DIR=$TOP_DIR/build
-CONDA_DIR=$SETUP_DIR/build/conda
-
-MIGEN_DIR=$BUILD_DIR/migen
-MISOC_DIR=$BUILD_DIR/misoc
-LITEETH_DIR=$BUILD_DIR/liteeth
-MAKESTUFF_DIR=$BUILD_DIR/makestuff
 
 if [ $SOURCED = 0 ]; then
   echo "You must source this script, rather then try and run it."
@@ -24,14 +18,43 @@ if [ ! -z $HDMI2USB_ENV ]; then
   echo "Already sourced this file."
   return
 fi
-HDMI2USB_ENV=1
 
 echo "             This script is: $SETUP_SRC"
 echo "         Firmware directory: $TOP_DIR"
 echo "         Build directory is: $BUILD_DIR"
 
+if [ ! -d $BUILD_DIR ]; then
+	echo "Build directory not found!"
+	return
+fi
+
+# gcc+binutils for the target
+CONDA_DIR=$SETUP_DIR/build/conda
+export PATH=$CONDA_DIR/bin:$PATH
+
+# migen
+MIGEN_DIR=$BUILD_DIR/migen
+export PYTHONPATH=$MIGEN_DIR:$PYTHONPATH
+python3 -c "import migen" || (echo "migen broken"; return)
+
+# misoc
+MISOC_DIR=$BUILD_DIR/misoc
+export PYTHONPATH=$MISOC_DIR:$PYTHONPATH
+python3 -c "import misoclib" || (echo "misoc broken"; return)
+
+# liteeth
+LITEETH_DIR=$BUILD_DIR/liteeth
+export PYTHONPATH=$LITEETH_DIR:$PYTHONPATH
+python3 -c "import liteeth" || (echo "liteeth broken"; return)
+
+# libfpgalink
+MAKESTUFF_DIR=$BUILD_DIR/makestuff
 export LD_LIBRARY_PATH=$MAKESTUFF_DIR/libs/libfpgalink/lin.x64/rel:$LD_LIBRARY_PATH
-export PYTHONPATH=$MIGEN_DIR:$MISOC_DIR:$LITEETH_DIR:$MAKESTUFF_DIR/libs/libfpgalink/examples/python/:$PYTHONPATH
-export PATH=$CONDA_DIR/bin:/opt/Xilinx/14.7/ISE_DS/ISE/bin/lin64/:$PATH
+export PYTHONPATH=$MAKESTUFF_DIR/libs/libfpgalink/examples/python/:$PYTHONPATH
+python3 -c "import fl" || (echo "libfpgalink broken"; return)
+
+export PATH=$PATH:/opt/Xilinx/14.7/ISE_DS/ISE/bin/lin64/
 
 alias python=python3
+
+HDMI2USB_ENV=1