Run bindgen in build.rs

Author: Alan Jeffrey

.travis.yml

@@ -1,19 +1,31 @@
 language: rust
 rust:
   - nightly
+  - beta
+  - stable
 sudo: 9000
 dist: trusty
 
 os:
   - linux
   - osx
 
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+      - llvm-toolchain-trusty-5.0
+    packages:
+      - g++-6
+      - clang-5.0
+
 env:
   - FEATURES=""
   - FEATURES="--features debugmozjs"
 
 script:
   - cargo build --verbose --verbose $FEATURES
+  - cargo test $FEATURES
 
 before_install:
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install yasm; fi

Cargo.toml

@@ -21,8 +21,11 @@ promises = []
 
 [lib]
 name = "mozjs_sys"
-path = "lib.rs"
 
 [dependencies]
 libc = "0.2"
 libz-sys = "1.0"
+
+[build-dependencies]
+bindgen = "0.36.1"
+cc = "1.0"

README.md

@@ -1,13 +1,61 @@
-This repository contains the sources of [SpiderMonkey][sm] for use with
+This repository contains Rust bindings for [SpiderMonkey][sm] for use with
 [Servo][s].
 
 [sm]: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
 [s]: https://servo.org/
 
-The bindings are in the [rust-mozjs repository][r-m].
+The bindings are to the raw SpiderMonkey API, higher-level bindings
+are in the [rust-mozjs repository][r-m].
 
 [r-m]: https://github.com/servo/rust-mozjs/
 
+Building
+========
+
+Under Linux:
+
+Install Clang (at least version 3.9), for example in a Debian-based Linux:
+```
+sudo apt-get install clang-6.0
+```
+
+If you have more than one version of Clang installed, you can set the `LIBCLANG_PATH`
+environment variable, for example:
+```
+export LIBCLANG_PATH=/usr/lib/clang/4.0/lib
+```
+
+Under Windows:
+
+1. Follow the directions at
+   https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Build_Instructions/Windows_Prerequisites
+
+2. Open up a shell configured to use Visual Studio. This could be the
+   one included with Visual Studio (e.g. Visual Studio 2017 / X64 Native
+   Tools Command Prompt for VS 2017) or a shell in which you have run
+```
+"c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
+```
+
+3. Set the `MOZTOOLS_PATH` environment variable to point to the tools from the Mozilla Build Package:
+```
+set MOZTOOLS_PATH=C:\mozilla-build\msys\bin;C:\mozilla-build\mozmake;C:\mozilla-build\yasm
+```
+
+4. Download and install Clang for Windows (64 bit) from https://releases.llvm.org/download.html
+   and set the `LIBCLANG_PATH` environment variable to its `lib` directory:
+```
+set LIBCLANG_PATH=C:\Program Files\LLVM\lib
+```
+
+You can now build and test the crate using cargo:
+```
+cargo build
+cargo test
+cargo build --features debugmozjs
+cargo test --features debugmozjs
+```
+
 Upgrading
 =========
 
@@ -17,12 +65,6 @@ In order to upgrade to a new version of SpiderMonkey:
    from [treeherder's SM-tc(pkg) job][tc].
 2. Update `etc/COMMIT`.
 3. Run `python3 ./etc/update.py path/to/tarball`.
-4. Clone and build the [`servo/rust-bindgen`][bindgen] repository with llvm 3.9
-   or newer.
-4. Clone the [`servo/rust-mozjs`][r-m] repository.
-5. For each supported platform (linux 32, linux 64, macos 64, windows gcc and msvc 64):
-    * `$ cd path/to/rust-mozjs`
-    * `$ ./etc/bindings-all.py <platform> ../path/to/bindgen ../path/to/clang/libs`
 
 [bindgen]: https://github.com/servo/rust-bindgen
 [tc]: https://treeherder.mozilla.org/#/jobs?repo=mozilla-central&filter-searchStr=Linux%20x64%20opt%20Spider%20Monkey,%20submitted%20by%20taskcluster%20%5BTC%5D%20Spidermonkey%20Package%20SM-tc(pkg)

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
@@ -26,8 +27,8 @@ environment:
     C:\\Program Files\\Git\\usr\\bin;\
     C:\\Program Files\\AppVeyor\\BuildAgent;"
   matrix:
-  - TARGET: nightly-x86_64-pc-windows-msvc
-  - TARGET: nightly-x86_64-pc-windows-gnu
+    - CARGO_OPTS: ""
+    - CARGO_OPTS: "--release"
 
 # Uncomment to enable RDP & wait for exit.  Connection info will be printed in the log.
 #init:
@@ -37,35 +38,21 @@ 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 %TARGET:*-gnu=gnu%==gnu set BUILD_ENV=gnu
-  - 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
-  - if %BUILD_ENV%==gnu  set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin\;%PATH%
-  - if %BUILD_ENV%==gnu  set MSYSTEM=MINGW64
-  - if %BUILD_ENV%==gnu  set MSYS=winsymlinks=lnk
-  - if %BUILD_ENV%==gnu  bash -lc "echo $MSYSTEM; pacman --needed --noconfirm -Sy pacman-mirrors"
-  - if %BUILD_ENV%==gnu  bash -lc "pacman --noconfirm -Sy"
-  - if %BUILD_ENV%==gnu  bash -lc "pacman -Sy --needed --noconfirm git mingw-w64-x86_64-toolchain tar make python2-setuptools"
-  - if %BUILD_ENV%==gnu  bash -lc "easy_install-2.7 pip virtualenv"
-  - if %BUILD_ENV%==gnu  bash -lc "mv /mingw64/bin/python2.exe /mingw64/bin/python2-mingw64.exe"
-  - if %BUILD_ENV%==gnu  bash -lc "mv /mingw64/bin/python2.7.exe /mingw64/bin/python2.7-mingw64.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
   - 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 --verbose --verbose
-  - if %BUILD_ENV%==gnu  bash -lc "cd $APPVEYOR_BUILD_FOLDER; cargo build --verbose --verbose"
-
+  - cd %APPVEYOR_BUILD_FOLDER% && cargo build --verbose --verbose %CARGO_OPTS% && cargo test %CARGO_OPTS%