mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-14 23:56:16 +00:00
[tools] Move getProjectRoot() out to fileutils.
Add tests. This is going to be used by intrinsic-gen, a new tool Bug: tint:832 Change-Id: Ib22ffa88a699be9c8dfdf3f8f6e32cff4ffc88e3 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/52602 Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
committed by
Tint LUCI CQ
parent
c91f8f2822
commit
3264765bc2
@@ -30,20 +30,15 @@ import (
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"runtime"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"dawn.googlesource.com/tint/tools/src/fileutils"
|
||||
"dawn.googlesource.com/tint/tools/src/glob"
|
||||
)
|
||||
|
||||
var (
|
||||
// Directory to this .go file
|
||||
toolRoot = getToolRoot()
|
||||
// Root directory of the Tint project
|
||||
projectRoot = getProjectRoot(toolRoot)
|
||||
|
||||
// Path to the build script to run after each attempting to remove each
|
||||
// #include
|
||||
buildScript = ""
|
||||
@@ -104,7 +99,7 @@ func run() error {
|
||||
}
|
||||
|
||||
fmt.Println("Scanning for files...")
|
||||
paths, err := glob.Scan(projectRoot, cfg)
|
||||
paths, err := glob.Scan(fileutils.ProjectRoot(), cfg)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -235,7 +230,7 @@ func (f *file) format() error {
|
||||
|
||||
// Runs git add on the file
|
||||
func (f *file) stage() error {
|
||||
err := exec.Command("git", "-C", projectRoot, "add", f.path).Run()
|
||||
err := exec.Command("git", "-C", fileutils.ProjectRoot(), "add", f.path).Run()
|
||||
if err != nil {
|
||||
return fmt.Errorf("Couldn't stage file '%v': %w", f.path, err)
|
||||
}
|
||||
@@ -250,7 +245,7 @@ func loadFiles(paths []string) ([]file, error) {
|
||||
files := make([]file, len(paths))
|
||||
errs := make([]error, len(paths))
|
||||
for i, path := range paths {
|
||||
i, path := i, filepath.Join(projectRoot, path)
|
||||
i, path := i, filepath.Join(fileutils.ProjectRoot(), path)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
body, err := ioutil.ReadFile(path)
|
||||
@@ -271,25 +266,3 @@ func loadFiles(paths []string) ([]file, error) {
|
||||
}
|
||||
return files, nil
|
||||
}
|
||||
|
||||
// Returns the path to the directory holding this .go file
|
||||
func getToolRoot() string {
|
||||
_, filename, _, ok := runtime.Caller(0)
|
||||
if !ok {
|
||||
panic("No caller information")
|
||||
}
|
||||
mainPath, err := filepath.Abs(filename)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return filepath.Dir(mainPath)
|
||||
}
|
||||
|
||||
// Returns the path to the project root
|
||||
func getProjectRoot(toolRoot string) string {
|
||||
root, err := filepath.Abs(filepath.Join(toolRoot, "../.."))
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return root
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user