travis: add bash, c, make to test matrix.

diff --git a/.travis.yml b/.travis.yml
index 01578a5..77e4244 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,10 @@ services:
     - docker
 
 env:
+    - IMPL=bash
+    - IMPL=c
     - IMPL=js
+    - IMPL=make
     - IMPL=python
 
 script:

diff --git a/bash/Dockerfile b/bash/Dockerfile
new file mode 100644 (file)
index 0000000..71720eb
--- /dev/null
+++ b/bash/Dockerfile
@@ -0,0 +1,24 @@
+FROM ubuntu:vivid
+MAINTAINER Joel Martin <github@martintribe.org>
+
+##########################################################
+# General requirements for testing or common across many
+# implementations
+##########################################################
+
+RUN apt-get -y update
+
+# Required for running tests
+RUN apt-get -y install make python
+
+# Some typical implementation and test requirements
+RUN apt-get -y install curl libreadline-dev libedit-dev
+
+RUN mkdir -p /mal
+WORKDIR /mal
+
+##########################################################
+# Specific implementation requirements
+##########################################################
+
+# Nothing additional needed for bash

diff --git a/bash/Makefile b/bash/Makefile
index dc1d1ad..42e91ac 100644 (file)
--- a/bash/Makefile
+++ b/bash/Makefile
@@ -5,7 +5,6 @@ SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 all: mal.sh
 
 mal.sh: $(SOURCES)
-       cat $+ > $@
        echo "#!/usr/bin/env bash" > $@
        cat $+ | grep -v "^source " >> $@
        chmod +x $@

diff --git a/c/Dockerfile b/c/Dockerfile
new file mode 100644 (file)
index 0000000..3322e5d
--- /dev/null
+++ b/c/Dockerfile
@@ -0,0 +1,28 @@
+FROM ubuntu:vivid
+MAINTAINER Joel Martin <github@martintribe.org>
+
+##########################################################
+# General requirements for testing or common across many
+# implementations
+##########################################################
+
+RUN apt-get -y update
+
+# Required for running tests
+RUN apt-get -y install make python
+
+# Some typical implementation and test requirements
+RUN apt-get -y install curl libreadline-dev libedit-dev
+
+RUN mkdir -p /mal
+WORKDIR /mal
+
+##########################################################
+# Specific implementation requirements
+##########################################################
+
+# Install g++ so that it's common with C++ Dockerfile
+RUN apt-get -y install g++
+
+# Libraries needed for the C impl
+RUN apt-get -y install libglib2.0 libglib2.0-dev libffi-dev

diff --git a/js/Dockerfile b/js/Dockerfile
index c7d9040..0559f7a 100644 (file)
--- a/js/Dockerfile
+++ b/js/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get -y update
 RUN apt-get -y install make python
 
 # Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline6-dev
+RUN apt-get -y install curl libreadline-dev libedit-dev
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -21,6 +21,9 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
+# For building node modules
+RUN apt-get -y install g++
+
 # Add nodesource apt repo config for 0.12 stable
 RUN curl -sL https://deb.nodesource.com/setup_0.12 | bash -
 
@@ -32,5 +35,3 @@ RUN ln -sf nodejs /usr/bin/node
 
 ENV NPM_CONFIG_CACHE /mal/.npm
 
-# For building modules
-RUN apt-get -y install g++

diff --git a/make/Dockerfile b/make/Dockerfile
new file mode 100644 (file)
index 0000000..5f61062
--- /dev/null
+++ b/make/Dockerfile
@@ -0,0 +1,24 @@
+FROM ubuntu:vivid
+MAINTAINER Joel Martin <github@martintribe.org>
+
+##########################################################
+# General requirements for testing or common across many
+# implementations
+##########################################################
+
+RUN apt-get -y update
+
+# Required for running tests
+RUN apt-get -y install make python
+
+# Some typical implementation and test requirements
+RUN apt-get -y install curl libreadline-dev libedit-dev
+
+RUN mkdir -p /mal
+WORKDIR /mal
+
+##########################################################
+# Specific implementation requirements
+##########################################################
+
+# Nothing additional needed for make

diff --git a/python/Dockerfile b/python/Dockerfile
index f296cc3..d101d2e 100644 (file)
--- a/python/Dockerfile
+++ b/python/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get -y update
 RUN apt-get -y install make python
 
 # Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline6-dev
+RUN apt-get -y install curl libreadline-dev libedit-dev
 
 RUN mkdir -p /mal
 WORKDIR /mal

diff --git a/python/Makefile b/python/Makefile
index f3406b5..0adea10 100644 (file)
--- a/python/Makefile
+++ b/python/Makefile
@@ -6,19 +6,16 @@ SOURCES_BASE = mal_readline.py mal_types.py reader.py printer.py
 SOURCES_LISP = env.py core.py stepA_mal.py
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
-all:
+all: mal.py
        true
 
-#all: mal.sh
-#
-#mal.sh: $(SOURCES)
-#      cat $+ > $@
-#      echo "#!/bin/bash" > $@
-#      cat $+ | grep -v "^source " >> $@
-#      chmod +x $@
-#
-#clean:
-#      rm -f mal.sh
+mal.py: stepA_mal.py
+       echo "#!/usr/bin/env python" > $@
+       cat $+ >> $@
+       chmod +x $@
+
+clean:
+       rm -f mal.py
 
 .PHONY: stats tests $(TESTS)