diff --git a/README.md b/README.md index a430410844..51049a8b52 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ git clone https://dawn.googlesource.com/tint tint cd tint # Bootstrap the gclient configuration -cp standalone.gclient .gclient +cp scripts/standalone.gclient .gclient # Fetch external dependencies and toolchains with gclient gclient sync diff --git a/README.md.tint b/README.md.tint index fbe6cfb9eb..4ae1021549 100644 --- a/README.md.tint +++ b/README.md.tint @@ -32,7 +32,7 @@ git clone https://dawn.googlesource.com/tint tint cd tint # Bootstrap the gclient configuration -cp standalone.gclient .gclient +cp scripts/standalone.gclient .gclient # Fetch external dependencies and toolchains with gclient gclient sync diff --git a/infra/kokoro/linux/docker.sh b/infra/kokoro/linux/docker.sh index 887c71b9b0..3d3c6411ea 100755 --- a/infra/kokoro/linux/docker.sh +++ b/infra/kokoro/linux/docker.sh @@ -87,7 +87,7 @@ cd ${SRC_DIR} git clone ${CLONE_SRC_DIR} . status "Fetching dependencies" -cp standalone.gclient .gclient +cp scripts/standalone.gclient .gclient with_retry gclient sync status "Linting" diff --git a/infra/kokoro/windows/build.bat b/infra/kokoro/windows/build.bat index c041c3db6a..54c180b891 100644 --- a/infra/kokoro/windows/build.bat +++ b/infra/kokoro/windows/build.bat @@ -108,7 +108,7 @@ call git clone %ORIGINAL_SRC_DIR% . || goto :error call :status "Fetching dependencies" @echo on -copy standalone.gclient .gclient || goto :error +copy scripts\standalone.gclient .gclient || goto :error call gclient sync || goto :error @echo off diff --git a/standalone.gclient b/standalone.gclient deleted file mode 100644 index 5ddec6a575..0000000000 --- a/standalone.gclient +++ /dev/null @@ -1,12 +0,0 @@ -# Copy this file to /.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": { - }, - }, -] diff --git a/tools/src/cmd/perfmon/main.go b/tools/src/cmd/perfmon/main.go index c8d1716c8e..7521f1f33a 100644 --- a/tools/src/cmd/perfmon/main.go +++ b/tools/src/cmd/perfmon/main.go @@ -527,7 +527,7 @@ System: %+v`, path, res.System, e.system) func (e env) fetchTintDeps() error { gclientConfig := filepath.Join(e.tintDir, ".gclient") 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 { return fmt.Errorf("failed to copy '%v' to '%v':\n %w", standalone, gclientConfig, err) }