Skip to content

Commit

Permalink
Add webgl-debug.js to the bundle file to not depend on network and ha…
Browse files Browse the repository at this point in the history
…ve a reproducible build in all case.
  • Loading branch information
Cedric BAIL committed Feb 23, 2022
1 parent efa20d0 commit 583eb23
Show file tree
Hide file tree
Showing 7 changed files with 1,218 additions and 39 deletions.
14 changes: 1 addition & 13 deletions cmd/fyne/internal/commands/package-gopherjs.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package commands

import (
"io"
"net/http"
"os"
"path/filepath"

Expand Down Expand Up @@ -39,21 +37,11 @@ func (p *Packager) packageGopherJS() error {

// Download webgl-debug.js directly from the KhronosGroup repository when needed
if !p.release {
r, err := http.Get("https://raw.githubusercontent.com/KhronosGroup/WebGLDeveloperTools/b42e702487d02d5278814e0fe2e2888d234893e6/src/debug/webgl-debug.js")
if err != nil {
return err
}
defer r.Body.Close()

webglDebugFile := filepath.Join(appDir, "webgl-debug.js")
out, err := os.Create(webglDebugFile)
err := util.WriteFile(webglDebugFile, templates.WebGLDebugJs)
if err != nil {
return err
}
defer out.Close()

_, err = io.Copy(out, r.Body)
return err
}

return nil
Expand Down
14 changes: 1 addition & 13 deletions cmd/fyne/internal/commands/package-wasm.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package commands

import (
"io"
"net/http"
"os"
"path/filepath"
"runtime"
Expand Down Expand Up @@ -55,21 +53,11 @@ func (p *Packager) packageWasm() error {

// Download webgl-debug.js directly from the KhronosGroup repository when needed
if !p.release {
r, err := http.Get("https://raw.githubusercontent.com/KhronosGroup/WebGLDeveloperTools/b42e702487d02d5278814e0fe2e2888d234893e6/src/debug/webgl-debug.js")
if err != nil {
return err
}
defer r.Body.Close()

webglDebugFile := filepath.Join(appDir, "webgl-debug.js")
out, err := os.Create(webglDebugFile)
err := util.WriteFile(webglDebugFile, templates.WebGLDebugJs)
if err != nil {
return err
}
defer out.Close()

_, err = io.Copy(out, r.Body)
return err
}

return nil
Expand Down
14 changes: 1 addition & 13 deletions cmd/fyne/internal/commands/package-web.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package commands

import (
"io"
"net/http"
"os"
"path/filepath"
"runtime"
Expand Down Expand Up @@ -59,21 +57,11 @@ func (p *Packager) packageWeb() error {

// Download webgl-debug.js directly from the KhronosGroup repository when needed
if !p.release {
r, err := http.Get("https://raw.githubusercontent.com/KhronosGroup/WebGLDeveloperTools/b42e702487d02d5278814e0fe2e2888d234893e6/src/debug/webgl-debug.js")
if err != nil {
return err
}
defer r.Body.Close()

webglDebugFile := filepath.Join(appDir, "webgl-debug.js")
out, err := os.Create(webglDebugFile)
err := util.WriteFile(webglDebugFile, templates.WebGLDebugJs)
if err != nil {
return err
}
defer out.Close()

_, err = io.Copy(out, r.Body)
return err
}

return nil
Expand Down
5 changes: 5 additions & 0 deletions cmd/fyne/internal/templates/bundled.go

Large diffs are not rendered by default.

0 comments on commit 583eb23

Please sign in to comment.