| ... |
... |
@@ -129,9 +129,16 @@ sub get_clang_info { |
|
129
|
129
|
}
|
|
130
|
130
|
|
|
131
|
131
|
my $fetch = YAML::XS::LoadFile('taskcluster/kinds/fetch/toolchains.yml');
|
|
132
|
|
- set_version_info("clang-$os", $fetch->{$clang_fetch}{fetch}{revision});
|
|
|
132
|
+ my ($clang_version) = $fetch->{$clang_fetch}{description} =~ m/^clang (.+) source code$/;
|
|
|
133
|
+ set_version_info("clang-${os}_version", $clang_version);
|
|
|
134
|
+ set_version_info("clang-${os}_revision", $fetch->{$clang_fetch}{fetch}{revision});
|
|
133
|
135
|
|
|
134
|
|
- set_rbm_info("clang-$os", {
|
|
|
136
|
+ set_rbm_info("clang-${os}_version", {
|
|
|
137
|
+ project => 'llvm-project',
|
|
|
138
|
+ option => 'version',
|
|
|
139
|
+ targets => [ $rbm_os_target{$os} ],
|
|
|
140
|
+ });
|
|
|
141
|
+ set_rbm_info("clang-${os}_revision", {
|
|
135
|
142
|
project => 'llvm-project',
|
|
136
|
143
|
option => 'git_hash',
|
|
137
|
144
|
targets => [ $rbm_os_target{$os} ],
|
| ... |
... |
@@ -142,17 +149,23 @@ sub get_clang_info { |
|
142
|
149
|
## cbindgen
|
|
143
|
150
|
sub get_cbindgen_info {
|
|
144
|
151
|
my $fetch = YAML::XS::LoadFile('taskcluster/kinds/fetch/toolchains.yml');
|
|
145
|
|
- my $revision;
|
|
|
152
|
+ my ($revision, $version);
|
|
146
|
153
|
T: foreach my $t (keys %$fetch) {
|
|
147
|
154
|
next unless $fetch->{$t}{'fetch-alias'};
|
|
148
|
155
|
if ($fetch->{$t}{'fetch-alias'} eq 'cbindgen') {
|
|
149
|
156
|
$revision = $fetch->{$t}{fetch}{revision};
|
|
|
157
|
+ ($version) = $t =~ m/^cbindgen-(.+)/;
|
|
150
|
158
|
last T;
|
|
151
|
159
|
}
|
|
152
|
160
|
}
|
|
153
|
161
|
return 0 unless $revision;
|
|
154
|
|
- set_version_info('cbindgen', $revision);
|
|
155
|
|
- set_rbm_info('cbindgen', {
|
|
|
162
|
+ set_version_info('cbindgen_version', $version);
|
|
|
163
|
+ set_rbm_info('cbindgen_version', {
|
|
|
164
|
+ project => 'cbindgen',
|
|
|
165
|
+ option => 'version',
|
|
|
166
|
+ });
|
|
|
167
|
+ set_version_info('cbindgen_revision', $revision);
|
|
|
168
|
+ set_rbm_info('cbindgen_revision', {
|
|
156
|
169
|
project => 'cbindgen',
|
|
157
|
170
|
option => 'git_hash',
|
|
158
|
171
|
});
|