syscall, internal/syscall/windows, internal/syscall/windows/registry: make go generat...

Fixes #16368

Change-Id: I2ef7a2deb5798e11cc1d3f8ca29a6e1655155422
Reviewed-on: https://go-review.googlesource.com/27411
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/internal/syscall/windows/mksyscall.go b/src/internal/syscall/windows/mksyscall.go
new file mode 100644 (file)
index 0000000..21a2b4e
--- /dev/null
+++ b/src/internal/syscall/windows/mksyscall.go
@@ -0,0 +1,7 @@
+// Copyright 2016 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package windows
+
+//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go syscall_windows.go

diff --git a/src/internal/syscall/windows/registry/mksyscall.go b/src/internal/syscall/windows/registry/mksyscall.go
new file mode 100644 (file)
index 0000000..3f8eb8e
--- /dev/null
+++ b/src/internal/syscall/windows/registry/mksyscall.go
@@ -0,0 +1,7 @@
+// Copyright 2016 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package registry
+
+//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go syscall.go

diff --git a/src/internal/syscall/windows/registry/syscall.go b/src/internal/syscall/windows/registry/syscall.go
index 5426cae90963308313cc186026e9187dcd0b6b78..a6525dac5d91aca8337b323f7098dbee230ec164 100644 (file)
--- a/src/internal/syscall/windows/registry/syscall.go
+++ b/src/internal/syscall/windows/registry/syscall.go
@@ -8,8 +8,6 @@ package registry
 
 import "syscall"
 
-//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go syscall.go
-
 const (
        _REG_OPTION_NON_VOLATILE = 0
 

diff --git a/src/internal/syscall/windows/syscall_windows.go b/src/internal/syscall/windows/syscall_windows.go
index 7b2bc79cebe4a4b044e184adbadf1cdefeb18024..47ca602ae1d17b2d3a5bca46b8c221c4fccccf73 100644 (file)
--- a/src/internal/syscall/windows/syscall_windows.go
+++ b/src/internal/syscall/windows/syscall_windows.go
@@ -6,8 +6,6 @@ package windows
 
 import "syscall"
 
-//go:generate go run ../../../syscall/mksyscall_windows.go -output zsyscall_windows.go syscall_windows.go
-
 const GAA_FLAG_INCLUDE_PREFIX = 0x00000010
 
 const (

diff --git a/src/syscall/mkall.sh b/src/syscall/mkall.sh
index 6a9aacbbffc90163a7da42894f3182dd388d065e..987ac236250879c5f602d3c3494bf7a1a0e8c87f 100755 (executable)
--- a/src/syscall/mkall.sh
+++ b/src/syscall/mkall.sh
@@ -275,7 +275,7 @@ solaris_amd64)
        mktypes="GOARCH=$GOARCH go tool cgo -godefs"
        ;;
 windows_*)
-       echo 'run "go generate syscall_windows.go" instead' 1>&2
+       echo 'run "go generate" instead' 1>&2
        exit 1
        ;;
 *)

diff --git a/src/syscall/syscall.go b/src/syscall/syscall.go
index bb102c6e135e198b11a1a508d6a14ac65249039d..f07c3c75d024caf5bbe6c4549ab5f905fb5e3b34 100644 (file)
--- a/src/syscall/syscall.go
+++ b/src/syscall/syscall.go
@@ -28,6 +28,8 @@ package syscall
 
 import "unsafe"
 
+//go:generate go run mksyscall_windows.go -systemdll -output zsyscall_windows.go syscall_windows.go security_windows.go
+
 // StringByteSlice converts a string to a NUL-terminated []byte,
 // If s contains a NUL byte this function panics instead of
 // returning an error.

diff --git a/src/syscall/syscall_windows.go b/src/syscall/syscall_windows.go
index 703bb53db4ade37f22f25b3993fce68d56ecb9f2..a2728e92920009e617307f595e9ee1b80c54967a 100644 (file)
--- a/src/syscall/syscall_windows.go
+++ b/src/syscall/syscall_windows.go
@@ -14,8 +14,6 @@ import (
        "unsafe"
 )
 
-//go:generate go run mksyscall_windows.go -systemdll -output zsyscall_windows.go syscall_windows.go security_windows.go
-
 type Handle uintptr
 
 const InvalidHandle = ^Handle(0)