From 68cd6a7f0e9a52e2d4a9e93423405134ae7b5495 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sun, 23 Feb 2020 07:06:55 +1100 Subject: [PATCH] Warn for unsupported platforms --- cmd/wails/4_build.go | 9 +++++++++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/cmd/wails/4_build.go b/cmd/wails/4_build.go index 8a362316..7443d695 100644 --- a/cmd/wails/4_build.go +++ b/cmd/wails/4_build.go @@ -6,6 +6,7 @@ import ( "runtime" "strings" + "github.com/leaanthony/slicer" "github.com/leaanthony/spinner" "github.com/wailsapp/wails/cmd" ) @@ -137,6 +138,7 @@ func init() { // Set cross-compile projectOptions.Platform = runtime.GOOS if len(platform) > 0 { + projectOptions.CrossCompile = true projectOptions.Platform = platform projectOptions.Architecture = "amd64" @@ -147,6 +149,13 @@ func init() { projectOptions.Platform = p[0] projectOptions.Architecture = p[1] } + + // Check supported platforms + supportedPlatforms := slicer.String([]string{"linux/amd64", "linux/386", "windows/amd64", "windows/386", "darwin/amd64"}) + targetPlatform := projectOptions.Platform + "/" + projectOptions.Architecture + if !supportedPlatforms.Contains(targetPlatform) { + println("\n*** WARNING: Unsupported target platform", targetPlatform+".", "Supported:", supportedPlatforms.Join(", ")) + } } err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode, packageApp, projectOptions) diff --git a/go.mod b/go.mod index 5f62b205..7a0e6c18 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/kennygrant/sanitize v1.2.4 github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect github.com/leaanthony/mewn v0.10.7 - github.com/leaanthony/slicer v1.4.0 + github.com/leaanthony/slicer v1.4.1 github.com/leaanthony/spinner v0.5.3 github.com/mattn/go-colorable v0.1.1 // indirect github.com/mattn/go-isatty v0.0.7 // indirect diff --git a/go.sum b/go.sum index 24fc4f54..acd2b832 100644 --- a/go.sum +++ b/go.sum @@ -28,8 +28,8 @@ github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/leaanthony/mewn v0.10.7 h1:jCcNJyIUOpwj+I5SuATvCugDjHkoo+j6ubEOxxrxmPA= github.com/leaanthony/mewn v0.10.7/go.mod h1:CRkTx8unLiSSilu/Sd7i1LwrdaAL+3eQ3ses99qGMEQ= -github.com/leaanthony/slicer v1.4.0 h1:Q9u4w+UBU4WHjXnEDdz+eRLMKF/rnyosRBiqULnc1J8= -github.com/leaanthony/slicer v1.4.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY= +github.com/leaanthony/slicer v1.4.1 h1:X/SmRIDhkUAolP79mSTO0jTcVX1k504PJBqvV6TwP0w= +github.com/leaanthony/slicer v1.4.1/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY= github.com/leaanthony/spinner v0.5.3 h1:IMTvgdQCec5QA4qRy0wil4XsRP+QcG1OwLWVK/LPZ5Y= github.com/leaanthony/spinner v0.5.3/go.mod h1:oHlrvWicr++CVV7ALWYi+qHk/XNA91D9IJ48IqmpVUo= github.com/leaanthony/synx v0.1.0 h1:R0lmg2w6VMb8XcotOwAe5DLyzwjLrskNkwU7LLWsyL8=