Bug 1503401 - Update cbindgen due to breaking change. r=boris
authorEmilio Cobos Álvarez <emilio@crisal.io>
Tue, 30 Oct 2018 21:25:17 +0000
changeset 443588 5b0e4820c7fbd5c21451c9e72b103b5555664e3a
parent 443587 9ab9c35d407ba407ae1edec92a78c4fcf49a0151
child 443589 14ada2e7ed73f02a845c2656bf4d5cc80b32d205
push id34963
push useraciure@mozilla.com
push dateWed, 31 Oct 2018 05:07:31 +0000
treeherdermozilla-central@9e08e4f36d5e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersboris
bugs1503401
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1503401 - Update cbindgen due to breaking change. r=boris https://github.com/eqrion/cbindgen/pull/233 changed the way one of the options we use work. I think the new behavior is better, but we should do this sooner rather than later, and fix broken builds. Differential Revision: https://phabricator.services.mozilla.com/D10301
build/moz.configure/rust.configure
python/mozboot/mozboot/osx.py
servo/components/style/cbindgen.toml
taskcluster/scripts/misc/build-cbindgen.sh
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -289,17 +289,17 @@ cbindgen = check_prog('CBINDGEN', add_ru
                       when=depends(build_project)
                       (lambda build_project: build_project != 'js'))
 
 
 @depends_if(cbindgen)
 @checking('cbindgen version')
 @imports(_from='textwrap', _import='dedent')
 def cbindgen_version(cbindgen):
-    cbindgen_min_version = Version('0.6.6')
+    cbindgen_min_version = Version('0.6.7')
 
     # cbindgen x.y.z
     version = Version(check_cmd_output(cbindgen, '--version').strip().split(" ")[1])
 
     if version < cbindgen_min_version:
         die(dedent('''\
         cbindgen version {} is too old. At least version {} is required.
 
--- a/python/mozboot/mozboot/osx.py
+++ b/python/mozboot/mozboot/osx.py
@@ -498,17 +498,17 @@ class OSXBootstrapper(BaseBootstrapper):
             for check in ('/bin', '/usr/bin'):
                 if path == check:
                     print(BAD_PATH_ORDER % (check, p_dir, p_dir, check, p_dir))
                     sys.exit(1)
 
         return active_name.lower()
 
     def ensure_stylo_packages(self, state_dir, checkout_root):
-        cbindgen_min_version = '0.6.6'
+        cbindgen_min_version = '0.6.7'
         # We installed clang via homebrew earlier.
         self.ensure_rust_package('cbindgen', cbindgen_min_version)
 
     def ensure_node_packages(self, state_dir, checkout_root):
         # XXX from necessary?
         from mozboot import node
         self.install_toolchain_artifact(state_dir, checkout_root, node.OSX)
 
--- a/servo/components/style/cbindgen.toml
+++ b/servo/components/style/cbindgen.toml
@@ -33,24 +33,24 @@ include = ["cssparser"]
 derive_eq = true
 
 [enum]
 derive_helper_methods = true
 
 [export]
 prefix = "Style"
 include = [
-  "StyleAppearance",
-  "StyleComputedFontStretchRange",
-  "StyleComputedFontStyleDescriptor",
-  "StyleComputedFontWeightRange",
-  "StyleComputedTimingFunction",
-  "StyleDisplay",
-  "StyleDisplayMode",
-  "StyleFillRule",
-  "StyleFontDisplay",
-  "StyleFontFaceSourceListComponent",
-  "StyleFontLanguageOverride",
-  "StyleTimingFunction",
-  "StylePathCommand",
-  "StyleUnicodeRange",
+  "Appearance",
+  "ComputedFontStretchRange",
+  "ComputedFontStyleDescriptor",
+  "ComputedFontWeightRange",
+  "ComputedTimingFunction",
+  "Display",
+  "DisplayMode",
+  "FillRule",
+  "FontDisplay",
+  "FontFaceSourceListComponent",
+  "FontLanguageOverride",
+  "TimingFunction",
+  "PathCommand",
+  "UnicodeRange",
 ]
 item_types = ["enums", "structs", "typedefs"]
--- a/taskcluster/scripts/misc/build-cbindgen.sh
+++ b/taskcluster/scripts/misc/build-cbindgen.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 set -x -e -v
 
 # If you update this, make sure to update the minimum version in
 # build/moz.configure/rust.configure and python/mozboot/mozboot/osx.py as well.
-CBINDGEN_VERSION=v0.6.6
+CBINDGEN_VERSION=v0.6.7
 TARGET="$1"
 
 case "$(uname -s)" in
 Linux)
     WORKSPACE=$HOME/workspace
     UPLOAD_DIR=$HOME/artifacts
     COMPRESS_EXT=xz
     ;;