mirror of
https://github.com/dart-lang/sdk
synced 2024-10-06 13:47:50 +00:00
Support building under git-worktree
This makes the location of the `.git` folder a GN argument, so it can be configured differently when using git-worktree. See sdk_args.gn for documentation on how to use this. Fixes #33619 (http://dartbug.com/33619) Change-Id: Ia8144f401c462a6fbb91a965979949f286b04d1e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/127485 Commit-Queue: Sigmund Cherem <sigmund@google.com> Reviewed-by: Zach Anderson <zra@google.com>
This commit is contained in:
parent
141fcfa610
commit
561e8242ce
|
@ -2,6 +2,7 @@
|
||||||
# for details. All rights reserved. Use of this source code is governed by a
|
# 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.
|
# BSD-style license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
import("../sdk_args.gni")
|
||||||
import("configs.gni")
|
import("configs.gni")
|
||||||
import("runtime_args.gni")
|
import("runtime_args.gni")
|
||||||
|
|
||||||
|
@ -257,7 +258,7 @@ action("generate_version_cc_file") {
|
||||||
"vm/version_in.cc",
|
"vm/version_in.cc",
|
||||||
]
|
]
|
||||||
if (dart_version_git_info) {
|
if (dart_version_git_info) {
|
||||||
inputs += [ "../.git/logs/HEAD" ]
|
inputs += [ "$default_git_folder/logs/HEAD" ]
|
||||||
}
|
}
|
||||||
output = "$target_gen_dir/version.cc"
|
output = "$target_gen_dir/version.cc"
|
||||||
outputs = [
|
outputs = [
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
|
|
||||||
import("../build/dart/copy_tree.gni")
|
import("../build/dart/copy_tree.gni")
|
||||||
import("../runtime/runtime_args.gni")
|
import("../runtime/runtime_args.gni")
|
||||||
|
import("../sdk_args.gni")
|
||||||
|
|
||||||
declare_args() {
|
declare_args() {
|
||||||
# Build a SDK with less stuff. It excludes dart2js, ddc, and web libraries.
|
# Build a SDK with less stuff. It excludes dart2js, ddc, and web libraries.
|
||||||
|
@ -861,7 +862,7 @@ action("write_version_file") {
|
||||||
visibility = [ ":create_common_sdk" ]
|
visibility = [ ":create_common_sdk" ]
|
||||||
inputs = [
|
inputs = [
|
||||||
"../tools/VERSION",
|
"../tools/VERSION",
|
||||||
"../.git/logs/HEAD",
|
"$default_git_folder/logs/HEAD",
|
||||||
]
|
]
|
||||||
output = "$root_out_dir/dart-sdk/version"
|
output = "$root_out_dir/dart-sdk/version"
|
||||||
outputs = [
|
outputs = [
|
||||||
|
@ -878,7 +879,7 @@ action("write_version_file") {
|
||||||
action("write_revision_file") {
|
action("write_revision_file") {
|
||||||
visibility = [ ":create_common_sdk" ]
|
visibility = [ ":create_common_sdk" ]
|
||||||
inputs = [
|
inputs = [
|
||||||
"../.git/logs/HEAD",
|
"$default_git_folder/logs/HEAD",
|
||||||
]
|
]
|
||||||
output = "$root_out_dir/dart-sdk/revision"
|
output = "$root_out_dir/dart-sdk/revision"
|
||||||
outputs = [
|
outputs = [
|
||||||
|
@ -937,7 +938,7 @@ copy("copy_license") {
|
||||||
action("write_dartdoc_options") {
|
action("write_dartdoc_options") {
|
||||||
visibility = [ ":create_common_sdk" ]
|
visibility = [ ":create_common_sdk" ]
|
||||||
inputs = [
|
inputs = [
|
||||||
"../.git/logs/HEAD",
|
"$default_git_folder/logs/HEAD",
|
||||||
]
|
]
|
||||||
output = "$root_out_dir/dart-sdk/dartdoc_options.yaml"
|
output = "$root_out_dir/dart-sdk/dartdoc_options.yaml"
|
||||||
outputs = [
|
outputs = [
|
||||||
|
|
21
sdk_args.gni
21
sdk_args.gni
|
@ -1,5 +1,26 @@
|
||||||
|
# Copyright (c) 2019, 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.
|
||||||
|
|
||||||
|
_dart_root = get_path_info(".", "abspath")
|
||||||
|
|
||||||
declare_args() {
|
declare_args() {
|
||||||
# Whether to use the NNBD fork of the SDK core libraries.
|
# Whether to use the NNBD fork of the SDK core libraries.
|
||||||
# TODO(#38701): Remove this when the fork has been merged back in.
|
# TODO(#38701): Remove this when the fork has been merged back in.
|
||||||
use_nnbd = false
|
use_nnbd = false
|
||||||
|
|
||||||
|
# Absolute path to the .git folder.
|
||||||
|
#
|
||||||
|
# This is used in rules that need to refer to `.git/logs/HEAD` to include
|
||||||
|
# a hash in the version string. By default the folder is `.git`, but we define
|
||||||
|
# it as an argument so it can be overriden by users of `git-worktree` (See
|
||||||
|
# Issue #33619).
|
||||||
|
#
|
||||||
|
# When using git-worktree, you can add
|
||||||
|
#
|
||||||
|
# default_git_folder = "/path/to/main/git/repo/.git/worktrees/name/"
|
||||||
|
#
|
||||||
|
# to out/ReleaseX64/args.gn. The path above can be extracted from the `.git`
|
||||||
|
# file under the git worktree folder.
|
||||||
|
default_git_folder = "$_dart_root/.git"
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
|
|
||||||
import("../build/dart/copy_tree.gni")
|
import("../build/dart/copy_tree.gni")
|
||||||
import("../runtime/runtime_args.gni")
|
import("../runtime/runtime_args.gni")
|
||||||
|
import("../sdk_args.gni")
|
||||||
|
|
||||||
declare_args() {
|
declare_args() {
|
||||||
# Build a SDK with less stuff. It excludes dart2js, ddc, and web libraries.
|
# Build a SDK with less stuff. It excludes dart2js, ddc, and web libraries.
|
||||||
|
@ -861,7 +862,7 @@ action("write_version_file") {
|
||||||
visibility = [ ":create_common_sdk" ]
|
visibility = [ ":create_common_sdk" ]
|
||||||
inputs = [
|
inputs = [
|
||||||
"../tools/VERSION",
|
"../tools/VERSION",
|
||||||
"../.git/logs/HEAD",
|
"$default_git_folder/logs/HEAD",
|
||||||
]
|
]
|
||||||
output = "$root_out_dir/dart-sdk/version"
|
output = "$root_out_dir/dart-sdk/version"
|
||||||
outputs = [
|
outputs = [
|
||||||
|
@ -878,7 +879,7 @@ action("write_version_file") {
|
||||||
action("write_revision_file") {
|
action("write_revision_file") {
|
||||||
visibility = [ ":create_common_sdk" ]
|
visibility = [ ":create_common_sdk" ]
|
||||||
inputs = [
|
inputs = [
|
||||||
"../.git/logs/HEAD",
|
"$default_git_folder/logs/HEAD",
|
||||||
]
|
]
|
||||||
output = "$root_out_dir/dart-sdk/revision"
|
output = "$root_out_dir/dart-sdk/revision"
|
||||||
outputs = [
|
outputs = [
|
||||||
|
@ -937,7 +938,7 @@ copy("copy_license") {
|
||||||
action("write_dartdoc_options") {
|
action("write_dartdoc_options") {
|
||||||
visibility = [ ":create_common_sdk" ]
|
visibility = [ ":create_common_sdk" ]
|
||||||
inputs = [
|
inputs = [
|
||||||
"../.git/logs/HEAD",
|
"$default_git_folder/logs/HEAD",
|
||||||
]
|
]
|
||||||
output = "$root_out_dir/dart-sdk/dartdoc_options.yaml"
|
output = "$root_out_dir/dart-sdk/dartdoc_options.yaml"
|
||||||
outputs = [
|
outputs = [
|
||||||
|
|
Loading…
Reference in a new issue