Move to more standard Go project structure

2022-01-04 13:54:54 +01:00 · 2022-01-04 13:54:54 +01:00 · 0e424d0a70
commit 0e424d0a70
parent 2f4c22bb39
11 changed files with 5 additions and 5 deletions
--- a/6
+++ b/6
@ -1,11 +1,11 @@
-OUT := $(notdir $(realpath .))
-PKG := stuvel.eu/flamenco-test/goja
+OUT := flamenco-goja-poc
+PKG := stuvel.eu/flamenco-test/goja/cmd/flamenco-goja-poc
 VERSION := $(shell git describe --tags --dirty --always)
 PKG_LIST := $(shell go list ${PKG}/... | grep -v /vendor/)
 STATIC_OUT := ${OUT}-${VERSION}
 PACKAGE_PATH := dist/${OUT}-${VERSION}

-LDFLAGS := -X ${PKG}/appinfo.ApplicationVersion=${VERSION}
+LDFLAGS := -X stuvel.eu/flamenco-test/goja/internal/appinfo.ApplicationVersion=${VERSION}
 BUILD_FLAGS = -ldflags="${LDFLAGS}"

 ifndef PACKAGE_PATH
--- a/cmd/flamenco-goja-poc/main.go
+++ b/cmd/flamenco-goja-poc/main.go
@ -6,8 +6,8 @@ import (
 	"github.com/mattn/go-colorable"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
-	"stuvel.eu/flamenco-test/goja/appinfo"
-	"stuvel.eu/flamenco-test/goja/job_compilers"
+	"stuvel.eu/flamenco-test/goja/internal/appinfo"
+	"stuvel.eu/flamenco-test/goja/internal/job_compilers"
 )

 func main() {
--- a/BIN
+++ b/BIN
--- a/internal/appinfo/appinfo.go
+++ b/internal/appinfo/appinfo.go
--- a/internal/job_compilers/author.go
+++ b/internal/job_compilers/author.go
--- a/internal/job_compilers/job_compilers.go
+++ b/internal/job_compilers/job_compilers.go
--- a/internal/job_compilers/path.go
+++ b/internal/job_compilers/path.go
--- a/internal/job_compilers/path_test.go
+++ b/internal/job_compilers/path_test.go
--- a/internal/job_compilers/process.go
+++ b/internal/job_compilers/process.go
--- a/internal/job_compilers/scripts.go
+++ b/internal/job_compilers/scripts.go
--- a/internal/job_compilers/scripts/simple_blender_render.js
+++ b/internal/job_compilers/scripts/simple_blender_render.js