Remove $PATH/glow requirement for running go generate (#158)

go-gl · Oct 21, 2023 · 07e5d0e · 07e5d0e
1 parent 726fda9
commit 07e5d0e
Show file tree

Hide file tree

Showing 100 changed files with 219 additions and 182 deletions.
diff --git a/README.md b/README.md
@@ -79,8 +79,6 @@ It is required to have `glow` source in a sibling directory to `go-gl/gl` since
 For non-module-aware cases, this means `glow` needs to be in the same Go workspace as `go-gl/gl`.
 For module-aware cases, `go-gl/glow` needs to be checked out parallel to `go-gl/gl`. 
 
-In either case, the `glow` binary must be in your `$PATH`. Doable with `go get -u github.com/go-gl/glow` if your `$GOPATH/bin` is in your `$PATH`.
-
 Perform generation with the following:
 
 ```bash

diff --git a/all-core/gl/KHR/dummy.go b/all-core/gl/KHR/dummy.go
@@ -1,3 +1,4 @@
+//go:build required
 // +build required
 
 // Package dummy prevents go tooling from stripping the c dependencies.

diff --git a/all-core/gl/build_cgo_hack.go b/all-core/gl/build_cgo_hack.go
@@ -1,3 +1,4 @@
+//go:build required
 // +build required
 
 package gl

diff --git a/all-core/gl/conversions.go b/all-core/gl/conversions.go
diff --git a/all-core/gl/package.go b/all-core/gl/package.go
diff --git a/all-core/gl/procaddr.go b/all-core/gl/procaddr.go
diff --git a/generate.go b/generate.go
@@ -1,5 +1,6 @@
 // +build gen
 
+//go:generate -command glow go run ../glow/
 //go:generate glow generate -out=./v2.1/gl/ -api=gl -version=2.1 -xml=../glow/xml/ -tmpl=../glow/tmpl/
 //go:generate glow generate -out=./all-core/gl/ -api=gl -version=all -profile=core -lenientInit -xml=../glow/xml/ -tmpl=../glow/tmpl/
 //go:generate glow generate -out=./v3.2-core/gl/ -api=gl -version=3.2 -profile=core -xml=../glow/xml/ -tmpl=../glow/tmpl/

diff --git a/v2.1/gl/KHR/dummy.go b/v2.1/gl/KHR/dummy.go
@@ -1,3 +1,4 @@
+//go:build required
 // +build required
 
 // Package dummy prevents go tooling from stripping the c dependencies.

diff --git a/v2.1/gl/build_cgo_hack.go b/v2.1/gl/build_cgo_hack.go
@@ -1,3 +1,4 @@
+//go:build required
 // +build required
 
 package gl

diff --git a/v2.1/gl/conversions.go b/v2.1/gl/conversions.go
diff --git a/v2.1/gl/package.go b/v2.1/gl/package.go
diff --git a/v2.1/gl/procaddr.go b/v2.1/gl/procaddr.go
diff --git a/v3.0/gles2/conversions.go b/v3.0/gles2/conversions.go
diff --git a/v3.0/gles2/package.go b/v3.0/gles2/package.go
diff --git a/v3.0/gles2/procaddr.go b/v3.0/gles2/procaddr.go
diff --git a/v3.1/gles2/KHR/dummy.go b/v3.1/gles2/KHR/dummy.go
@@ -1,3 +1,4 @@
+//go:build required
 // +build required
 
 // Package dummy prevents go tooling from stripping the c dependencies.

diff --git a/v3.1/gles2/build_cgo_hack.go b/v3.1/gles2/build_cgo_hack.go
@@ -1,3 +1,4 @@
+//go:build required
 // +build required
 
 package gles2

diff --git a/v3.1/gles2/conversions.go b/v3.1/gles2/conversions.go
diff --git a/v3.1/gles2/package.go b/v3.1/gles2/package.go
diff --git a/v3.1/gles2/procaddr.go b/v3.1/gles2/procaddr.go
diff --git a/v3.2-compatibility/gl/KHR/dummy.go b/v3.2-compatibility/gl/KHR/dummy.go
@@ -1,3 +1,4 @@
+//go:build required
 // +build required
 
 // Package dummy prevents go tooling from stripping the c dependencies.

diff --git a/v3.2-compatibility/gl/build_cgo_hack.go b/v3.2-compatibility/gl/build_cgo_hack.go
@@ -1,3 +1,4 @@
+//go:build required
 // +build required
 
 package gl

diff --git a/v3.2-compatibility/gl/conversions.go b/v3.2-compatibility/gl/conversions.go
diff --git a/v3.2-compatibility/gl/package.go b/v3.2-compatibility/gl/package.go
diff --git a/v3.2-compatibility/gl/procaddr.go b/v3.2-compatibility/gl/procaddr.go
diff --git a/v3.2-core/gl/KHR/dummy.go b/v3.2-core/gl/KHR/dummy.go
@@ -1,3 +1,4 @@
+//go:build required
 // +build required
 
 // Package dummy prevents go tooling from stripping the c dependencies.

diff --git a/v3.2-core/gl/build_cgo_hack.go b/v3.2-core/gl/build_cgo_hack.go
@@ -1,3 +1,4 @@
+//go:build required
 // +build required
 
 package gl

diff --git a/v3.2-core/gl/conversions.go b/v3.2-core/gl/conversions.go