From 1d6cce7c520d18f2824bc6042a3858d0920d6521 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sat, 14 Aug 2021 19:35:00 +1000 Subject: [PATCH] [windows-x] Simplify build assets --- .../buildassets/{build => onhold}/dialog/README.md | 0 .../{build => onhold}/dialog/info-dark.png | Bin .../{build => onhold}/dialog/info-dark2x.png | Bin .../{build => onhold}/dialog/info-light.png | Bin .../{build => onhold}/dialog/info-light2x.png | Bin .../{build => onhold}/dialog/question-dark.png | Bin .../{build => onhold}/dialog/question-dark2x.png | Bin .../{build => onhold}/dialog/question-light.png | Bin .../{build => onhold}/dialog/question-light2x.png | Bin .../{build => onhold}/dialog/warning-dark.png | Bin .../{build => onhold}/dialog/warning-dark2x.png | Bin .../{build => onhold}/dialog/warning-light.png | Bin .../{build => onhold}/dialog/warning-light2x.png | Bin v2/pkg/buildassets/{build => onhold}/tray/README.md | 0 v2/pkg/commands/build/build.go | 10 +++------- v2/pkg/commands/build/desktop.go | 7 +++++++ 16 files changed, 10 insertions(+), 7 deletions(-) rename v2/pkg/buildassets/{build => onhold}/dialog/README.md (100%) rename v2/pkg/buildassets/{build => onhold}/dialog/info-dark.png (100%) rename v2/pkg/buildassets/{build => onhold}/dialog/info-dark2x.png (100%) rename v2/pkg/buildassets/{build => onhold}/dialog/info-light.png (100%) rename v2/pkg/buildassets/{build => onhold}/dialog/info-light2x.png (100%) rename v2/pkg/buildassets/{build => onhold}/dialog/question-dark.png (100%) rename v2/pkg/buildassets/{build => onhold}/dialog/question-dark2x.png (100%) rename v2/pkg/buildassets/{build => onhold}/dialog/question-light.png (100%) rename v2/pkg/buildassets/{build => onhold}/dialog/question-light2x.png (100%) rename v2/pkg/buildassets/{build => onhold}/dialog/warning-dark.png (100%) rename v2/pkg/buildassets/{build => onhold}/dialog/warning-dark2x.png (100%) rename v2/pkg/buildassets/{build => onhold}/dialog/warning-light.png (100%) rename v2/pkg/buildassets/{build => onhold}/dialog/warning-light2x.png (100%) rename v2/pkg/buildassets/{build => onhold}/tray/README.md (100%) diff --git a/v2/pkg/buildassets/build/dialog/README.md b/v2/pkg/buildassets/onhold/dialog/README.md similarity index 100% rename from v2/pkg/buildassets/build/dialog/README.md rename to v2/pkg/buildassets/onhold/dialog/README.md diff --git a/v2/pkg/buildassets/build/dialog/info-dark.png b/v2/pkg/buildassets/onhold/dialog/info-dark.png similarity index 100% rename from v2/pkg/buildassets/build/dialog/info-dark.png rename to v2/pkg/buildassets/onhold/dialog/info-dark.png diff --git a/v2/pkg/buildassets/build/dialog/info-dark2x.png b/v2/pkg/buildassets/onhold/dialog/info-dark2x.png similarity index 100% rename from v2/pkg/buildassets/build/dialog/info-dark2x.png rename to v2/pkg/buildassets/onhold/dialog/info-dark2x.png diff --git a/v2/pkg/buildassets/build/dialog/info-light.png b/v2/pkg/buildassets/onhold/dialog/info-light.png similarity index 100% rename from v2/pkg/buildassets/build/dialog/info-light.png rename to v2/pkg/buildassets/onhold/dialog/info-light.png diff --git a/v2/pkg/buildassets/build/dialog/info-light2x.png b/v2/pkg/buildassets/onhold/dialog/info-light2x.png similarity index 100% rename from v2/pkg/buildassets/build/dialog/info-light2x.png rename to v2/pkg/buildassets/onhold/dialog/info-light2x.png diff --git a/v2/pkg/buildassets/build/dialog/question-dark.png b/v2/pkg/buildassets/onhold/dialog/question-dark.png similarity index 100% rename from v2/pkg/buildassets/build/dialog/question-dark.png rename to v2/pkg/buildassets/onhold/dialog/question-dark.png diff --git a/v2/pkg/buildassets/build/dialog/question-dark2x.png b/v2/pkg/buildassets/onhold/dialog/question-dark2x.png similarity index 100% rename from v2/pkg/buildassets/build/dialog/question-dark2x.png rename to v2/pkg/buildassets/onhold/dialog/question-dark2x.png diff --git a/v2/pkg/buildassets/build/dialog/question-light.png b/v2/pkg/buildassets/onhold/dialog/question-light.png similarity index 100% rename from v2/pkg/buildassets/build/dialog/question-light.png rename to v2/pkg/buildassets/onhold/dialog/question-light.png diff --git a/v2/pkg/buildassets/build/dialog/question-light2x.png b/v2/pkg/buildassets/onhold/dialog/question-light2x.png similarity index 100% rename from v2/pkg/buildassets/build/dialog/question-light2x.png rename to v2/pkg/buildassets/onhold/dialog/question-light2x.png diff --git a/v2/pkg/buildassets/build/dialog/warning-dark.png b/v2/pkg/buildassets/onhold/dialog/warning-dark.png similarity index 100% rename from v2/pkg/buildassets/build/dialog/warning-dark.png rename to v2/pkg/buildassets/onhold/dialog/warning-dark.png diff --git a/v2/pkg/buildassets/build/dialog/warning-dark2x.png b/v2/pkg/buildassets/onhold/dialog/warning-dark2x.png similarity index 100% rename from v2/pkg/buildassets/build/dialog/warning-dark2x.png rename to v2/pkg/buildassets/onhold/dialog/warning-dark2x.png diff --git a/v2/pkg/buildassets/build/dialog/warning-light.png b/v2/pkg/buildassets/onhold/dialog/warning-light.png similarity index 100% rename from v2/pkg/buildassets/build/dialog/warning-light.png rename to v2/pkg/buildassets/onhold/dialog/warning-light.png diff --git a/v2/pkg/buildassets/build/dialog/warning-light2x.png b/v2/pkg/buildassets/onhold/dialog/warning-light2x.png similarity index 100% rename from v2/pkg/buildassets/build/dialog/warning-light2x.png rename to v2/pkg/buildassets/onhold/dialog/warning-light2x.png diff --git a/v2/pkg/buildassets/build/tray/README.md b/v2/pkg/buildassets/onhold/tray/README.md similarity index 100% rename from v2/pkg/buildassets/build/tray/README.md rename to v2/pkg/buildassets/onhold/tray/README.md diff --git a/v2/pkg/commands/build/build.go b/v2/pkg/commands/build/build.go index 168264bb1..f48872cf5 100644 --- a/v2/pkg/commands/build/build.go +++ b/v2/pkg/commands/build/build.go @@ -2,7 +2,6 @@ package build import ( "fmt" - "github.com/leaanthony/slicer" "log" "os" "path/filepath" @@ -114,12 +113,9 @@ func Build(options *Options) (string, error) { } // Build the base assets - userTags := slicer.String(options.UserTags) - if !userTags.Contains("experimental") { - err = builder.BuildAssets(options) - if err != nil { - return "", err - } + err = builder.BuildAssets(options) + if err != nil { + return "", err } // If we are building for windows, we will need to generate the asset bundle before diff --git a/v2/pkg/commands/build/desktop.go b/v2/pkg/commands/build/desktop.go index 939e35d93..54e248c6b 100644 --- a/v2/pkg/commands/build/desktop.go +++ b/v2/pkg/commands/build/desktop.go @@ -2,6 +2,7 @@ package build import ( "fmt" + "github.com/leaanthony/slicer" "github.com/wailsapp/wails/v2/pkg/buildassets" "io/ioutil" "path/filepath" @@ -34,6 +35,12 @@ func (d *DesktopBuilder) BuildAssets(options *Options) error { } } + // We only build assets for cgo builds + userTags := slicer.String(options.UserTags) + if userTags.Contains("experimental") { + return nil + } + // Get a list of assets from the HTML assets, err := d.BaseBuilder.ExtractAssets() if err != nil {