experimental/fiddle -> tools/fiddle

tools/fiddle/fiddler.go

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 package main
 
 // Example use:
 //   git clone https://skia.googlesource.com/skia.git
 //   cd skia
 //   SKIA=$PWD
-//   cd experimental/fiddle
+//   cd tools/fiddle
 //   go get github.com/skia-dev/glog
 //   go get go.skia.org/infra/go/util
 //   go build fiddler.go
 //   # compile prerequisites
 //   ./fiddler "$SKIA"
 //   # compile and run a fiddle
 //   ./fiddler "$SKIA" draw.cpp | ./parse-fiddle-output
 //   # compile and run a different fiddle
 //   ./fiddler "$SKIA" ANOTHER_FIDDLE.cpp | ./parse-fiddle-output
 
 import (
         "bytes"
         "fmt"
         "io"
         "io/ioutil"
         "os"
         "os/exec"
         "path"
         "syscall"
 
         "github.com/skia-dev/glog"
         "go.skia.org/infra/go/util"
 )
 
+func fiddlePath() string {
+        return path.Join("tools", "fiddle")
+}
 func setResourceLimits() error {
         const maximumTimeInSeconds = 5
         limit := syscall.Rlimit{maximumTimeInSeconds, maximumTimeInSeconds}
         if err := syscall.Setrlimit(syscall.RLIMIT_CPU, &limit); err != nil {
                 return err
         }
         const maximumMemoryInBytes = 1 << 28
         limit = syscall.Rlimit{maximumMemoryInBytes, maximumMemoryInBytes}
         return syscall.Setrlimit(syscall.RLIMIT_AS, &limit)
 }
@@ skipping 21 matching lines @@
         return "@" + path.Join(skiaSrc, "cmake", "skia_link_arguments.txt")
 }
 
 // fiddler compiles the input, links against skia, and runs the executable.
 // @param skiaSrc: the base directory of the Skia repository
 // @param inputReader: C++ fiddle source
 // @param output: stdout of executable sent here
 // @param tempDir: where to place the compiled executable
 func fiddler(skiaSrc string, inputReader io.Reader, output io.Writer, tempDir string) error {
         binarypath := path.Join(tempDir, "fiddle")
-        fiddle_dir := path.Join(skiaSrc, "experimental", "fiddle")
+        fiddle_dir := path.Join(skiaSrc, fiddlePath())
         if err := execCommand(inputReader, fiddle_dir,
                 "c++",
                 compileArgs(skiaSrc),
                 "-I", fiddle_dir,
                 "-o", binarypath,
                 "-x", "c++", "-", "-x", "none",
                 "fiddle_main.o",
                 "-lOSMesa",
                 linkArgs(skiaSrc),
         ); err != nil {
@@ skipping 10 matching lines @@
 // Compile Skia library and fiddle_main.cpp
 // @param skiaSrc: the base directory of the Skia repository.
 func fiddlerPrerequisites(skiaSrc string) error {
         cmakeDir := path.Join(skiaSrc, "cmake")
         if err := execCommand(nil, cmakeDir, "cmake", "-G", "Ninja", "."); err != nil {
                 return err
         }
         if err := execCommand(nil, cmakeDir, "ninja", "skia"); err != nil {
                 return err
         }
-        fiddle_dir := path.Join(skiaSrc, "experimental", "fiddle")
+        fiddle_dir := path.Join(skiaSrc, fiddlePath())
         if err := execCommand(nil, fiddle_dir, "c++", compileArgs(skiaSrc),
                 "fiddle_main.h"); err != nil {
                 return err
         }
         return execCommand(nil, fiddle_dir, "c++", compileArgs(skiaSrc),
                 "-c", "-o", "fiddle_main.o", "fiddle_main.cpp")
 }
 
 func main() {
         if len(os.Args) < 2 {
@@ skipping 29 matching lines @@
                         if err != nil {
                                 glog.Fatalf("unable to open \"%s\": %v", os.Args[2], err)
                         }
                         defer util.Close(inputFile)
                         if err = fiddler(skiaSrc, inputFile, os.Stdout, tempDir); err != nil {
                                 glog.Fatal(err)
                         }
                 }
         }
 }