Rebuild halide and update build script for ubuntu 15.04

Dockerfile

-FROM ubuntu:14.10
+FROM ubuntu:15.04
 MAINTAINER smvv@kompiler.org
 
 RUN apt-get update \
 && apt-get install -y \
+cmake \
 clang \
-libtbb-dev \
 llvm-3.5-dev \
-wget
+wget \
+zlib1g-dev \
+libedit-dev
 
-ADD install_halide.sh /root/install_halide.sh
+RUN cd /root; \
+    wget --progress=dot:mega \
+        https://github.com/halide/Halide/archive/master.tar.gz; \
+    tar xzf master.tar.gz;
 
-RUN /root/install_halide.sh
+ADD build_halide.sh /root/build_halide.sh
+
+RUN /root/build_halide.sh
+
+RUN cd /root/Halide-master/build; \
+    mkdir -p /usr/local/include /usr/local/lib; \
+    cp lib/* /usr/local/lib/; \
+    cp include/* /usr/local/include/;

build_halide.sh

+#!/bin/bash -ex
+cd /root/;
+
+cd Halide-master;
+
+mkdir build;
+cd build;
+
+export LLVM_ROOT=/usr/lib/llvm-3.6
+
+cmake \
+    -DLLVM_BIN=${LLVM_ROOT}/bin \
+    -DLLVM_INCLUDE=${LLVM_ROOT}/include \
+    -DLLVM_LIB=${LLVM_ROOT}/lib \
+    -DLLVM_VERSION=36 \
+    ..
+
+make -j4

makefile

 DOCKER ?= docker
 
 image:
-	$(DOCKER) build -t smvv/halide_2014_10_09 .
+	$(DOCKER) build -t smvanveen/halide:20150801 .