diff --git a/.gitignore b/.gitignore index 30a162aaff34..2f32d9bf78b2 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,6 @@ testing/talos/talos/tests/devtools/damp.manifest.develop # Ignore files created when running a reftest. lextab.py + +# tup database +/.tup diff --git a/.hgignore b/.hgignore index 5a503316ccfe..b258709c7a65 100644 --- a/.hgignore +++ b/.hgignore @@ -129,3 +129,6 @@ GPATH # Ignore files created when running a reftest. ^lextab.py$ + +# tup database +^\.tup diff --git a/Makefile.in b/Makefile.in index 04cfaf39ff5b..9a1dec40d09b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -171,6 +171,10 @@ faster: install-dist/idl $(MAKE) -C faster FASTER_RECURSIVE_MAKE=1 endif +.PHONY: tup +tup: install-manifests buildid.h + @$(TUP) + # process_install_manifest needs to be invoked with --no-remove when building # js as standalone because automated builds are building nspr separately and # that would remove the resulting files. diff --git a/b2g/dev/config/tooltool-manifests/linux64/hazard.manifest b/b2g/dev/config/tooltool-manifests/linux64/hazard.manifest index f4ab1fcabc74..ad5ea4b344fa 100644 --- a/b2g/dev/config/tooltool-manifests/linux64/hazard.manifest +++ b/b2g/dev/config/tooltool-manifests/linux64/hazard.manifest @@ -24,11 +24,12 @@ "size" : 12072532 }, { -"size" : 89319524, -"digest" : "5383d843c9f28abf0a6d254e9d975d96972d2c86d627ca836fa8e272a5d53230603b387d7d1499c49df7f84b1bb946946e800a85c88d968bdbe81c755fcb02e1", -"algorithm" : "sha512", -"filename" : "rustc.tar.xz", -"unpack" : true +"version": "rustc 1.11.0 (9b21dcd6a 2016-08-15) repack", +"size": 131489924, +"digest": "59f7463a0da38f324daa4ffc2678d78afb4fe0df13248c1d215bcb996ec05e8521155563cde9a8b719a9b98c5feeaf97cc9e8d52c9b95f6b44728870d908d5b6", +"algorithm": "sha512", +"filename": "rustc.tar.xz", +"unpack": true }, { "algorithm" : "sha512", diff --git a/b2g/dev/config/tooltool-manifests/linux64/releng.manifest b/b2g/dev/config/tooltool-manifests/linux64/releng.manifest index 3af441e89851..8992eda70044 100644 --- a/b2g/dev/config/tooltool-manifests/linux64/releng.manifest +++ b/b2g/dev/config/tooltool-manifests/linux64/releng.manifest @@ -16,9 +16,9 @@ "unpack": true }, { -"version": "gecko rustc 1.10.0 (cfcb716cf 2016-07-03)", -"size": 102276708, -"digest": "8cc9ea8347fc7e6e6fdb15a8fd1faae977f1235a426b879b3f9128ec91d8f2b6268297ce80bf4eceb47738bd40bfeda13f143dc3fe85f1434b13adfbc095ab90", +"version": "rustc 1.11.0 (9b21dcd6a 2016-08-15) repack", +"size": 131489924, +"digest": "59f7463a0da38f324daa4ffc2678d78afb4fe0df13248c1d215bcb996ec05e8521155563cde9a8b719a9b98c5feeaf97cc9e8d52c9b95f6b44728870d908d5b6", "algorithm": "sha512", "filename": "rustc.tar.xz", "unpack": true diff --git a/browser/config/tooltool-manifests/linux32/releng.manifest b/browser/config/tooltool-manifests/linux32/releng.manifest index d6daa57c6bff..7363ba9be367 100644 --- a/browser/config/tooltool-manifests/linux32/releng.manifest +++ b/browser/config/tooltool-manifests/linux32/releng.manifest @@ -16,9 +16,9 @@ "unpack": true }, { -"version": "gecko rustc 1.10.0 (cfcb716cf 2016-07-03)", -"size": 102276708, -"digest": "8cc9ea8347fc7e6e6fdb15a8fd1faae977f1235a426b879b3f9128ec91d8f2b6268297ce80bf4eceb47738bd40bfeda13f143dc3fe85f1434b13adfbc095ab90", +"version": "rustc 1.11.0 (9b21dcd6a 2016-08-15) repack", +"size": 131489924, +"digest": "59f7463a0da38f324daa4ffc2678d78afb4fe0df13248c1d215bcb996ec05e8521155563cde9a8b719a9b98c5feeaf97cc9e8d52c9b95f6b44728870d908d5b6", "algorithm": "sha512", "filename": "rustc.tar.xz", "unpack": true diff --git a/browser/config/tooltool-manifests/linux64/hazard.manifest b/browser/config/tooltool-manifests/linux64/hazard.manifest index f05dcf166c5b..b7c7d7fb57a0 100644 --- a/browser/config/tooltool-manifests/linux64/hazard.manifest +++ b/browser/config/tooltool-manifests/linux64/hazard.manifest @@ -24,11 +24,12 @@ "size" : 12072532 }, { -"unpack" : true, -"digest" : "5383d843c9f28abf0a6d254e9d975d96972d2c86d627ca836fa8e272a5d53230603b387d7d1499c49df7f84b1bb946946e800a85c88d968bdbe81c755fcb02e1", -"filename" : "rustc.tar.xz", -"algorithm" : "sha512", -"size" : 89319524 +"version": "rustc 1.11.0 (9b21dcd6a 2016-08-15) repack", +"size": 131489924, +"digest": "59f7463a0da38f324daa4ffc2678d78afb4fe0df13248c1d215bcb996ec05e8521155563cde9a8b719a9b98c5feeaf97cc9e8d52c9b95f6b44728870d908d5b6", +"algorithm": "sha512", +"filename": "rustc.tar.xz", +"unpack": true }, { "filename" : "sccache.tar.bz2", diff --git a/browser/config/tooltool-manifests/linux64/releng.manifest b/browser/config/tooltool-manifests/linux64/releng.manifest index 8f00491796dd..9ca700151ff6 100644 --- a/browser/config/tooltool-manifests/linux64/releng.manifest +++ b/browser/config/tooltool-manifests/linux64/releng.manifest @@ -16,9 +16,9 @@ "unpack": true }, { -"version": "gecko rustc 1.10.0 (cfcb716cf 2016-07-03)", -"size": 102276708, -"digest": "8cc9ea8347fc7e6e6fdb15a8fd1faae977f1235a426b879b3f9128ec91d8f2b6268297ce80bf4eceb47738bd40bfeda13f143dc3fe85f1434b13adfbc095ab90", +"version": "rustc 1.11.0 (9b21dcd6a 2016-08-15) repack", +"size": 131489924, +"digest": "59f7463a0da38f324daa4ffc2678d78afb4fe0df13248c1d215bcb996ec05e8521155563cde9a8b719a9b98c5feeaf97cc9e8d52c9b95f6b44728870d908d5b6", "algorithm": "sha512", "filename": "rustc.tar.xz", "unpack": true diff --git a/browser/config/tooltool-manifests/macosx64/cross-releng.manifest b/browser/config/tooltool-manifests/macosx64/cross-releng.manifest index c90900beca5e..0ce5442a71e9 100644 --- a/browser/config/tooltool-manifests/macosx64/cross-releng.manifest +++ b/browser/config/tooltool-manifests/macosx64/cross-releng.manifest @@ -55,19 +55,11 @@ "filename": "genisoimage.tar.xz" }, { -"version": "gecko rustc 1.10.0 (cfcb716cf 2016-07-03)", -"size": 102276708, -"digest": "8cc9ea8347fc7e6e6fdb15a8fd1faae977f1235a426b879b3f9128ec91d8f2b6268297ce80bf4eceb47738bd40bfeda13f143dc3fe85f1434b13adfbc095ab90", +"version": "rustc 1.11.0 (9b21dcd6a 2016-08-15) repack", +"size": 171059204, +"digest": "7554ac993f55818827c80dab90135209e57db70c7c9131bef4309aff3b8d7452c4c0de663df7e8c46bd5702455c36292ade6c7a8007e567c4588c7f91aa88b57", "algorithm": "sha512", "filename": "rustc.tar.xz", "unpack": true -}, -{ -"size": 53754194, -"visibility": "public", -"digest": "d861a8c857e5cbc98318951b009c82cd88cbf151f1f5ad83d140e5e662b92c1ae1250c71c5d4cd29ebbcb4efa360a2ed4a6eb4db6281ecfb313038b5487eb1d2", -"algorithm": "sha512", -"filename": "rust-std-lib-x86_64-apple-darwin.tar.bz2", -"unpack": true } ] diff --git a/browser/config/tooltool-manifests/macosx64/releng.manifest b/browser/config/tooltool-manifests/macosx64/releng.manifest index 2dd433944b72..ddb845d691ca 100644 --- a/browser/config/tooltool-manifests/macosx64/releng.manifest +++ b/browser/config/tooltool-manifests/macosx64/releng.manifest @@ -8,9 +8,9 @@ "unpack": true }, { -"version": "rust 1.10 repack", -"size": 150726627, -"digest": "a30476113212895a837b2c4c18eb34d767c7192c3e327fba84c0138eaf7e671e84d5294e75370af3fe7e527a61e0938cd6cce20fba0aec94537070eb0094e27e", +"version": "rustc 1.11.0 (9b21dcd6a 2016-08-15) repack", +"size": 146060042, +"digest": "c7c5556af0dea1f97a737e4634496d407a5e0f7d14a7013746ad41ef188bab03be60cea59ed63d733dcb03bf11b05d8bf637dc0261f15cd5b0ab46d1199243cf", "algorithm": "sha512", "filename": "rustc.tar.bz2", "unpack": true diff --git a/browser/config/tooltool-manifests/win32/clang.manifest b/browser/config/tooltool-manifests/win32/clang.manifest index 5ae386cbc272..180876e9ba99 100644 --- a/browser/config/tooltool-manifests/win32/clang.manifest +++ b/browser/config/tooltool-manifests/win32/clang.manifest @@ -6,10 +6,11 @@ "filename": "mozmake.exe" }, { -"size": 78886322, -"digest": "9c2c40637de27a0852aa1166f2a08159908b23f7a55855c933087c541461bbb2a1ec9e0522df0d2b9da2b2c343b673dbb5a2fa8d30216fe8acee1eb1383336ea", +"version": "rustc 1.11.0 (9b21dcd6a 2016-08-15) repack", +"size": 86199150, +"digest": "fec209dc85a098817c892655fbfda2bd6961199b1c28422994a50daddcb219608673b87dde30b3380555400cf4484863a12d431a6a25ef01cb9b1b32bef48f8b", "algorithm": "sha512", -"filename": "rustc-beta-i686-pc-windows-msvc.tar.bz2", +"filename": "rustc.tar.bz2", "unpack": true }, { diff --git a/browser/config/tooltool-manifests/win32/releng.manifest b/browser/config/tooltool-manifests/win32/releng.manifest index cf167dfb4139..43af53c507ef 100644 --- a/browser/config/tooltool-manifests/win32/releng.manifest +++ b/browser/config/tooltool-manifests/win32/releng.manifest @@ -6,9 +6,9 @@ "filename": "mozmake.exe" }, { -"version": "rustc 1.10.0 (cfcb716cf 2016-07-03)", -"size": 88820579, -"digest": "3bc772d951bf90b01cdba9dcd0e1d131a98519dff0710bb219784ea43d4d001dbce191071a4b3824933386bb9613f173760c438939eb396b0e0dfdad9a42e4f0", +"version": "rustc 1.11.0 (9b21dcd6a 2016-08-15) repack", +"size": 86199150, +"digest": "fec209dc85a098817c892655fbfda2bd6961199b1c28422994a50daddcb219608673b87dde30b3380555400cf4484863a12d431a6a25ef01cb9b1b32bef48f8b", "algorithm": "sha512", "filename": "rustc.tar.bz2", "unpack": true diff --git a/browser/config/tooltool-manifests/win64/clang.manifest b/browser/config/tooltool-manifests/win64/clang.manifest index 0b8dea578ad1..2cfa78209182 100644 --- a/browser/config/tooltool-manifests/win64/clang.manifest +++ b/browser/config/tooltool-manifests/win64/clang.manifest @@ -6,8 +6,9 @@ "filename": "mozmake.exe" }, { -"size": 80157273, -"digest": "c4704dcc6774b9f3baaa9313192d26e36bfba2d4380d0518ee7cb89153d9adfe63f228f0ac29848f02948eb1ab7e6624ba71210f0121196d2b54ecebd640d1e6", +"version": "rustc 1.11.0 (9b21dcd6a 2016-08-15) repack", +"size": 91329933, +"digest": "db97f0186db432c57698e287798940abb5946c8903f990b087ea977fb938e83f2f9ca1bf90377bc575563af3144d429cc897a36750a1978a288a42b132c3d25d", "algorithm": "sha512", "visibility": "public", "filename": "rustc.tar.bz2", diff --git a/browser/config/tooltool-manifests/win64/releng.manifest b/browser/config/tooltool-manifests/win64/releng.manifest index e111efa801fb..b6d3a6197bf5 100644 --- a/browser/config/tooltool-manifests/win64/releng.manifest +++ b/browser/config/tooltool-manifests/win64/releng.manifest @@ -6,9 +6,9 @@ "filename": "mozmake.exe" }, { -"version": "rustc 1.10.0 (cfcb716cf 2016-07-03)", -"size": 94067220, -"digest": "05cabda2a28ce6674f062aab589b4b3758e0cd4a4af364bb9a2e736254baa10d668936b2b7ed0df530c7f5ba8ea1e7f51ff3affc84a6551c46188b2f67f10e05", +"version": "rustc 1.11.0 (9b21dcd6a 2016-08-15) repack", +"size": 91329933, +"digest": "db97f0186db432c57698e287798940abb5946c8903f990b087ea977fb938e83f2f9ca1bf90377bc575563af3144d429cc897a36750a1978a288a42b132c3d25d", "algorithm": "sha512", "visibility": "public", "filename": "rustc.tar.bz2", diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4 index dc64ce070cb4..53a2e3b4868c 100644 --- a/build/autoconf/android.m4 +++ b/build/autoconf/android.m4 @@ -323,6 +323,7 @@ case "$target" in MOZ_ANDROID_AAR(design, $ANDROID_SUPPORT_LIBRARY_VERSION, android, com/android/support) MOZ_ANDROID_AAR(recyclerview-v7, $ANDROID_SUPPORT_LIBRARY_VERSION, android, com/android/support) MOZ_ANDROID_AAR(support-v4, $ANDROID_SUPPORT_LIBRARY_VERSION, android, com/android/support, REQUIRED_INTERNAL_IMPL) + MOZ_ANDROID_AAR(palette-v7, $ANDROID_SUPPORT_LIBRARY_VERSION, android, com/android/support) ANDROID_SUPPORT_ANNOTATIONS_JAR="$ANDROID_SDK_ROOT/extras/android/m2repository/com/android/support/support-annotations/$ANDROID_SUPPORT_LIBRARY_VERSION/support-annotations-$ANDROID_SUPPORT_LIBRARY_VERSION.jar" AC_MSG_CHECKING([for support-annotations JAR]) diff --git a/devtools/client/debugger/new/index.html b/devtools/client/debugger/new/index.html index 4340a0e7a4f5..4eae02c0ab28 100644 --- a/devtools/client/debugger/new/index.html +++ b/devtools/client/debugger/new/index.html @@ -8,6 +8,9 @@
+