Sigurd Meldgaard
ce272daae8
Before `dart run` would always use the package config found by looking up the hierarchy from whatever we got from getExecutableForCommand. When that happened to be a precompiled snapshot this would work, because it would be ignored. But if it would be a dart-file in another package (that would happen if that package is not cached) we instead should resolve it relatively to the current working directory (where the pubspec.yaml is also found). Bug: https://github.com/dart-lang/sdk/issues/44214 Change-Id: Ib2e929c01ddc72babbcff91560236e08429f09f7 TEST=The new package config behavior is tested by the new test in: pkg/dartdev/test/commands/run_test.dart. Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/172181 Commit-Queue: Sigurd Meldgaard <sigurdm@google.com> Reviewed-by: Martin Kustermann <kustermann@google.com> Reviewed-by: Jonas Jensen <jonasfj@google.com>
104 lines
2.9 KiB
C++
104 lines
2.9 KiB
C++
// Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
#ifndef RUNTIME_BIN_DARTDEV_ISOLATE_H_
|
|
#define RUNTIME_BIN_DARTDEV_ISOLATE_H_
|
|
|
|
#if !defined(DART_PRECOMPILED_RUNTIME)
|
|
|
|
#include <memory>
|
|
|
|
#include "bin/thread.h"
|
|
#include "include/dart_api.h"
|
|
#include "include/dart_native_api.h"
|
|
#include "platform/globals.h"
|
|
#include "platform/utils.h"
|
|
|
|
#define DART_DEV_ISOLATE_NAME "dartdev"
|
|
|
|
namespace dart {
|
|
namespace bin {
|
|
|
|
class CommandLineOptions;
|
|
|
|
class DartDevIsolate {
|
|
public:
|
|
// Note: keep in sync with pkg/dartdev/lib/vm_interop_handler.dart
|
|
typedef enum {
|
|
DartDev_Result_Unknown = -1,
|
|
DartDev_Result_Run = 1,
|
|
DartDev_Result_Exit = 2,
|
|
} DartDev_Result;
|
|
|
|
// Returns true if there does not exist a file at |script_uri| or the URI is
|
|
// not an HTTP resource.
|
|
static bool ShouldParseCommand(const char* script_uri);
|
|
|
|
static void set_should_run_dart_dev(bool enable) {
|
|
should_run_dart_dev_ = enable;
|
|
}
|
|
|
|
static bool should_run_dart_dev() { return should_run_dart_dev_; }
|
|
|
|
// Attempts to find the DartDev snapshot. If the snapshot cannot be found,
|
|
// the VM will shutdown.
|
|
static Utils::CStringUniquePtr TryResolveDartDevSnapshotPath();
|
|
|
|
// Starts a DartDev instance in a new isolate and runs it to completion.
|
|
//
|
|
// Returns true if the VM should run the result in `script`, in which case
|
|
// `script` and `dart_options` will have been repopulated with the correct
|
|
// values.
|
|
static DartDev_Result RunDartDev(
|
|
Dart_IsolateGroupCreateCallback create_isolate,
|
|
char** packages_file,
|
|
char** script,
|
|
CommandLineOptions* dart_options);
|
|
|
|
protected:
|
|
class DartDevRunner {
|
|
public:
|
|
DartDevRunner() {}
|
|
|
|
void Run(Dart_IsolateGroupCreateCallback create_isolate,
|
|
char** package_config_override_,
|
|
char** script,
|
|
CommandLineOptions* dart_options);
|
|
|
|
DartDev_Result result() const { return result_; }
|
|
|
|
private:
|
|
static void DartDevResultCallback(Dart_Port dest_port_id,
|
|
Dart_CObject* message);
|
|
static void RunCallback(uword arg);
|
|
static void ProcessError(const char* msg, int32_t exit_code);
|
|
|
|
static DartDev_Result result_;
|
|
static char** script_;
|
|
static char** package_config_override_;
|
|
static std::unique_ptr<char*[], void (*)(char**)> argv_;
|
|
static intptr_t argc_;
|
|
|
|
Dart_IsolateGroupCreateCallback create_isolate_;
|
|
CommandLineOptions* dart_options_;
|
|
const char* packages_file_;
|
|
static Monitor* monitor_;
|
|
|
|
DISALLOW_ALLOCATION();
|
|
};
|
|
|
|
private:
|
|
static DartDevRunner runner_;
|
|
static bool should_run_dart_dev_;
|
|
|
|
DISALLOW_ALLOCATION();
|
|
DISALLOW_IMPLICIT_CONSTRUCTORS(DartDevIsolate);
|
|
};
|
|
|
|
} // namespace bin
|
|
} // namespace dart
|
|
|
|
#endif // !defined(DART_PRECOMPILED_RUNTIME)
|
|
#endif // RUNTIME_BIN_DARTDEV_ISOLATE_H_
|