Auto merge of #430 - asajeffrey:smup, r=jdm

Upgrade to SM 60

This is the mozjs_sys smup PR. Depends on servo/mozjs#138.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-mozjs/430)
<!-- Reviewable:end -->

.travis.yml

@@ -1,18 +1,32 @@
 language: rust
-sudo: 9000
-dist: trusty
 rust:
   - nightly
+  - beta
+  - stable
+sudo: 9000
+dist: trusty
 os:
   - linux
   - osx
+osx_image: xcode9.3
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+      - llvm-toolchain-trusty-5.0
+    packages:
+      - autoconf2.13
+      - g++-6
+      - clang-5.0
 
 env:
   - FEATURES=""
   - FEATURES="--features debugmozjs"
 
-before_install:
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install ccache yasm; fi
+before_script:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CC=gcc-6; export CXX=g++-6; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install autoconf@2.13 ccache yasm; fi
 
 script:
   - ccache -z

Cargo.toml

@@ -2,7 +2,7 @@
 name = "mozjs"
 description = "Rust bindings to the Mozilla SpiderMonkey JavaScript engine."
 repository = "https://github.com/servo/rust-mozjs"
-version = "0.7.2"
+version = "0.8.0"
 authors = ["The Servo Project Developers"]
 build = "build.rs"
 license = "MPL-2.0"
@@ -31,6 +31,8 @@ name = "runtime"
 [[test]]
 name = "typedarray"
 [[test]]
+name = "typedarray_panic"
+[[test]]
 name = "stack_limit"
 [[test]]
 name = "vec_conversion"
@@ -40,11 +42,10 @@ doctest = false
 
 [features]
 debugmozjs = ['mozjs_sys/debugmozjs']
-promises = ['mozjs_sys/promises']
 
 [dependencies]
 lazy_static = "1"
 libc = "0.2"
 log = "0.4"
 num-traits = "0.2"
-mozjs_sys = "0.51.1"
+mozjs_sys = "0.60.0"

README.md

@@ -4,30 +4,4 @@ Rust bindings to SpiderMonkey
 
 [Documentation](http://doc.servo.org/mozjs/)
 
-## Setting up your environment
-
-### Rust
-
-This project requires Rust nightly-2018-03-25 or greater.
-For installation of the Rust toolchain see [`https://rustup.rs/`](https://rustup.rs/).
-
-### Other dependencies
-
-#### macOS
-#### On macOS (Homebrew)
-
-```sh
-brew install automake pkg-config python2 cmake yasm
-```
-
-## Building the project
-
-```sh
-cargo build
-```
-
-## Testing the project
-
-```sh
-cargo test
-```
+See https://github.com/servo/mozjs/blob/master/README.md for build instructions.

appveyor.yml

@@ -1,4 +1,5 @@
 version: 1.0.{build}
+image: Visual Studio 2017
 
 environment:
   # The appveyor image we use has a pretty huge set of things installed... we make the
@@ -25,9 +26,6 @@ environment:
     C:\\Program Files\\Git\\cmd;\
     C:\\Program Files\\Git\\usr\\bin;\
     C:\\Program Files\\AppVeyor\\BuildAgent;"
-  RUST_BACKTRACE: "1"
-  matrix:
-  - TARGET: nightly-x86_64-pc-windows-msvc
 
 # Uncomment to enable RDP & wait for exit.  Connection info will be printed in the log.
 #init:
@@ -37,23 +35,22 @@ environment:
 
 # called after cloning, before building
 install:
+  - set BUILD_ENV=msvc
+  - set TARGET=nightly-x86_64-pc-windows-msvc
   - ps: Start-FileDownload "http://servo-rust.s3.amazonaws.com/build/MozillaBuildSetup-2.2.0.exe"
   - ps: .\MozillaBuildSetup-2.2.0.exe /S | Out-Null
   - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:TARGET}.exe" -FileName "rust-install.exe"
   - ps: .\rust-install.exe /VERYSILENT /NORESTART /DIR="C:\rust" | Out-Null
   - ps: $env:PATH="$env:PATH;C:\rust\bin"
-# I can't make this work with a multi-line script (e.g. via |+ etc.), so we copy the if before every command
-  - if %TARGET:*-msvc=msvc%==msvc set BUILD_ENV=msvc
-  - if %BUILD_ENV%==msvc call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
-  - if %BUILD_ENV%==msvc copy C:\mozilla-build\yasm\yasm.exe C:\mozilla-build\msys\bin
-  - if %BUILD_ENV%==msvc copy C:\mozilla-build\mozmake\mozmake.exe C:\mozilla-build\msys\bin
-  - if %BUILD_ENV%==msvc set MOZTOOLS_PATH=C:\mozilla-build\msys\bin
-  - if %BUILD_ENV%==msvc set NATIVE_WIN32_PYTHON=C:/Python27/python.exe
+  - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+  - set MOZTOOLS_PATH=C:\mozilla-build\msys\bin;C:\mozilla-build\mozmake;C:\mozilla-build\yasm
+  - set NATIVE_WIN32_PYTHON=C:/Python27/python.exe
+  - set AUTOCONF=C:/mozilla-build/msys/local/bin/autoconf-2.13
   - rustc -vV
   - cargo -vV
 
 build_script:
   - echo PATH %PATH%
   - echo VSINSTALLDIR %VSINSTALLDIR%
   - echo MOZTOOLS_PATH %MOZTOOLS_PATH%
-  - if %BUILD_ENV%==msvc cd %APPVEYOR_BUILD_FOLDER% && cargo build && cargo test
+  - cd %APPVEYOR_BUILD_FOLDER% && cargo build --verbose --verbose && cargo test

build.rs

@@ -44,7 +44,7 @@ fn main() {
     } else {
         build.flag("-fPIC");
         build.flag("-fno-rtti");
-        build.flag("-std=c++11");
+        build.flag("-std=c++14");
         build.define("JS_NO_JSVAL_JSID_STRUCT_TYPES", "");
         build.flag("-include");
         build.flag(&confdefs_path.to_string_lossy());