From e8dafedc2ddd0cbaf216c694312735069e317ab5 Mon Sep 17 00:00:00 2001 From: Alexander Thomas Date: Tue, 17 Dec 2024 02:41:55 -0800 Subject: [PATCH] [infra] Use empty package config for package config generator Previously, stray package_config.json files could cause the package config generator to fail. Change-Id: If8dc81169a4f95f871572bde5c883a675ab3276b Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/401440 Commit-Queue: Sigurd Meldgaard Commit-Queue: Alexander Thomas Auto-Submit: Alexander Thomas Reviewed-by: Sigurd Meldgaard --- tools/empty_package_config.json | 12 ++++++++++++ tools/generate_package_config.py | 1 + 2 files changed, 13 insertions(+) create mode 100644 tools/empty_package_config.json diff --git a/tools/empty_package_config.json b/tools/empty_package_config.json new file mode 100644 index 00000000000..78625d1ca08 --- /dev/null +++ b/tools/empty_package_config.json @@ -0,0 +1,12 @@ +{ + "copyright": [ + "Copyright (c) 2024, 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." + ], + "comment": [ + "Empty package configuration, used to bootstrap generate_package_config.dart" + ], + "configVersion": 2, + "packages": [] +} \ No newline at end of file diff --git a/tools/generate_package_config.py b/tools/generate_package_config.py index b763b3d714c..35b18bb6647 100644 --- a/tools/generate_package_config.py +++ b/tools/generate_package_config.py @@ -35,6 +35,7 @@ def generate_package_config(): tools_dir = os.path.dirname(os.path.realpath(__file__)) process = subprocess.run([ checked_in_sdk_executable(), + '--packages=%s' % os.path.join(tools_dir, 'empty_package_config.json'), os.path.join(tools_dir, 'generate_package_config.dart') ]) return process.returncode