From 4b2ac7c998be677d865367908787f17fb570c679 Mon Sep 17 00:00:00 2001 From: lhchavez Date: Sun, 13 Dec 2020 15:20:16 -0800 Subject: Rename the build files (#724) This change renames the build files so they come lexicographically before any source files. This makes the compile errors (due to mismatched libgit2 versions) easier to understand, since the `Build_*.go` files will be tried before the rest, and the `#error` in those files will kick in, leading to a much better experience. This unfortunately goes a bit against the defacto standard of using only lowercase characters in filenames, but the better developer experience (and better self-diagnosis when things go wrong instead of having to open a new issue) is worth the deviation. Fixes: #711 Fixes: #617 --- Build_bundled_static.go | 16 ++++++++++++++++ Build_system_dynamic.go | 14 ++++++++++++++ Build_system_static.go | 14 ++++++++++++++ git_bundled_static.go | 16 ---------------- git_system_dynamic.go | 14 -------------- git_system_static.go | 14 -------------- 6 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 Build_bundled_static.go create mode 100644 Build_system_dynamic.go create mode 100644 Build_system_static.go delete mode 100644 git_bundled_static.go delete mode 100644 git_system_dynamic.go delete mode 100644 git_system_static.go diff --git a/Build_bundled_static.go b/Build_bundled_static.go new file mode 100644 index 0000000..4d10d45 --- /dev/null +++ b/Build_bundled_static.go @@ -0,0 +1,16 @@ +// +build static,!system_libgit2 + +package git + +/* +#cgo windows CFLAGS: -I${SRCDIR}/static-build/install/include/ +#cgo windows LDFLAGS: -L${SRCDIR}/static-build/install/lib/ -lgit2 -lwinhttp +#cgo !windows pkg-config: --static ${SRCDIR}/static-build/install/lib/pkgconfig/libgit2.pc +#cgo CFLAGS: -DLIBGIT2_STATIC +#include + +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 1 || LIBGIT2_VER_MINOR > 1 +# error "Invalid libgit2 version; this git2go supports libgit2 between v1.1.0 and v1.1.0" +#endif +*/ +import "C" diff --git a/Build_system_dynamic.go b/Build_system_dynamic.go new file mode 100644 index 0000000..3013804 --- /dev/null +++ b/Build_system_dynamic.go @@ -0,0 +1,14 @@ +// +build !static + +package git + +/* +#cgo pkg-config: libgit2 +#cgo CFLAGS: -DLIBGIT2_DYNAMIC +#include + +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 1 || LIBGIT2_VER_MINOR > 1 +# error "Invalid libgit2 version; this git2go supports libgit2 between v1.1.0 and v1.1.0" +#endif +*/ +import "C" diff --git a/Build_system_static.go b/Build_system_static.go new file mode 100644 index 0000000..f3da651 --- /dev/null +++ b/Build_system_static.go @@ -0,0 +1,14 @@ +// +build static,system_libgit2 + +package git + +/* +#cgo pkg-config: libgit2 --static +#cgo CFLAGS: -DLIBGIT2_STATIC +#include + +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 1 || LIBGIT2_VER_MINOR > 1 +# error "Invalid libgit2 version; this git2go supports libgit2 between v1.1.0 and v1.1.0" +#endif +*/ +import "C" diff --git a/git_bundled_static.go b/git_bundled_static.go deleted file mode 100644 index 4d10d45..0000000 --- a/git_bundled_static.go +++ /dev/null @@ -1,16 +0,0 @@ -// +build static,!system_libgit2 - -package git - -/* -#cgo windows CFLAGS: -I${SRCDIR}/static-build/install/include/ -#cgo windows LDFLAGS: -L${SRCDIR}/static-build/install/lib/ -lgit2 -lwinhttp -#cgo !windows pkg-config: --static ${SRCDIR}/static-build/install/lib/pkgconfig/libgit2.pc -#cgo CFLAGS: -DLIBGIT2_STATIC -#include - -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 1 || LIBGIT2_VER_MINOR > 1 -# error "Invalid libgit2 version; this git2go supports libgit2 between v1.1.0 and v1.1.0" -#endif -*/ -import "C" diff --git a/git_system_dynamic.go b/git_system_dynamic.go deleted file mode 100644 index 3013804..0000000 --- a/git_system_dynamic.go +++ /dev/null @@ -1,14 +0,0 @@ -// +build !static - -package git - -/* -#cgo pkg-config: libgit2 -#cgo CFLAGS: -DLIBGIT2_DYNAMIC -#include - -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 1 || LIBGIT2_VER_MINOR > 1 -# error "Invalid libgit2 version; this git2go supports libgit2 between v1.1.0 and v1.1.0" -#endif -*/ -import "C" diff --git a/git_system_static.go b/git_system_static.go deleted file mode 100644 index f3da651..0000000 --- a/git_system_static.go +++ /dev/null @@ -1,14 +0,0 @@ -// +build static,system_libgit2 - -package git - -/* -#cgo pkg-config: libgit2 --static -#cgo CFLAGS: -DLIBGIT2_STATIC -#include - -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 1 || LIBGIT2_VER_MINOR > 1 -# error "Invalid libgit2 version; this git2go supports libgit2 between v1.1.0 and v1.1.0" -#endif -*/ -import "C" -- cgit v1.2.3