Skip to content

Commit dddc123

Browse files
committed
Bug 1318531 - Fix whitespace in tooltool manifests. r=mshal
Run the tooltool manifests through a python script to read the json as an OrderedDict and when write it back out with normal tooltool formatting options. This regularizes the whitespace, fixing trailing spaces written by older versions of the python json serializer, dos-vs-unix line endings, and regularizing opening '[{' and closing '}]' to be on separate lines. The android manifests have a 'versions' key which has indenting, unlike the rest of the files. I've left that as-is. MozReview-Commit-ID: EVW1YlgRJJL --HG-- extra : rebase_source : 40c1992090807dc40495ebacb37ee358c1d6a6f1
1 parent c4fa51a commit dddc123

File tree

17 files changed

+105
-97
lines changed

17 files changed

+105
-97
lines changed
Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
[
22
{
3-
"size" : 102421980,
4-
"digest" : "f25292aa93dc449e0472eee511c0ac15b5f1a4272ab76cf53ce5d20dc57f29e83da49ae1a9d9e994192647f75e13ae60f75ba2ac3cb9d26d5f5d6cabf88de921",
5-
"version" : "gcc 4.9.3",
6-
"unpack" : true,
7-
"filename" : "gcc.tar.xz",
8-
"algorithm" : "sha512"
3+
"size": 102421980,
4+
"digest": "f25292aa93dc449e0472eee511c0ac15b5f1a4272ab76cf53ce5d20dc57f29e83da49ae1a9d9e994192647f75e13ae60f75ba2ac3cb9d26d5f5d6cabf88de921",
5+
"version": "gcc 4.9.3",
6+
"unpack": true,
7+
"filename": "gcc.tar.xz",
8+
"algorithm": "sha512"
99
},
1010
{
11-
"unpack" : true,
12-
"algorithm" : "sha512",
13-
"filename" : "sixgill.tar.xz",
14-
"hg_id" : "8cb9c3fb039a+ tip",
15-
"digest" : "36dc644e24c0aa824975ad8f5c15714445d5cb064d823000c3cb637e885199414d7df551e6b99233f0656dcf5760918192ef04113c486af37f3c489bb93ad029",
16-
"size" : 2631908
11+
"unpack": true,
12+
"algorithm": "sha512",
13+
"filename": "sixgill.tar.xz",
14+
"hg_id": "8cb9c3fb039a+ tip",
15+
"digest": "36dc644e24c0aa824975ad8f5c15714445d5cb064d823000c3cb637e885199414d7df551e6b99233f0656dcf5760918192ef04113c486af37f3c489bb93ad029",
16+
"size": 2631908
1717
},
1818
{
19-
"algorithm" : "sha512",
20-
"filename" : "gtk3.tar.xz",
21-
"setup" : "setup.sh",
22-
"unpack" : true,
23-
"digest" : "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
24-
"size" : 12072532
19+
"algorithm": "sha512",
20+
"filename": "gtk3.tar.xz",
21+
"setup": "setup.sh",
22+
"unpack": true,
23+
"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
24+
"size": 12072532
2525
},
2626
{
2727
"version": "rustc 1.13.0 (2c6933acc 2016-11-07) repack",
@@ -32,17 +32,17 @@
3232
"unpack": true
3333
},
3434
{
35-
"algorithm" : "sha512",
36-
"filename" : "sccache.tar.bz2",
37-
"unpack" : true,
38-
"digest" : "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
39-
"size" : 167175
35+
"algorithm": "sha512",
36+
"filename": "sccache.tar.bz2",
37+
"unpack": true,
38+
"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
39+
"size": 167175
4040
},
4141
{
42-
"filename" : "moz-tt.tar.bz2",
43-
"algorithm" : "sha512",
44-
"unpack" : true,
45-
"digest" : "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
46-
"size" : 31078810
42+
"filename": "moz-tt.tar.bz2",
43+
"algorithm": "sha512",
44+
"unpack": true,
45+
"digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
46+
"size": 31078810
4747
}
4848
]

browser/config/tooltool-manifests/linux32/clang.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "clang 3.8.0, libgcc 4.8.5",
44
"size": 140319580,
55
"digest": "34e219d7e8eaffa81710631c34d21355563d06335b3c00851e94c1f42f9098788fded8463dd0f67dd699f77b47a0245dd7aff754943a7a03fb5fd145a808254f",
6-
"algorithm": "sha512",
6+
"algorithm": "sha512",
77
"filename": "clang.tar.xz",
88
"unpack": true
99
}

browser/config/tooltool-manifests/linux32/releng.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "gcc 4.8.5 + PR64905",
44
"size": 80160264,
55
"digest": "c1a9dc9da289b8528874d16300b9d13a997cec99195bb0bc46ff665216d8535d6d6cb5af6b4b1f2749af6815dab12e703fdb3849014e5c23a70eff351a0baf4e",
6-
"algorithm": "sha512",
6+
"algorithm": "sha512",
77
"filename": "gcc.tar.xz",
88
"unpack": true
99
},

browser/config/tooltool-manifests/linux64/hazard.manifest

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
[
22
{
3-
"size" : 102421980,
4-
"version" : "gcc 4.9.3",
5-
"filename" : "gcc.tar.xz",
6-
"algorithm" : "sha512",
7-
"digest" : "f25292aa93dc449e0472eee511c0ac15b5f1a4272ab76cf53ce5d20dc57f29e83da49ae1a9d9e994192647f75e13ae60f75ba2ac3cb9d26d5f5d6cabf88de921",
8-
"unpack" : true
3+
"size": 102421980,
4+
"version": "gcc 4.9.3",
5+
"filename": "gcc.tar.xz",
6+
"algorithm": "sha512",
7+
"digest": "f25292aa93dc449e0472eee511c0ac15b5f1a4272ab76cf53ce5d20dc57f29e83da49ae1a9d9e994192647f75e13ae60f75ba2ac3cb9d26d5f5d6cabf88de921",
8+
"unpack": true
99
},
1010
{
11-
"digest" : "36dc644e24c0aa824975ad8f5c15714445d5cb064d823000c3cb637e885199414d7df551e6b99233f0656dcf5760918192ef04113c486af37f3c489bb93ad029",
12-
"unpack" : true,
13-
"algorithm" : "sha512",
14-
"filename" : "sixgill.tar.xz",
15-
"size" : 2631908,
16-
"hg_id" : "8cb9c3fb039a+ tip"
11+
"digest": "36dc644e24c0aa824975ad8f5c15714445d5cb064d823000c3cb637e885199414d7df551e6b99233f0656dcf5760918192ef04113c486af37f3c489bb93ad029",
12+
"unpack": true,
13+
"algorithm": "sha512",
14+
"filename": "sixgill.tar.xz",
15+
"size": 2631908,
16+
"hg_id": "8cb9c3fb039a+ tip"
1717
},
1818
{
19-
"digest" : "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
20-
"unpack" : true,
21-
"setup" : "setup.sh",
22-
"algorithm" : "sha512",
23-
"filename" : "gtk3.tar.xz",
24-
"size" : 12072532
19+
"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
20+
"unpack": true,
21+
"setup": "setup.sh",
22+
"algorithm": "sha512",
23+
"filename": "gtk3.tar.xz",
24+
"size": 12072532
2525
},
2626
{
2727
"version": "rustc 1.13.0 (2c6933acc 2016-11-07) repack",

browser/config/tooltool-manifests/linux64/releng.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "gcc 4.8.5 + PR64905",
44
"size": 80160264,
55
"digest": "c1a9dc9da289b8528874d16300b9d13a997cec99195bb0bc46ff665216d8535d6d6cb5af6b4b1f2749af6815dab12e703fdb3849014e5c23a70eff351a0baf4e",
6-
"algorithm": "sha512",
6+
"algorithm": "sha512",
77
"filename": "gcc.tar.xz",
88
"unpack": true
99
},

browser/config/tooltool-manifests/macosx64/asan.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "clang 3.8.0",
44
"size": 133060926,
55
"digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
6-
"algorithm": "sha512",
6+
"algorithm": "sha512",
77
"filename": "clang.tar.bz2",
88
"unpack": true
99
}

browser/config/tooltool-manifests/macosx64/cross-releng.manifest

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
"unpack": true
99
},
1010
{
11-
"size": 3008804,
12-
"visibility": "public",
13-
"digest": "ba6937f14f3d8b26dcb2d39490dee6b0a8afb60f672f5debb71d7b62c1ec52103201b4b1a3d258f945567de531384b36ddb2ce4aa73dc63d72305b11c146847c",
14-
"algorithm": "sha512",
11+
"size": 3008804,
12+
"visibility": "public",
13+
"digest": "ba6937f14f3d8b26dcb2d39490dee6b0a8afb60f672f5debb71d7b62c1ec52103201b4b1a3d258f945567de531384b36ddb2ce4aa73dc63d72305b11c146847c",
14+
"algorithm": "sha512",
1515
"unpack": true,
1616
"filename": "cctools.tar.gz"
1717
},
1818
{
19-
"size": 35215976,
20-
"visibility": "internal",
21-
"digest": "8be736545ddab25ebded188458ce974d5c9a7e29f3c50d2ebfbcb878f6aff853dd2ff5a3528bdefc64396a10101a1b50fd2fe52000140df33643cebe1ea759da",
22-
"algorithm": "sha512",
19+
"size": 35215976,
20+
"visibility": "internal",
21+
"digest": "8be736545ddab25ebded188458ce974d5c9a7e29f3c50d2ebfbcb878f6aff853dd2ff5a3528bdefc64396a10101a1b50fd2fe52000140df33643cebe1ea759da",
22+
"algorithm": "sha512",
2323
"unpack": true,
2424
"filename": "MacOSX10.7.sdk.tar.bz2"
2525
},
@@ -33,18 +33,18 @@
3333
"size": 1020700
3434
},
3535
{
36-
"size": 57060,
37-
"visibility": "public",
38-
"digest": "9649ca595f4cf088d118da26201f92cc94cda7af49c7c48112ee31cd13c83b2935b3e145de9dd78060cff2480b4c2e7ff5fb24235876956fed13c87852071998",
39-
"algorithm": "sha512",
36+
"size": 57060,
37+
"visibility": "public",
38+
"digest": "9649ca595f4cf088d118da26201f92cc94cda7af49c7c48112ee31cd13c83b2935b3e145de9dd78060cff2480b4c2e7ff5fb24235876956fed13c87852071998",
39+
"algorithm": "sha512",
4040
"unpack": true,
4141
"filename": "dmg.tar.xz"
4242
},
4343
{
44-
"size": 188880,
45-
"visibility": "public",
46-
"digest": "1ffddd43efb03aed897ee42035d9d8d758a8d66ab6c867599ef755e1a586768fc22011ce03698af61454920b00fe8bed08c9a681e7bd324d7f8f78c026c83943",
47-
"algorithm": "sha512",
44+
"size": 188880,
45+
"visibility": "public",
46+
"digest": "1ffddd43efb03aed897ee42035d9d8d758a8d66ab6c867599ef755e1a586768fc22011ce03698af61454920b00fe8bed08c9a681e7bd324d7f8f78c026c83943",
47+
"algorithm": "sha512",
4848
"unpack": true,
4949
"filename": "genisoimage.tar.xz"
5050
},

mobile/android/config/tooltool-manifests/android-x86/releng.manifest

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
},
1111
{
1212
"versions": [
13-
"Android SDK 6.0 / API 23",
14-
"Android tools r24.4",
15-
"Android build tools 23.0.3",
16-
"Android Support Repository (Support Library 23.0.1)",
17-
"Google Support Repository (Google Play Services 8.1.0)"
13+
"Android SDK 6.0 / API 23",
14+
"Android tools r24.4",
15+
"Android build tools 23.0.3",
16+
"Android Support Repository (Support Library 23.0.1)",
17+
"Google Support Repository (Google Play Services 8.1.0)"
1818
],
1919
"size": 573952124,
20-
"visibility": "internal",
20+
"visibility": "internal",
2121
"digest": "1d495d7a7386af3f27b14982e0ff7b0963fd1a63a08040b9b1db0e94c9681fa3704c195ba8be23b5f73e15101b2b767293bc8f96e0584e17867ef13b074e5038",
2222
"algorithm": "sha512",
2323
"filename": "android-sdk-linux.tar.xz",

mobile/android/config/tooltool-manifests/android/releng.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"Google Support Repository (Google Play Services 8.1.0)"
1818
],
1919
"size": 573952124,
20-
"visibility": "internal",
20+
"visibility": "internal",
2121
"digest": "1d495d7a7386af3f27b14982e0ff7b0963fd1a63a08040b9b1db0e94c9681fa3704c195ba8be23b5f73e15101b2b767293bc8f96e0584e17867ef13b074e5038",
2222
"algorithm": "sha512",
2323
"filename": "android-sdk-linux.tar.xz",
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
[{
1+
[
2+
{
23
"size": 65331941,
34
"digest": "e938dda22a52eccfc2a56e4cda898cad15b9679eb9785816f3ae027983788b5a53f645ecb6a44f30f881b0ca2f69e4ab6f96da160aaca816b8f1b58d3fb20ca8",
45
"algorithm": "sha512",
56
"filename": "AVDs-armv7a-gingerbread-build-2015-08-17-ubuntu.tar.gz",
67
"unpack": true
7-
}]
8+
}
9+
]
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
[{
1+
[
2+
{
23
"size": 130236026,
34
"digest": "2f98a293895134c02c137c052bec5d9e5e2aab5051b218278b9c6f849aaf82a0a91e2302ec6d7c98e6cc27133c58436b4b2431c35c8eb7c4db03584fc7c18bd2",
45
"algorithm": "sha512",
56
"filename": "AVDs-armv7a-android-4.3.1_r1-build-2016-08-02.tar.gz",
67
"unpack": true
7-
}]
8+
}
9+
]
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
[{
1+
[
2+
{
23
"size": 276089293,
34
"digest": "a5aca63869d9ca9770b2f760923e65c08a36e4235f4bf9c422c9fd005c78b24bd7d8c74e9b8d11a4606d1d7081bd7181866f1ec50d1d87ad8de93521090d2d36",
45
"algorithm": "sha512",
56
"filename": "AVDs-armv7a-android-6.0-build-2016-08-12.tar.gz",
67
"unpack": true
7-
}]
8+
}
9+
]
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
[{
1+
[
2+
{
23
"size": 140180128,
34
"visibility": "public",
45
"digest": "09a3ef5dc9f91a80ab5f4b82200665eb30cae44681c5cbbfdbf0496b038fc44cb277041011fe77489cfb37d3715c723b67418650e503a80e4d7093094339d26f",
56
"algorithm": "sha512",
67
"filename": "AVDs-x86-android-4.2_r1-build-2016-11-18.tar.gz",
78
"unpack": true
8-
}]
9+
}
10+
]
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[
22
{
3-
"size": 1845800,
4-
"visibility": "public",
5-
"digest": "70cf423b4cc04c2a7bdb50b802e2528d517c5c5192cd94b729e7b07fc5e943c709bed2357287b5388a5332b7be31b13a0d334fded6ae7c36c12ceda1710b901a",
6-
"algorithm": "sha512",
3+
"size": 1845800,
4+
"visibility": "public",
5+
"digest": "70cf423b4cc04c2a7bdb50b802e2528d517c5c5192cd94b729e7b07fc5e943c709bed2357287b5388a5332b7be31b13a0d334fded6ae7c36c12ceda1710b901a",
6+
"algorithm": "sha512",
77
"filename": "linux32-minidump_stackwalk"
88
}
99
]
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[
22
{
3-
"size": 1737944,
4-
"visibility": "public",
5-
"digest": "76d704f0bfa110f5ea298b87200e34ec09d039b9d1a59ec819fc8e02b2cf073af32a4536dca33a3813f037a557fd0669b48a063c7a920f6308b307148029d41f",
6-
"algorithm": "sha512",
3+
"size": 1737944,
4+
"visibility": "public",
5+
"digest": "76d704f0bfa110f5ea298b87200e34ec09d039b9d1a59ec819fc8e02b2cf073af32a4536dca33a3813f037a557fd0669b48a063c7a920f6308b307148029d41f",
6+
"algorithm": "sha512",
77
"filename": "linux64-minidump_stackwalk"
88
}
99
]
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[
22
{
3-
"size": 862324,
4-
"visibility": "public",
5-
"digest": "681cf3906b294c05bdc3271e3fad0f964372a3208dc42e0fea032d194cb480239e32a5cb898d2297614c9a55afe9aa9e06797e52c8c775c67b6c4e09396b957b",
6-
"algorithm": "sha512",
3+
"size": 862324,
4+
"visibility": "public",
5+
"digest": "681cf3906b294c05bdc3271e3fad0f964372a3208dc42e0fea032d194cb480239e32a5cb898d2297614c9a55afe9aa9e06797e52c8c775c67b6c4e09396b957b",
6+
"algorithm": "sha512",
77
"filename": "macosx64-minidump_stackwalk"
88
}
99
]
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[
22
{
3-
"size": 1516544,
4-
"visibility": "public",
5-
"digest": "cf84f9592059f1e0756370f44e0ad289b71569c235d2ec8c5958695cc57352d3b99b584fd119e73fc9593d1c4cca414985e71f567f777162471b6040ebc59d13",
6-
"algorithm": "sha512",
3+
"size": 1516544,
4+
"visibility": "public",
5+
"digest": "cf84f9592059f1e0756370f44e0ad289b71569c235d2ec8c5958695cc57352d3b99b584fd119e73fc9593d1c4cca414985e71f567f777162471b6040ebc59d13",
6+
"algorithm": "sha512",
77
"filename": "win32-minidump_stackwalk.exe"
88
}
99
]

0 commit comments

Comments
 (0)