Support for go mod vendor (#60)

* Support for go mod vendor * Update changelog * make sure build uses underscore rather than dash
rogchap · Dec 24, 2020 · bcfd2d6 · bcfd2d6
1 parent 186af62
commit bcfd2d6
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Value methods for checking value kind (is string, number, array etc)
 - C formatting via `clang-format` to aid future development
+- Support of vendoring with `go mod vendor`
 
 ### Changed
 - Use g++ (default for cgo) for linux builds of the static v8 lib

diff --git a/cgo.go b/cgo.go
@@ -6,6 +6,17 @@ package v8go
 // #cgo darwin linux CXXFLAGS: -I${SRCDIR}/deps/include
 // #cgo LDFLAGS: -pthread -lv8
 // #cgo windows LDFLAGS: -lv8_libplatform
-// #cgo darwin LDFLAGS: -L${SRCDIR}/deps/darwin-x86_64
-// #cgo linux LDFLAGS: -L${SRCDIR}/deps/linux-x86_64
+// #cgo darwin LDFLAGS: -L${SRCDIR}/deps/darwin_x86_64
+// #cgo linux LDFLAGS: -L${SRCDIR}/deps/linux_x86_64
 import "C"
+
+// These imports forces `go mod vendor` to pull in all the folders that
+// contain V8 libraries and headers which otherwise would be ignored.
+// DO NOT REMOVE
+import (
+	_ "rogchap.com/v8go/deps/darwin_x86_64"
+	_ "rogchap.com/v8go/deps/include"
+	_ "rogchap.com/v8go/deps/include/cppgc"
+	_ "rogchap.com/v8go/deps/include/libplatform"
+	_ "rogchap.com/v8go/deps/linux_x86_64"
+)
diff --git a/deps/build.py b/deps/build.py
@@ -71,7 +71,7 @@ def v8deps():
 
 def os_arch():
     u = platform.uname()
-    return (u[0] + "-" + u[4]).lower()
+    return (u[0] + "_" + u[4]).lower()
 
 def main():
     v8deps()

diff --git a/deps/darwin-x86_64/libv8.a → deps/darwin_x86_64/libv8.a b/deps/darwin-x86_64/libv8.a → deps/darwin_x86_64/libv8.a
diff --git a/deps/darwin_x86_64/vendor.go b/deps/darwin_x86_64/vendor.go
@@ -0,0 +1,3 @@
+// Package darwin_x86_64 is required to provide support for vendoring modules
+// DO NOT REMOVE
+package darwin_x86_64
diff --git a/deps/include/cppgc/vendor.go b/deps/include/cppgc/vendor.go
@@ -0,0 +1,3 @@
+// Package cppgc is required to provide support for vendoring modules
+// DO NOT REMOVE
+package cppgc
diff --git a/deps/include/libplatform/vendor.go b/deps/include/libplatform/vendor.go
@@ -0,0 +1,3 @@
+// Package libplatform is required to provide support for vendoring modules
+// DO NOT REMOVE
+package libplatform
diff --git a/deps/include/vendor.go b/deps/include/vendor.go
@@ -0,0 +1,3 @@
+// Package include is required to provide support for vendoring modules
+// DO NOT REMOVE
+package include
diff --git a/deps/linux-x86_64/libv8.a → deps/linux_x86_64/libv8.a b/deps/linux-x86_64/libv8.a → deps/linux_x86_64/libv8.a
diff --git a/deps/linux_x86_64/vendor.go b/deps/linux_x86_64/vendor.go
@@ -0,0 +1,3 @@
+// Package linux_x86_64 is required to provide support for vendoring modules
+// DO NOT REMOVE
+package linux_x86_64
diff --git a/go.sum b/go.sum