From 1062aeb13628d18f8a754749993d2da06cb3600e Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Mon, 22 Jun 2020 20:11:56 +1000 Subject: [PATCH 01/10] Add `ldflags` option to build --- cmd/helpers.go | 5 +++++ cmd/project.go | 1 + cmd/wails/4_build.go | 9 +++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cmd/helpers.go b/cmd/helpers.go index 1a8d5614..7bbf9775 100644 --- a/cmd/helpers.go +++ b/cmd/helpers.go @@ -561,6 +561,11 @@ func ldFlags(po *ProjectOptions, buildMode string) string { ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode + // Add additional ldflags passed in via the `ldflags` cli flag + if len(po.LdFlags) > 0 { + ldflags += " " + po.LdFlags + } + // If we wish to generate typescript if po.typescriptDefsFilename != "" { cwd, err := os.Getwd() diff --git a/cmd/project.go b/cmd/project.go index 47b472dd..889fb63d 100644 --- a/cmd/project.go +++ b/cmd/project.go @@ -161,6 +161,7 @@ type ProjectOptions struct { CrossCompile bool Platform string Architecture string + LdFlags string } // Defaults sets the default project template diff --git a/cmd/wails/4_build.go b/cmd/wails/4_build.go index 5abdb8f5..453d858d 100644 --- a/cmd/wails/4_build.go +++ b/cmd/wails/4_build.go @@ -29,6 +29,7 @@ func init() { var typescriptFilename = "" var verbose = false var platform = "" + var ldflags = "" buildSpinner := spinner.NewSpinner() buildSpinner.SetSpinSpeed(50) @@ -40,7 +41,8 @@ func init() { BoolFlag("f", "Force rebuild of application components", &forceRebuild). BoolFlag("d", "Build in Debug mode", &debugMode). BoolFlag("verbose", "Verbose output", &verbose). - StringFlag("t", "Generate Typescript definitions to given file (at runtime)", &typescriptFilename) + StringFlag("t", "Generate Typescript definitions to given file (at runtime)", &typescriptFilename). + StringFlag("ldflags", "Extra options for -ldflags", &ldflags) var b strings.Builder for _, plat := range getSupportedPlatforms() { @@ -84,7 +86,7 @@ func init() { } } if !supported { - return fmt.Errorf("Unsupported platform '%s' specified.\nPlease run `wails build -h` to see the supported platform/architecture options.", platform) + return fmt.Errorf("unsupported platform '%s' specified.\nPlease run `wails build -h` to see the supported platform/architecture options", platform) } projectOptions.CrossCompile = true @@ -93,6 +95,9 @@ func init() { projectOptions.Architecture = plat[1] } + // Add ldflags + projectOptions.LdFlags = ldflags + // Validate config // Check if we have a frontend err = cmd.ValidateFrontendConfig(projectOptions) From 98468d1c4dd127b7534ed63d06318cf142d4280d Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Mon, 22 Jun 2020 20:14:10 +1000 Subject: [PATCH 02/10] v1.7.0-pre1 --- cmd/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/version.go b/cmd/version.go index f0addc33..1558fd77 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -1,4 +1,4 @@ package cmd // Version - Wails version -const Version = "v1.6.0" +const Version = "v1.7.0-pre1" From 626854f1b7c41c9c270b1dec021b83bc6a775b9a Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sun, 28 Jun 2020 14:23:23 +1000 Subject: [PATCH 03/10] free filter memory --- lib/renderer/webview/webview.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/renderer/webview/webview.h b/lib/renderer/webview/webview.h index 0a87cec5..525b82e2 100644 --- a/lib/renderer/webview/webview.h +++ b/lib/renderer/webview/webview.h @@ -447,6 +447,7 @@ struct webview_priv } gtk_file_filter_set_name(file_filter, filter); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dlg), file_filter); + g_strfreev(filters); } gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dlg), FALSE); gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dlg), FALSE); From e1b025cab6d91cb420dd67b3bc25141c81b4fd6a Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Fri, 3 Jul 2020 06:05:47 +1000 Subject: [PATCH 04/10] fix: windows icon name --- cmd/package.go | 2 +- go.mod | 5 ++--- go.sum | 12 ++++++------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/cmd/package.go b/cmd/package.go index 1774ba63..fd840abd 100644 --- a/cmd/package.go +++ b/cmd/package.go @@ -293,7 +293,7 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error { } // Generate icon from PNG - err = generateWindowsIcon(icon, po.BinaryName+".ico") + err = generateWindowsIcon(icon, basename+".ico") if err != nil { return err } diff --git a/go.mod b/go.mod index d6b34de2..fb99f7ea 100644 --- a/go.mod +++ b/go.mod @@ -21,10 +21,9 @@ require ( github.com/sirupsen/logrus v1.4.1 github.com/stretchr/testify v1.3.0 // indirect github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba - golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 // indirect golang.org/x/image v0.0.0-20200430140353-33d19683fad8 - golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5 // indirect - golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862 + golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect + golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd golang.org/x/text v0.3.0 gopkg.in/AlecAivazis/survey.v1 v1.8.4 gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22 diff --git a/go.sum b/go.sum index 6b2c1854..b1319264 100644 --- a/go.sum +++ b/go.sum @@ -68,21 +68,21 @@ github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba h1:2DHfQOxcpWdGf5 github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba/go.mod h1:iLnlXG2Pakcii2CU0cbY07DRCSvpWNa7nFxtevhOChk= golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 h1:iMGN4xG0cnqj3t+zOM8wUB0BiPKHEwSxEZCvzcbZuvk= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/image v0.0.0-20200430140353-33d19683fad8 h1:6WW6V3x1P/jokJBpRQYUJnMHRP6isStQwCozxnU7XQw= golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5 h1:6M3SDHlHHDCx2PcQw3S4KsR170vGqDhJDOmpVd4Hjak= -golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/sys v0.0.0-20180606202747-9527bec2660b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862 h1:rM0ROo5vb9AdYJi1110yjWGMej9ITfKddS89P3Fkhug= -golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/AlecAivazis/survey.v1 v1.8.4 h1:10xXXN3wgIhPheb5NI58zFgZv32Ana7P3Tl4shW+0Qc= From 02e0250555e2523c5fcccb02fb72a731ee681d1c Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Fri, 3 Jul 2020 13:48:27 +1000 Subject: [PATCH 05/10] fix: vanilla template for windows --- cmd/templates/vanilla/frontend/src/main.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/cmd/templates/vanilla/frontend/src/main.js b/cmd/templates/vanilla/frontend/src/main.js index 9014dba5..6fd9f5c5 100644 --- a/cmd/templates/vanilla/frontend/src/main.js +++ b/cmd/templates/vanilla/frontend/src/main.js @@ -1,9 +1,8 @@ - +import 'core-js/stable'; const runtime = require('@wailsapp/runtime'); -// We need to wait for runtime.Init to complete before -// running our JS -runtime.Init(() => { +// Main entry point +function start() { // Ensure the default app div is 100% wide/high var app = document.getElementById('app'); @@ -20,9 +19,12 @@ runtime.Init(() => { `; // Connect button to Go method - document.getElementById('button').onclick = () => { - window.backend.basic().then((result) => { + document.getElementById('button').onclick = function() { + window.backend.basic().then( function(result) { document.getElementById('result').innerText = result; - }) - } -}); \ No newline at end of file + }); + }; +}; + +// We provide our entrypoint as a callback for runtime.Init +runtime.Init(start); \ No newline at end of file From c8371ee824dd66125ddf417d7f1f28b211aaa598 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Fri, 3 Jul 2020 13:52:51 +1000 Subject: [PATCH 06/10] v1.7.0-pre2 --- cmd/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/version.go b/cmd/version.go index 1558fd77..d94c804c 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -1,4 +1,4 @@ package cmd // Version - Wails version -const Version = "v1.7.0-pre1" +const Version = "v1.7.0-pre2" From 254aa664d775144d8b086fdf676de9d62b29cfbd Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Fri, 3 Jul 2020 13:54:02 +1000 Subject: [PATCH 07/10] Fix contributors --- CONTRIBUTORS.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 05b4296c..41f39b3e 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -15,7 +15,6 @@ Wails is what it is because of the time and effort given by these great people. * [admin_3.exe](https://github.com/bh90210) * [iceleo-com](https://github.com/iceleo-com) * [fallendusk](https://github.com/fallendusk) - * [Florian Didran](https://github.com/fdidron) * [Nikolai Zimmermann](https://github.com/Chronophylos) * [Toyam Cox](https://github.com/Vaelatern) * [Robin Eklind](https://github.com/mewmew) From f86996705b99faa172a70ac4da690a59d522b391 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Fri, 3 Jul 2020 20:05:01 +1000 Subject: [PATCH 08/10] v1.7.1 --- cmd/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/version.go b/cmd/version.go index d94c804c..bb092076 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -1,4 +1,4 @@ package cmd // Version - Wails version -const Version = "v1.7.0-pre2" +const Version = "v1.7.1" From bc0478b2b2157e19d9a60c87b9ec5ab36ace1adb Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sun, 6 Sep 2020 15:45:37 +1000 Subject: [PATCH 09/10] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 448ee30a..42c85177 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ Awesome Release Pipelines - Pre-Release Pipelines

The traditional method of providing web interfaces to Go programs is via a built-in web server. Wails offers a different approach: it provides the ability to wrap both Go code and a web frontend into a single binary. Tools are provided to make this easy for you by handling project creation, compilation and bundling. All you have to do is get creative! From 5d754f40de22eebddf870b5f7f24a51ba081ce2b Mon Sep 17 00:00:00 2001 From: Arthur Wiebe Date: Wed, 9 Sep 2020 22:06:14 -0400 Subject: [PATCH 10/10] resolve angular routing broken when app is built --- .../angular-template/frontend/src/app/app-routing.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/templates/angular-template/frontend/src/app/app-routing.module.ts b/cmd/templates/angular-template/frontend/src/app/app-routing.module.ts index 4e5f86c4..249a14a5 100644 --- a/cmd/templates/angular-template/frontend/src/app/app-routing.module.ts +++ b/cmd/templates/angular-template/frontend/src/app/app-routing.module.ts @@ -5,7 +5,7 @@ const routes: Routes = []; @NgModule({ imports: [ - RouterModule.forRoot(routes) + RouterModule.forRoot(routes,{useHash:true}) ], exports: [RouterModule] })