summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml23
-rw-r--r--CMakeLists.txt2
-rw-r--r--README.md8
3 files changed, 30 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..3b84100ab
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,23 @@
+sudo: false
+language: cpp
+matrix:
+ include:
+ - addons: &gcc5
+ apt:
+ sources: ['ubuntu-toolchain-r-test']
+ packages: ['cmake', 'g++-5']
+ compiler: gcc
+ env: COMPILER_VERSION=5
+ - addons: &clang37
+ apt:
+ sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7']
+ packages: ['cmake', 'clang-3.7']
+ compiler: clang
+ env: COMPILER_VERSION=3.7
+# TODO: add before_script: update.py
+script:
+ - export CC="${CC}-${COMPILER_VERSION}"
+ - export CXX="${CXX}-${COMPILER_VERSION}"
+ - cmake .
+ - make -j2
+ # TODO: add testing.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64e675afb..3771f7090 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
PROJECT(binaryen CXX)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12.2)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src)
diff --git a/README.md b/README.md
index d27a05ca5..1cbb39af4 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,10 @@ Binaryen is a compiler and toolchain infrastructure library for WebAssembly, wri
To provide those capabilities, Binaryen has a simple and flexible API for **representing and processing** WebAssembly modules. The interpreter, validator, pretty-printer, etc. are built on that foundation. The core of this is in [wasm.h](https://github.com/WebAssembly/binaryen/blob/master/src/wasm.h), which contains classes that define a WebAssembly module, and tools to process those. For a simple example of how to use Binaryen, see [test/example/find_div0s.cpp](https://github.com/WebAssembly/binaryen/blob/master/test/example/find_div0s.cpp), which creates a module and then searches it for a specific pattern.
+Consult the [contributing instructions](Contributing.md) if you're interested in participating.
+
+Current build status: [![Build Status](https://travis-ci.org/WebAssembly/binaryen.svg?branch=master)](https://travis-ci.org/WebAssembly/binaryen)
+
## Tools
This repository contains code that builds the following tools in `bin/`:
@@ -30,9 +34,9 @@ $ ./build.sh
```
or
```
-cmake && make
+cmake . && make
```
-Note that you can also use `ninja` as your generator: `cmake -G ninja && ninja`.
+Note that you can also use `ninja` as your generator: `cmake -G ninja . && ninja`.
* `binaryen-shell` and `asm2wasm` require a C++11 compiler.
* If you also want to compile C/C++ to WebAssembly (and not just asm.js to WebAssembly), you'll need Emscripten. You'll need the `incoming` branch there (which you can get via [the SDK](http://kripken.github.io/emscripten-site/docs/getting_started/downloads.html)).