build command now uses puppeteer

.travis.yml

@@ -10,24 +10,15 @@ env:
   global:
     - EM_USE_GLOBAL_CACHE=1
 
-addons:
-  apt:
-    packages: &trusty_pocl_packages
-      - libboost-all-dev
-
 sudo: required
 
 services:
   - docker
 
-before_install:
-  - mkdir boost_includes
-  - cp -r /usr/include/boost boost_includes/
-  - docker run -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-tag-1.37.33-64bit bash
-
 install:
   - npm install
 
 script:
-  - docker exec -it emscripten npm run docker_start
-  - npm run travis_test
+  - npm run docker_start
+  - npm run compile_test
+  - npm run docker_test

package.json

@@ -4,7 +4,7 @@
 	},
 	"scripts": {
 		"start": "lerna run start ${PACKAGE:+--scope=@jpmorganchase/${PACKAGE}} --stream",
-		"docker_start": "lerna run start ${PACKAGE:+--scope=@jpmorganchase/${PACKAGE}} --stream && lerna run compile_test --stream",
+		"build": "docker run --rm -it -v $(pwd):/src -e PACKAGE=${PACKAGE} perspective/emsdk npm run start",
 		"puppeteer": "docker run -it --rm --shm-size=2g -u root -e WRITE_TESTS=${WRITE_TESTS} -v $(pwd):/src -w /src/packages/${PACKAGE} perspective/puppeteer ./node_modules/.bin/jest --runInBand",
 		"postinstall": "lerna bootstrap --hoist",
 		"test": "lerna run compile_test --stream && npm run test_perspective && npm run test_viewer && npm run test_hypergrid && npm run test_highcharts",
@@ -13,6 +13,6 @@
 		"test_hypergrid": "PACKAGE=perspective-viewer-hypergrid npm run puppeteer",
 		"test_highcharts": "PACKAGE=perspective-viewer-highcharts npm run puppeteer",
 		"write_tests": "WRITE_TESTS=1 npm run test",
-		"travis_test": "docker run -it --rm --shm-size=2g -u root -e WRITE_TESTS=${WRITE_TESTS} -v $(pwd):/src -w /src/ perspective/puppeteer ./node_modules/.bin/lerna run test"
+		"docker_test": "docker run -it --rm --shm-size=2g -u root -e WRITE_TESTS=${WRITE_TESTS} -v $(pwd):/src -w /src/ perspective/puppeteer ./node_modules/.bin/lerna run test"
 	}
 }

packages/perspective/CMakeLists.txt

@@ -13,7 +13,7 @@ list(APPEND CMAKE_PREFIX_PATH /usr/local)
 
 include_directories("${CMAKE_SOURCE_DIR}/src/include")
 include_directories("/usr/local/include")
-include_directories("/src/boost_includes")
+include_directories("/boost_includes")
 
 
 set(EXTENDED_FLAGS " \