octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 02:48:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Let "go generate" create assets

Browse Source
This commit is contained in:
Jakob Borg 2018-06-26 09:14:21 +02:00
parent 406b394704
commit ef5ca0c218
5 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.go
View File

@ -738,12 +738,11 @@ func listFiles(dir string) []string {
func rebuildAssets() {
os.Setenv("SOURCE_DATE_EPOCH", fmt.Sprint(buildStamp()))
runPipe("lib/auto/gui.files.go", "go", "run", "script/genassets.go", "gui")
runPipe("cmd/strelaypoolsrv/auto/gui.go", "go", "run", "script/genassets.go", "cmd/strelaypoolsrv/gui")
runPrint("go", "generate", "github.com/syncthing/syncthing/lib/auto", "github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto")
}
func lazyRebuildAssets() {
if shouldRebuildAssets("lib/auto/gui.files.go", "gui") || shouldRebuildAssets("cmd/strelaypoolsrv/auto/gui.go", "cmd/strelaypoolsrv/auto/gui") {
if shouldRebuildAssets("lib/auto/gui.files.go", "gui") || shouldRebuildAssets("cmd/strelaypoolsrv/auto/gui.files.go", "cmd/strelaypoolsrv/auto/gui") {
rebuildAssets()
}
}

2
cmd/strelaypoolsrv/auto/.gitignore vendored
View File

@ -1 +1 @@
gui.go
gui.files.go

10
cmd/strelaypoolsrv/auto/doc.go Normal file
View File

@ -0,0 +1,10 @@
// Copyright (C) 2018 The Syncthing Authors.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
// You can obtain one at https://mozilla.org/MPL/2.0/.
//go:generate go run ../../../script/genassets.go -o gui.files.go ../gui
// Package auto contains auto generated files for web assets.
package auto

2
lib/auto/doc.go
View File

@ -4,5 +4,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
// You can obtain one at https://mozilla.org/MPL/2.0/.
//go:generate go run ../../script/genassets.go -o gui.files.go ../../gui
// Package auto contains auto generated files for web assets.
package auto

15
script/genassets.go
View File

@ -86,6 +86,7 @@ type templateVars struct {
}
func main() {
outfile := flag.String("o", "", "Name of output file (default stdout)")
flag.Parse()
filepath.Walk(flag.Arg(0), walkerFor(flag.Arg(0)))
@ -104,7 +105,17 @@ func main() {
})
bs, err := format.Source(buf.Bytes())
if err != nil {
panic(err)
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
}
os.Stdout.Write(bs)
out := io.Writer(os.Stdout)
if *outfile != "" {
out, err = os.Create(*outfile)
if err != nil {
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
}
}
out.Write(bs)
}