From f16a5c1a3f3ca667f1c5e285de354893fcea65ad Mon Sep 17 00:00:00 2001 From: Ben Schwartz Date: Thu, 19 Jan 2023 14:43:28 -0500 Subject: [PATCH] fix(build/electron): build the current branch Currently, `make linux` and `make windows` download and build the `master` branch, ignoring any changes in the local repository. This change makes these commands build the local repository instead. --- Makefile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d3a0c3e..fc73c21 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,8 @@ GOBIN=$(CURDIR)/bin GOMOBILE=$(GOBIN)/gomobile # Add GOBIN to $PATH so `gomobile` can find `gobind`. GOBIND=env PATH="$(GOBIN):$(PATH)" "$(GOMOBILE)" bind -IMPORT_PATH=github.com/Jigsaw-Code/outline-go-tun2socks +IMPORT_HOST=github.com +IMPORT_PATH=$(IMPORT_HOST)/Jigsaw-Code/outline-go-tun2socks .PHONY: android apple apple_future linux windows intra clean clean-all @@ -41,7 +42,7 @@ $(BUILDDIR)/apple_future/Tun2socks.xcframework: $(GOMOBILE) XGO=$(GOBIN)/xgo TUN2SOCKS_VERSION=v1.16.11 XGO_LDFLAGS='-s -w -X main.version=$(TUN2SOCKS_VERSION)' -ELECTRON_PATH=$(IMPORT_PATH)/outline/electron +ELECTRON_PKG=outline/electron LINUX_BUILDDIR=$(BUILDDIR)/linux @@ -49,9 +50,10 @@ LINUX_BUILDDIR=$(BUILDDIR)/linux linux: $(LINUX_BUILDDIR)/tun2socks $(LINUX_BUILDDIR)/tun2socks: $(XGO) - mkdir -p "$(LINUX_BUILDDIR)" - $(XGO) -ldflags $(XGO_LDFLAGS) --targets=linux/amd64 -dest "$(LINUX_BUILDDIR)" "$(ELECTRON_PATH)" - mv "$(LINUX_BUILDDIR)/electron-linux-amd64" "$@" + mkdir -p "$(LINUX_BUILDDIR)/$(IMPORT_PATH)" + $(XGO) -ldflags $(XGO_LDFLAGS) --targets=linux/amd64 -dest "$(LINUX_BUILDDIR)" -pkg $(ELECTRON_PKG) . + mv "$(LINUX_BUILDDIR)/$(IMPORT_PATH)-linux-amd64" "$@" + rm -r "$(LINUX_BUILDDIR)/$(IMPORT_HOST)" WINDOWS_BUILDDIR=$(BUILDDIR)/windows @@ -59,9 +61,10 @@ WINDOWS_BUILDDIR=$(BUILDDIR)/windows windows: $(WINDOWS_BUILDDIR)/tun2socks.exe $(WINDOWS_BUILDDIR)/tun2socks.exe: $(XGO) - mkdir -p "$(WINDOWS_BUILDDIR)" - $(XGO) -ldflags $(XGO_LDFLAGS) --targets=windows/386 -dest "$(WINDOWS_BUILDDIR)" "$(ELECTRON_PATH)" - mv "$(WINDOWS_BUILDDIR)/electron-windows-386.exe" "$@" + mkdir -p "$(WINDOWS_BUILDDIR)/$(IMPORT_PATH)" + $(XGO) -ldflags $(XGO_LDFLAGS) --targets=windows/386 -dest "$(WINDOWS_BUILDDIR)" -pkg $(ELECTRON_PKG) . + mv "$(WINDOWS_BUILDDIR)/$(IMPORT_PATH)-windows-386.exe" "$@" + rm -r "$(WINDOWS_BUILDDIR)/$(IMPORT_HOST)" $(GOMOBILE): go.mod