From 2ed302bfbbbad1d10f6c839c504ae3871fc96dc2 Mon Sep 17 00:00:00 2001 From: Nicholas Shahan Date: Thu, 4 Jun 2020 21:10:39 +0000 Subject: [PATCH] [ddc] Update ddb script to use SDK js from gen dir When running ddb with `--debug` pull the SDK .dill and .js files from ReleaseX64/gen/utils/dartdevc and require.js from third_party/require. Change-Id: Ibcfd5e1d32c39cca3583cfef14fe8393e0846d69 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/149886 Reviewed-by: Sigmund Cherem Commit-Queue: Nicholas Shahan --- pkg/dev_compiler/tool/ddb | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkg/dev_compiler/tool/ddb b/pkg/dev_compiler/tool/ddb index 71de3ebc3c8..642d148468c 100755 --- a/pkg/dev_compiler/tool/ddb +++ b/pkg/dev_compiler/tool/ddb @@ -208,18 +208,23 @@ void main(List args) async { } String ddcSdk; + String sdkJsPath; + String requirePath; + var suffix = isNnbdStrong ? p.join('sound', mod) : p.join('kernel', mod); if (debug) { var sdkRoot = p.dirname(p.dirname(ddcPath)); - var buildDir = p.join(sdkRoot, Platform.isMacOS ? 'xcodebuild' : 'out'); - dartSdk = p.join(buildDir, 'ReleaseX64', 'dart-sdk'); - ddcSdk = p.join(buildDir, 'ReleaseX64', - isNnbdStrong ? 'ddc_outline_sound.dill' : 'ddc_outline.dill'); + var buildDir = + p.join(sdkRoot, Platform.isMacOS ? 'xcodebuild' : 'out', 'ReleaseX64'); + dartSdk = p.join(buildDir, 'dart-sdk'); + ddcSdk = p.join( + buildDir, isNnbdStrong ? 'ddc_outline_sound.dill' : 'ddc_outline.dill'); + sdkJsPath = p.join(buildDir, 'gen', 'utils', 'dartdevc', suffix); + requirePath = p.join(sdkRoot, 'third_party', 'requirejs'); } else { ddcSdk = p.join(dartSdk, 'lib', '_internal', 'ddc_sdk.dill'); + sdkJsPath = p.join(dartSdk, 'lib', 'dev_compiler', suffix); + requirePath = sdkJsPath; } - var suffix = p.join('kernel', mod); - var sdkJsPath = p.join(dartSdk, 'lib', 'dev_compiler', suffix); - var requirePath = sdkJsPath; // Print an initial empty line to separate the invocation from the output. print('');