aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-05-25 17:48:34 +0900
committerShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-05-25 17:48:34 +0900
commit71fae4cd971ca9a0964b7ec5669b142dd1e2625b (patch)
treeb515da3528264c722c7791a9680c36c6f6659ee0
parent0ba75a92cf0672a361b8880f9f3a6c6fd55470ce (diff)
downloadandroid_build_kati-71fae4cd971ca9a0964b7ec5669b142dd1e2625b.tar.gz
android_build_kati-71fae4cd971ca9a0964b7ec5669b142dd1e2625b.tar.bz2
android_build_kati-71fae4cd971ca9a0964b7ec5669b142dd1e2625b.zip
Add fileutil.go
-rw-r--r--exec.go10
-rw-r--r--fileutil.go12
-rw-r--r--parser.go9
-rw-r--r--worker.go9
4 files changed, 21 insertions, 19 deletions
diff --git a/exec.go b/exec.go
index 6afd0e8..c419be1 100644
--- a/exec.go
+++ b/exec.go
@@ -4,7 +4,6 @@ import (
"bytes"
"fmt"
"io"
- "os"
"path/filepath"
"strings"
"sync"
@@ -127,15 +126,6 @@ func (v AutoSuffixFVar) Eval(w io.Writer, ev *Evaluator) {
}
}
-// TODO(ukai): use time.Time?
-func getTimestamp(filename string) int64 {
- st, err := os.Stat(filename)
- if err != nil {
- return -2
- }
- return st.ModTime().Unix()
-}
-
func (ex *Executor) makeJobs(n *DepNode, neededBy *Job) error {
output := n.Output
if neededBy != nil {
diff --git a/fileutil.go b/fileutil.go
new file mode 100644
index 0000000..80ad02e
--- /dev/null
+++ b/fileutil.go
@@ -0,0 +1,12 @@
+package main
+
+import "os"
+
+func exists(filename string) bool {
+ f, err := os.Open(filename)
+ if err != nil {
+ return false
+ }
+ f.Close()
+ return true
+}
diff --git a/parser.go b/parser.go
index b88c9bb..489f77f 100644
--- a/parser.go
+++ b/parser.go
@@ -42,15 +42,6 @@ type parser struct {
numIfNest int
}
-func exists(filename string) bool {
- f, err := os.Open(filename)
- if err != nil {
- return false
- }
- f.Close()
- return true
-}
-
func newParser(rd io.Reader, filename string) *parser {
p := &parser{
rd: bufio.NewReader(rd),
diff --git a/worker.go b/worker.go
index 2406e90..7b8d723 100644
--- a/worker.go
+++ b/worker.go
@@ -183,6 +183,15 @@ func (j Job) createRunners() []runner {
return runners
}
+// TODO(ukai): use time.Time?
+func getTimestamp(filename string) int64 {
+ st, err := os.Stat(filename)
+ if err != nil {
+ return -2
+ }
+ return st.ModTime().Unix()
+}
+
func (j Job) build() {
if j.n.IsPhony {
j.outputTs = -2 // trigger cmd even if all inputs don't exist.