Update to latest develop and add JS support in pacakge meta

fyne-io · Mar 1, 2022 · 3d5912b · 3d5912b
1 parent efa454b
commit 3d5912b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/cmd/fyne/internal/commands/package.go b/cmd/fyne/internal/commands/package.go
@@ -234,6 +234,12 @@ func (p *Packager) buildPackage(runner runner) ([]string, error) {
 		release: p.release,
 		tags:    tags,
 		runner:  runner,
+
+		icon:     p.icon,
+		id:       p.appID,
+		name:     p.name,
+		version:  p.appVersion,
+		buildNum: p.appBuild,
 	}
 
 	err = bGopherJS.build()

diff --git a/cmd/fyne/internal/commands/package_test.go b/cmd/fyne/internal/commands/package_test.go
@@ -119,7 +119,9 @@ func Test_PackageWasm(t *testing.T) {
 		},
 		{
 			expectedValue: expectedValue{
-				args:  []string{"build", "-o", "myTest.wasm"},
+				args: []string{"build", "-ldflags",
+					"-X 'fyne.io/fyne/v2/internal/app.MetaName=myTest.wasm' -X 'fyne.io/fyne/v2/internal/app.MetaVersion=1.0.0' -X 'fyne.io/fyne/v2/internal/app.MetaBuild=1'",
+					"-o", "myTest.wasm"},
 				env:   []string{"GOARCH=wasm", "GOOS=js"},
 				osEnv: true,
 				dir:   "myTest",
@@ -226,7 +228,9 @@ func Test_PackageGopherJS(t *testing.T) {
 	expected := []mockRunner{
 		{
 			expectedValue: expectedValue{
-				args:  []string{"build", "-o", "myTest.js"},
+				args: []string{"build", "-ldflags",
+					"-X 'fyne.io/fyne/v2/internal/app.MetaName=myTest.js' -X 'fyne.io/fyne/v2/internal/app.MetaVersion=1.0.0' -X 'fyne.io/fyne/v2/internal/app.MetaBuild=1'",
+					"-o", "myTest.js"},
 				osEnv: true,
 				dir:   "myTest",
 			},
@@ -354,7 +358,9 @@ func Test_PackageWeb(t *testing.T) {
 		},
 		{
 			expectedValue: expectedValue{
-				args:  []string{"build", "-o", "myTest.wasm"},
+				args: []string{"build", "-ldflags",
+					"-X 'fyne.io/fyne/v2/internal/app.MetaName=myTest' -X 'fyne.io/fyne/v2/internal/app.MetaVersion=1.0.0' -X 'fyne.io/fyne/v2/internal/app.MetaBuild=1'",
+					"-o", "myTest.wasm"},
 				env:   []string{"GOARCH=wasm", "GOOS=js"},
 				osEnv: true,
 				dir:   "myTest",
@@ -365,7 +371,9 @@ func Test_PackageWeb(t *testing.T) {
 		},
 		{
 			expectedValue: expectedValue{
-				args:  []string{"build", "-o", "myTest.js"},
+				args: []string{"build", "-ldflags",
+					"-X 'fyne.io/fyne/v2/internal/app.MetaName=myTest' -X 'fyne.io/fyne/v2/internal/app.MetaVersion=1.0.0' -X 'fyne.io/fyne/v2/internal/app.MetaBuild=1'",
+					"-o", "myTest.js"},
 				osEnv: true,
 				dir:   "myTest",
 			},