aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-08-05 10:57:33 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-08-05 20:12:19 +0200
commit53a78fe19b96ff3f47a134bd5fdbb13983b28021 (patch)
tree6407d33ef235eb03d635fe22dbd61b408221c18e
parentversion: bump (diff)
downloadwireguard-windows-53a78fe19b96ff3f47a134bd5fdbb13983b28021.tar.xz
wireguard-windows-53a78fe19b96ff3f47a134bd5fdbb13983b28021.zip
go.mod: operate like a normal go module
-rw-r--r--.gitignore1
-rw-r--r--Makefile12
-rw-r--r--go.mod18
-rw-r--r--go.mod.master18
-rw-r--r--go.sum23
5 files changed, 60 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index 0f02248c..ad8d0739 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@
/amd64
# Misc
-/go.sum
/sign.bat
*.swp
*.bak
diff --git a/Makefile b/Makefile
index ac09c5c9..2e170a72 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,15 @@ x86/wireguard.exe: resources_386.syso $(SOURCE_FILES)
$(VERSIONCHECK)
go build $(GOFLAGS) -o $@
-fmt: export CC := i686-w64-mingw32-gcc
+remaster: export CC := x86_64-w64-mingw32-gcc
+remaster: export GOARCH := amd64
+remaster:
+ rm -f go.sum go.mod
+ cp go.mod.master go.mod
+ go get
+
+fmt: export CC := x86_64-w64-mingw32-gcc
+fmt: export GOARCH := amd64
fmt:
go fmt ./...
@@ -48,4 +56,4 @@ deploy: amd64/wireguard.exe
clean:
rm -rf *.syso ui/icon/*.ico x86/ amd64/ .deps
-.PHONY: deploy clean fmt all
+.PHONY: deploy clean fmt remaster all
diff --git a/go.mod b/go.mod
index 5111b5f3..1b569226 100644
--- a/go.mod
+++ b/go.mod
@@ -1,18 +1,18 @@
module golang.zx2c4.com/wireguard/windows
require (
- golang.zx2c4.com/wireguard master
- golang.org/x/crypto latest
- golang.org/x/net latest
- golang.org/x/sys latest
- golang.org/x/text v0.3.2
+ github.com/lxn/walk v0.0.0-20190619151032-86d8802c197a
+ github.com/lxn/win v0.0.0-20190716185335-d1d36f0e4f48
- github.com/lxn/walk latest
- github.com/lxn/win latest
+ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
+ golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
+ golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa
+ golang.org/x/text v0.3.2
+ golang.zx2c4.com/wireguard v0.0.20190805
)
replace (
- github.com/lxn/walk => golang.zx2c4.com/wireguard/windows pkg/walk
- github.com/lxn/win => golang.zx2c4.com/wireguard/windows pkg/walk-win
+ github.com/lxn/walk => golang.zx2c4.com/wireguard/windows v0.0.0-20190805140616-31a1b114e4f4
+ github.com/lxn/win => golang.zx2c4.com/wireguard/windows v0.0.0-20190716185335-d1d36f0e4f48
)
diff --git a/go.mod.master b/go.mod.master
new file mode 100644
index 00000000..41ba98b8
--- /dev/null
+++ b/go.mod.master
@@ -0,0 +1,18 @@
+module golang.zx2c4.com/wireguard/windows
+
+require (
+ golang.zx2c4.com/wireguard master
+
+ golang.org/x/crypto latest
+ golang.org/x/net latest
+ golang.org/x/sys latest
+ golang.org/x/text latest
+
+ github.com/lxn/walk latest
+ github.com/lxn/win latest
+)
+
+replace (
+ github.com/lxn/walk => golang.zx2c4.com/wireguard/windows pkg/walk
+ github.com/lxn/win => golang.zx2c4.com/wireguard/windows pkg/walk-win
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 00000000..7ba4d993
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,23 @@
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190618155005-516e3c20635f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa h1:KIDDMLT1O0Nr7TSxp8xM5tJcdn8tgyAONntO829og1M=
+golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.zx2c4.com/wireguard v0.0.20190805 h1:qPzediAzPEswzRxx2GzzPzNqnwqBZUUxEKTnC+7vjng=
+golang.zx2c4.com/wireguard v0.0.20190805/go.mod h1:NFs2tkQT6xXo9kzqGJxObM2MzHhraJi7ZQUmwIqT+tE=
+golang.zx2c4.com/wireguard/windows v0.0.0-20190716185335-d1d36f0e4f48 h1:xQZneh52LCkQDABKn3CU88HoLtrX1UGLP5mO924vnG4=
+golang.zx2c4.com/wireguard/windows v0.0.0-20190716185335-d1d36f0e4f48/go.mod h1:oO6+4g3P1GcPAG7LPffwn8Ye0cxW0goh0sUZ6+lRFPs=
+golang.zx2c4.com/wireguard/windows v0.0.0-20190805140616-31a1b114e4f4 h1:ZXq1n2oHNN8Y5iZV4eya4K22wMBzBel213bxqTVd4V8=
+golang.zx2c4.com/wireguard/windows v0.0.0-20190805140616-31a1b114e4f4/go.mod h1:Y+FYqVFaQO6a+1uigm0N0GiuaZrLEaBxEiJ8tfH9sMQ=