fix: ldflags

libp2p · Nov 8, 2022 · 31c61e5 · 31c61e5
1 parent 5660800
commit 31c61e5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -60,14 +60,14 @@ package-darwin:
 		-name=Punchr
 
 	# fyne-cross doesn't really pick up the right architectures. So we'll compile it again
-	CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -ldflags="-X 'gui/client/client.VersionGUI=$(VERSION_CLIENT_GUI)' -X 'gui/client/client.VersionCLI=$(VERSION_CLIENT)'" -o fyne-cross/dist/darwin-amd64/Punchr.app/Contents/MacOS/punchr fyne.go
-	CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -ldflags="-X 'gui/client/client.VersionGUI=$(VERSION_CLIENT_GUI)' -X 'gui/client/client.VersionCLI=$(VERSION_CLIENT)'" -o fyne-cross/dist/darwin-arm64/Punchr.app/Contents/MacOS/punchr fyne.go
+	CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -ldflags="-X 'github.com/dennis-tra/punchr/gui/client.VersionGUI=$(VERSION_CLIENT_GUI)' -X 'github.com/dennis-tra/punchr/gui/client.VersionCLI=$(VERSION_CLIENT)'" -o fyne-cross/dist/darwin-amd64/Punchr.app/Contents/MacOS/punchr fyne.go
+	CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -ldflags="-X 'github.com/dennis-tra/punchr/gui/client.VersionGUI=$(VERSION_CLIENT_GUI)' -X 'github.com/dennis-tra/punchr/gui/client.VersionCLI=$(VERSION_CLIENT)'" -o fyne-cross/dist/darwin-arm64/Punchr.app/Contents/MacOS/punchr fyne.go
 
 package-linux:
 	fyne-cross linux \
 		-app-version=$(VERSION_CLIENT_GUI) \
 		-arch=amd64,386 \
-		-ldflags="-X 'gui/client/client.VersionGUI=$(VERSION_CLIENT_GUI)' -X 'gui/client/client.VersionCLI=$(VERSION_CLIENT)'" \
+		-ldflags="-X 'github.com/dennis-tra/punchr/gui/client.VersionGUI=$(VERSION_CLIENT_GUI)' -X 'github.com/dennis-tra/punchr/gui/client.VersionCLI=$(VERSION_CLIENT)'" \
 		-name=Punchr \
 		-release
 
@@ -78,7 +78,7 @@ package-freebsd:
 	fyne-cross freebsd \
 		-app-version=$(VERSION_CLIENT_GUI) \
 		-arch=amd64,arm64 \
-		-ldflags="-X 'gui/client/client.VersionGUI=$(VERSION_CLIENT_GUI)' -X 'gui/client/client.VersionCLI=$(VERSION_CLIENT)'" \
+		-ldflags="-X 'github.com/dennis-tra/punchr/gui/client.VersionGUI=$(VERSION_CLIENT_GUI)' -X 'github.com/dennis-tra/punchr/gui/client.VersionCLI=$(VERSION_CLIENT)'" \
 		-name=Punchr \
 		-release
 

diff --git a/cmd/client/version b/cmd/client/version
@@ -1 +1 @@
-0.7.0
+0.8.0
diff --git a/crosscompile.sh b/crosscompile.sh
@@ -5,12 +5,12 @@ archs=(amd64 arm64 386)
 for os in "${oss[@]}"; do
   for arch in "${archs[@]}"; do
     echo "Compiling $os $arch..."
-    GOOS=${os} GOARCH=${arch} go build -ldflags="-X 'pkg/client/client.Version=$(cat cmd/client/version)'" -o dist/punchr_cli_${os}_${arch} cmd/client/*.go
+    GOOS=${os} GOARCH=${arch} go build -ldflags="-X 'github.com/dennis-tra/punchr/pkg/client.Version=$(cat cmd/client/version)'" -o dist/punchr_cli_${os}_${arch} cmd/client/*.go
   done
 done
 
 arms=(5 6 7)
 for arm in "${arms[@]}"; do
     echo "Compiling linux arm$arm..."
-    GOOS=linux GOARCH=arm GOARM=${arm} go build -ldflags="-X 'pkg/client/client.Version=$(cat cmd/client/version)'" -o dist/punchr_cli_linux_arm${arm} cmd/client/*.go
+    GOOS=linux GOARCH=arm GOARM=${arm} go build -ldflags="-X 'github.com/dennis-tra/punchr/pkg/client.Version=$(cat cmd/client/version)'" -o dist/punchr_cli_linux_arm${arm} cmd/client/*.go
 done
diff --git a/gui/client/version b/gui/client/version
@@ -1 +1 @@
-0.7.0
+0.8.0