Remove standalone.gclient
Use `scripts/standalone.gclient` instead. Bug: dawn:1339 Change-Id: Id702d42d104a0f6951973792389f897a6bdf4b10 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86069 Reviewed-by: Ryan Harrison <rharrison@chromium.org> Commit-Queue: Ben Clayton <bclayton@google.com>
This commit is contained in:
parent
17393c1535
commit
afbe161cd4
|
@ -85,7 +85,7 @@ git clone https://dawn.googlesource.com/tint tint
|
||||||
cd tint
|
cd tint
|
||||||
|
|
||||||
# Bootstrap the gclient configuration
|
# Bootstrap the gclient configuration
|
||||||
cp standalone.gclient .gclient
|
cp scripts/standalone.gclient .gclient
|
||||||
|
|
||||||
# Fetch external dependencies and toolchains with gclient
|
# Fetch external dependencies and toolchains with gclient
|
||||||
gclient sync
|
gclient sync
|
||||||
|
|
|
@ -32,7 +32,7 @@ git clone https://dawn.googlesource.com/tint tint
|
||||||
cd tint
|
cd tint
|
||||||
|
|
||||||
# Bootstrap the gclient configuration
|
# Bootstrap the gclient configuration
|
||||||
cp standalone.gclient .gclient
|
cp scripts/standalone.gclient .gclient
|
||||||
|
|
||||||
# Fetch external dependencies and toolchains with gclient
|
# Fetch external dependencies and toolchains with gclient
|
||||||
gclient sync
|
gclient sync
|
||||||
|
|
|
@ -87,7 +87,7 @@ cd ${SRC_DIR}
|
||||||
git clone ${CLONE_SRC_DIR} .
|
git clone ${CLONE_SRC_DIR} .
|
||||||
|
|
||||||
status "Fetching dependencies"
|
status "Fetching dependencies"
|
||||||
cp standalone.gclient .gclient
|
cp scripts/standalone.gclient .gclient
|
||||||
with_retry gclient sync
|
with_retry gclient sync
|
||||||
|
|
||||||
status "Linting"
|
status "Linting"
|
||||||
|
|
|
@ -108,7 +108,7 @@ call git clone %ORIGINAL_SRC_DIR% . || goto :error
|
||||||
|
|
||||||
call :status "Fetching dependencies"
|
call :status "Fetching dependencies"
|
||||||
@echo on
|
@echo on
|
||||||
copy standalone.gclient .gclient || goto :error
|
copy scripts\standalone.gclient .gclient || goto :error
|
||||||
call gclient sync || goto :error
|
call gclient sync || goto :error
|
||||||
@echo off
|
@echo off
|
||||||
|
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
# Copy this file to <tint clone dir>/.gclient to bootstrap gclient in a
|
|
||||||
# standalone checkout of Tint.
|
|
||||||
|
|
||||||
solutions = [
|
|
||||||
{ "name" : ".",
|
|
||||||
"url" : "https://dawn.googlesource.com/tint",
|
|
||||||
"deps_file" : "DEPS",
|
|
||||||
"managed" : False,
|
|
||||||
"custom_deps": {
|
|
||||||
},
|
|
||||||
},
|
|
||||||
]
|
|
|
@ -527,7 +527,7 @@ System: %+v`, path, res.System, e.system)
|
||||||
func (e env) fetchTintDeps() error {
|
func (e env) fetchTintDeps() error {
|
||||||
gclientConfig := filepath.Join(e.tintDir, ".gclient")
|
gclientConfig := filepath.Join(e.tintDir, ".gclient")
|
||||||
if _, err := os.Stat(gclientConfig); errors.Is(err, os.ErrNotExist) {
|
if _, err := os.Stat(gclientConfig); errors.Is(err, os.ErrNotExist) {
|
||||||
standalone := filepath.Join(e.tintDir, "standalone.gclient")
|
standalone := filepath.Join(e.tintDir, "scripts", "standalone.gclient")
|
||||||
if err := copyFile(gclientConfig, standalone); err != nil {
|
if err := copyFile(gclientConfig, standalone); err != nil {
|
||||||
return fmt.Errorf("failed to copy '%v' to '%v':\n %w", standalone, gclientConfig, err)
|
return fmt.Errorf("failed to copy '%v' to '%v':\n %w", standalone, gclientConfig, err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue