Sidestep go install issue (Linux).

2021-05-06 00:38:49 +01:00 · 2021-05-06 00:38:49 +01:00 · 40c8a6e6cd
commit 40c8a6e6cd
parent ce2809b72b
17 changed files with 22 additions and 18 deletions
--- a/cmd/zenity/build.sh
+++ b/cmd/zenity/build.sh
@ -1,5 +1,7 @@
 #!/bin/bash

+go run github.com/josephspurrier/goversioninfo/cmd/goversioninfo
+
 GOOS=windows GOARCH=386 go build -ldflags="-s -w" -trimpath &&
 zip -9 zenity_win32.zip zenity.exe

@ -9,4 +11,4 @@ zip -9 zenity_win64.zip zenity.exe
 GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -trimpath &&
 zip -9 zenity_macos.zip zenity

-go build
+go build -tags dev
--- a/cmd/zenity/main.go
+++ b/cmd/zenity/main.go
@ -1,3 +1,5 @@
+// +build windows darwin dev
+
 package main

 import (
@ -17,8 +19,6 @@ import (
 	"github.com/ncruces/zenity/internal/zenutil"
 )

-//go:generate go run github.com/josephspurrier/goversioninfo/cmd/goversioninfo
-
 const (
 	unspecified = "\x00"
 )
--- a/cmd/zenity/progress.go
+++ b/cmd/zenity/progress.go
@ -1,3 +1,5 @@
+// +build windows darwin dev
+
 package main

 import (
--- a/cmd/zenity/progress_unix.go
+++ b/cmd/zenity/progress_unix.go
@ -1,4 +1,4 @@
-// +build !windows,!js
+// +build darwin dev

 package main

--- a/cmd/zenity/versioninfo.json
+++ b/cmd/zenity/versioninfo.json
@ -24,7 +24,7 @@
 		"FileDescription": "",
 		"FileVersion": "0.0.0.0",
 		"InternalName": "zenity",
-		"LegalCopyright": "© 2020 Nuno Cruces",
+    "LegalCopyright": "© 2021 Nuno Cruces",
 		"LegalTrademarks": "",
 		"OriginalFilename": "zenity.exe",
 		"PrivateBuild": "",
@ -38,4 +38,4 @@
 			"CharsetID": "04B0"
 		}
 	}
-}
+}
--- a/color_unix.go
+++ b/color_unix.go
@ -1,4 +1,4 @@
-// +build !windows,!darwin,!js
+// +build !windows,!darwin

 package zenity

--- a/entry_unix.go
+++ b/entry_unix.go
@ -1,4 +1,4 @@
-// +build !windows,!darwin,!js
+// +build !windows,!darwin

 package zenity

--- a/file_unix.go
+++ b/file_unix.go
@ -1,4 +1,4 @@
-// +build !windows,!darwin,!js
+// +build !windows,!darwin

 package zenity

--- a/internal/zenutil/env_unix.go
+++ b/internal/zenutil/env_unix.go
@ -1,4 +1,4 @@
-// +build !windows,!darwin,!js
+// +build !windows,!darwin

 // Package zenutil is internal. DO NOT USE.
 package zenutil
--- a/internal/zenutil/progress_unix.go
+++ b/internal/zenutil/progress_unix.go
@ -1,4 +1,4 @@
-// +build !windows,!js
+// +build !windows

 package zenutil

--- a/internal/zenutil/run_unix.go
+++ b/internal/zenutil/run_unix.go
@ -1,4 +1,4 @@
-// +build !windows,!darwin,!js
+// +build !windows,!darwin

 package zenutil

--- a/list_unix.go
+++ b/list_unix.go
@ -1,4 +1,4 @@
-// +build !windows,!darwin,!js
+// +build !windows,!darwin

 package zenity

--- a/msg_unix.go
+++ b/msg_unix.go
@ -1,4 +1,4 @@
-// +build !windows,!darwin,!js
+// +build !windows,!darwin

 package zenity

--- a/notify_unix.go
+++ b/notify_unix.go
@ -1,4 +1,4 @@
-// +build !windows,!darwin,!js
+// +build !windows,!darwin

 package zenity

--- a/progress_unix.go
+++ b/progress_unix.go
@ -1,4 +1,4 @@
-// +build !windows,!darwin,!js
+// +build !windows,!darwin

 package zenity

--- a/pwd_unix.go
+++ b/pwd_unix.go
@ -1,4 +1,4 @@
-// +build !windows,!darwin,!js
+// +build !windows,!darwin

 package zenity

--- a/util_unix.go
+++ b/util_unix.go
@ -1,4 +1,4 @@
-// +build !windows,!js
+// +build !windows

 package zenity