yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

feat: cross compilation for windows

Browse Source
This commit is contained in:
James Houlahan
2020-05-18 08:18:34 +02:00
parent bbf1364e30
commit 66f23bef99
1 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Makefile
View File

@ -1,5 +1,9 @@
export GO111MODULE=on export GO111MODULE=on
# By default, the target OS is the same as the host OS,
# but this can be overridden by setting TARGET_OS to "windows"/"darwin"/"linux".
GOOS:=$(shell go env GOOS) GOOS:=$(shell go env GOOS)
TARGET_OS?=${GOOS}
## Build ## Build
.PHONY: build build-nogui check-has-go .PHONY: build build-nogui check-has-go
@ -23,25 +27,25 @@ DEPLOY_DIR:=cmd/Desktop-Bridge/deploy
ICO_FILES:= ICO_FILES:=
EXE:=$(shell basename ${CURDIR}) EXE:=$(shell basename ${CURDIR})
ifeq "${GOOS}" "windows" ifeq "${TARGET_OS}" "windows"
EXE+=.exe EXE+=.exe
ICO_FILES:=logo.ico icon.rc icon_windows.syso ICO_FILES:=logo.ico icon.rc icon_windows.syso
endif endif
ifeq "${GOOS}" "darwin" ifeq "${TARGET_OS}" "darwin"
DARWINAPP_CONTENTS:=${DEPLOY_DIR}/darwin/${EXE}.app/Contents DARWINAPP_CONTENTS:=${DEPLOY_DIR}/darwin/${EXE}.app/Contents
EXE:=${EXE}.app/Contents/MacOS/${EXE} EXE:=${EXE}.app/Contents/MacOS/${EXE}
endif endif
EXE_TARGET:=${DEPLOY_DIR}/${GOOS}/${EXE} EXE_TARGET:=${DEPLOY_DIR}/${TARGET_OS}/${EXE}
TGZ_TARGET:=bridge_${GOOS}_${REVISION}.tgz TGZ_TARGET:=bridge_${TARGET_OS}_${REVISION}.tgz
build: ${TGZ_TARGET} build: ${TGZ_TARGET}
build-nogui: build-nogui:
go build ${BUILD_FLAGS_NOGUI} -o Desktop-Bridge cmd/Desktop-Bridge/main.go go build ${BUILD_FLAGS_NOGUI} -o Desktop-Bridge cmd/Desktop-Bridge/main.go
${TGZ_TARGET}: ${DEPLOY_DIR}/${GOOS} ${TGZ_TARGET}: ${DEPLOY_DIR}/${TARGET_OS}
rm -f $@ rm -f $@
cd ${DEPLOY_DIR} && tar czf ../../../$@ ${GOOS} cd ${DEPLOY_DIR} && tar czf ../../../$@ ${TARGET_OS}
${DEPLOY_DIR}/linux: ${EXE_TARGET} ${DEPLOY_DIR}/linux: ${EXE_TARGET}
cp -pf ./internal/frontend/share/icons/logo.svg ${DEPLOY_DIR}/linux/ cp -pf ./internal/frontend/share/icons/logo.svg ${DEPLOY_DIR}/linux/
@ -61,36 +65,46 @@ ${DEPLOY_DIR}/windows: ${EXE_TARGET}
cp ./internal/frontend/share/icons/logo.ico ${DEPLOY_DIR}/windows/ cp ./internal/frontend/share/icons/logo.ico ${DEPLOY_DIR}/windows/
cp LICENSE ${DEPLOY_DIR}/windows/ cp LICENSE ${DEPLOY_DIR}/windows/
QT_BUILD_TARGET:=build desktop
ifneq "${GOOS}" "${TARGET_OS}"
ifeq "${TARGET_OS}" "windows"
QT_BUILD_TARGET:=-docker build windows_64_shared
endif
endif
${EXE_TARGET}: check-has-go gofiles ${ICO_FILES} update-vendor ${EXE_TARGET}: check-has-go gofiles ${ICO_FILES} update-vendor
rm -rf deploy ${GOOS} ${DEPLOY_DIR} rm -rf deploy ${TARGET_OS} ${DEPLOY_DIR}
cp cmd/Desktop-Bridge/main.go . cp cmd/Desktop-Bridge/main.go .
qtdeploy ${BUILD_FLAGS} build desktop qtdeploy ${BUILD_FLAGS} ${QT_BUILD_TARGET}
mv deploy cmd/Desktop-Bridge mv deploy cmd/Desktop-Bridge
rm -rf ${GOOS} main.go rm -rf ${TARGET_OS} main.go
logo.ico: ./internal/frontend/share/icons/logo.ico logo.ico: ./internal/frontend/share/icons/logo.ico
cp $^ . cp $^ .
icon.rc: ./internal/frontend/share/icon.rc icon.rc: ./internal/frontend/share/icon.rc
cp $^ . cp $^ .
./internal/frontend/qt/icon_windows.syso: ./internal/frontend/share/icon.rc logo.ico ./internal/frontend/qt/icon_windows.syso: ./internal/frontend/share/icon.rc logo.ico
windres $< $@ windres --target=coff-x86-64 -o $@ $<
icon_windows.syso: ./internal/frontend/qt/icon_windows.syso icon_windows.syso: ./internal/frontend/qt/icon_windows.syso
cp $^ . cp $^ .
## Rules for therecipe/qt ## Rules for therecipe/qt
.PHONY: prepare-vendor update-vendor .PHONY: prepare-vendor update-vendor
THERECIPE_ENV:=github.com/therecipe/env_${GOOS}_amd64_513 THERECIPE_ENV:=github.com/therecipe/env_${TARGET_OS}_amd64_513
# vendor folder will be deleted by gomod hence we cache the big repo # vendor folder will be deleted by gomod hence we cache the big repo
# therecipe/env in order to download it only once # therecipe/env in order to download it only once
vendor-cache/${THERECIPE_ENV}: vendor-cache/${THERECIPE_ENV}:
git clone https://${THERECIPE_ENV}.git vendor-cache/${THERECIPE_ENV} git clone https://${THERECIPE_ENV}.git vendor-cache/${THERECIPE_ENV}
# The command used to make symlinks is different on windows.
# So if the GOOS is windows and we aren't crossbuilding (in which case the host os would still be *nix)
# we need to change the LINKCMD to something windowsy.
LINKCMD:=ln -sf ${CURDIR}/vendor-cache/${THERECIPE_ENV} vendor/${THERECIPE_ENV} LINKCMD:=ln -sf ${CURDIR}/vendor-cache/${THERECIPE_ENV} vendor/${THERECIPE_ENV}
ifeq "${GOOS}" "windows" ifeq "${GOOS}" "windows"
WINDIR:=$(subst /c/,c:\\,${CURDIR})/vendor-cache/${THERECIPE_ENV} WINDIR:=$(subst /c/,c:\\,${CURDIR})/vendor-cache/${THERECIPE_ENV}
LINKCMD:=cmd //c 'mklink $(subst /,\,vendor\${THERECIPE_ENV} ${WINDIR})' LINKCMD:=cmd //c 'mklink $(subst /,\,vendor\${THERECIPE_ENV} ${WINDIR})'
endif endif
prepare-vendor: prepare-vendor:
@ -213,3 +227,4 @@ clean: clean-frontend-qt
rm -rf vendor-cache rm -rf vendor-cache
rm -rf cmd/Desktop-Bridge/deploy rm -rf cmd/Desktop-Bridge/deploy
rm -f build last.log mem.pprof rm -f build last.log mem.pprof
rm -rf logo.ico icon.rc icon_windows.syso internal/frontend/qt/icon_windows.syso