Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: Take extra tags in account for tar, zip

This commit is contained in:
Jakob Borg 2020-11-20 17:43:59 +01:00
parent db1f20603a
commit b253022a96
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
build.go
View File

@ -278,22 +278,18 @@ func main() {
} }
func runCommand(cmd string, target target) { func runCommand(cmd string, target target) {
var tags []string
if noupgrade {
tags = []string{"noupgrade"}
}
tags = append(tags, strings.Fields(extraTags)...)
switch cmd { switch cmd {
case "install": case "install":
var tags []string
if noupgrade {
tags = []string{"noupgrade"}
}
tags = append(tags, strings.Fields(extraTags)...)
install(target, tags) install(target, tags)
metalintShort() metalintShort()
case "build": case "build":
var tags []string
if noupgrade {
tags = []string{"noupgrade"}
}
tags = append(tags, strings.Fields(extraTags)...)
build(target, tags) build(target, tags)
case "test": case "test":
@ -321,10 +317,10 @@ func runCommand(cmd string, target target) {
transifex() transifex()
case "tar": case "tar":
buildTar(target) buildTar(target, tags)
case "zip": case "zip":
buildZip(target) buildZip(target, tags)
case "deb": case "deb":
buildDeb(target) buildDeb(target)
@ -539,14 +535,15 @@ func appendParameters(args []string, tags []string, pkgs ...string) []string {
return append(args, pkgs...) return append(args, pkgs...)
} }
func buildTar(target target) { func buildTar(target target, tags []string) {
name := archiveName(target) name := archiveName(target)
filename := name + ".tar.gz" filename := name + ".tar.gz"
var tags []string for _, tag := range tags {
if noupgrade { if tag == "noupgrade" {
tags = []string{"noupgrade"} name += "-noupgrade"
name += "-noupgrade" break
}
} }
build(target, tags) build(target, tags)
@ -562,14 +559,15 @@ func buildTar(target target) {
fmt.Println(filename) fmt.Println(filename)
} }
func buildZip(target target) { func buildZip(target target, tags []string) {
name := archiveName(target) name := archiveName(target)
filename := name + ".zip" filename := name + ".zip"
var tags []string for _, tag := range tags {
if noupgrade { if tag == "noupgrade" {
tags = []string{"noupgrade"} name += "-noupgrade"
name += "-noupgrade" break
}
} }
build(target, tags) build(target, tags)