require '-tags exp' for hybrid / server builds

wailsapp · Jul 26, 2022 · 2b558ad · 2b558ad
1 parent 4060bd2
commit 2b558ad
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/v2/cmd/wails/internal/commands/build/build.go b/v2/cmd/wails/internal/commands/build/build.go
@@ -146,6 +146,13 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
  }
  }
 
+ // Validate experimental
+ if slicer.String([]string{"hybrid", "server"}).Contains(outputType) {
+ if !slicer.String(userTags).Contains("exp") {
+ return fmt.Errorf("output type '%s' requires the '-tags exp'", outputType)
+ }
+ }
+
  // Webview2 installer strategy (download by default)
  wv2rtstrategy := ""
  webview2 = strings.ToLower(webview2)

diff --git a/v2/internal/appng/app_hybrid_server.go b/v2/internal/appng/app_hybrid_server.go
@@ -1,5 +1,5 @@
-//go:build hybrid || server
-// +build hybrid server
+//go:build (exp && hybrid) || (exp && server)
+// +build exp,hybrid exp,server
 
 package appng
 

diff --git a/v2/internal/frontend/hybrid/hybrid.go b/v2/internal/frontend/hybrid/hybrid.go
@@ -1,5 +1,5 @@
-//go:build hybrid
-// +build hybrid
+//go:build exp && hybrid
+// +build exp,hybrid
 
 package hybrid
 

diff --git a/v2/internal/frontend/hybrid/server.go b/v2/internal/frontend/hybrid/server.go
@@ -1,5 +1,5 @@
-//go:build server
-// +build server
+//go:build exp && server
+// +build exp,server
 
 package hybrid