Skip to content

Commit 15f49c9

Browse files
DanTupCommit Queue
authored andcommitted
[deps] rev tools
+ update `rev_sdk_deps.dart` to work on Windows Revisions updated by `dart tools/rev_sdk_deps.dart`. tools (https://github.com/dart-lang/tools/compare/be0bd20..a433200c): a433200c Thu May 22 16:53:40 2025 +0100 Danny Tuppeny [test_reflective_loader] Pass test locations to `pkg:test` to improve IDE navigation (dart-lang/tools#2090) Change-Id: I9706a72ac850b3cd43bdeed671431cf836dcd860 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/430501 Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Reviewed-by: Devon Carew <devoncarew@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com> Commit-Queue: Devon Carew <devoncarew@google.com>
1 parent e3fe1c3 commit 15f49c9

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ vars = {
144144
"sync_http_rev": "dc54465f07d9652875deeade643256dafa2fbc6c",
145145
"tar_rev": "5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a",
146146
"test_rev": "42a6d333d96b4b0964d356b9a29ca47ccdb43691",
147-
"tools_rev": "be0bd20c803377063c45904512f272fdda94e8c3",
147+
"tools_rev": "a433200cf62b2da0a02602f138ae25d61b63739c",
148148
"vector_math_rev": "13f185f7e97d559e003f5ac79201da12f9a01049",
149149
"web_rev": "f1becf07db9faa56559d2844c3c6d430dc9b37de",
150150
"webdev_rev": "5dbb30ebc695ad2ecc01fa8eae4e0494c199e1bc",

tools/rev_sdk_deps.dart

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,14 +218,25 @@ class GitHelper {
218218
}
219219

220220
class GClientHelper {
221+
Future<String> execGclient(
222+
List<String> cmd, {
223+
String? cwd,
224+
Map<String, String>? environment,
225+
}) {
226+
return exec(
227+
[Platform.isWindows ? 'gclient.bat' : 'gclient', ...cmd],
228+
cwd: cwd,
229+
environment: environment,
230+
);
231+
}
232+
221233
Future<List<PackageDependency>> getPackageDependencies() async {
222234
// gclient revinfo --output-json=<file> --ignore-dep-type=cipd
223235

224236
final tempDir = Directory.systemTemp.createTempSync();
225237
final outFile = File(path.join(tempDir.path, 'deps.json'));
226238

227-
await exec([
228-
'gclient',
239+
await execGclient([
229240
'revinfo',
230241
'--output-json=${outFile.path}',
231242
'--ignore-dep-type=cipd',
@@ -247,9 +258,8 @@ class GClientHelper {
247258
Future<String> getHash(PackageDependency dep) async {
248259
// DEPOT_TOOLS_UPDATE=0 gclient getdep --var=path_rev
249260
var depName = dep.name;
250-
var result = await exec(
261+
var result = await execGclient(
251262
[
252-
'gclient',
253263
'getdep',
254264
'--var=${depName}_rev',
255265
],
@@ -263,9 +273,8 @@ class GClientHelper {
263273
Future<String> setHash(PackageDependency dep, String hash) async {
264274
// gclient setdep --var=args_rev=9879dsf7g9d87d9f8g7
265275
var depName = dep.name;
266-
return await exec(
276+
return await execGclient(
267277
[
268-
'gclient',
269278
'setdep',
270279
'--var=${depName}_rev=$hash',
271280
],

0 commit comments

Comments
 (0)