Compare commits

..

8 Commits

Author SHA1 Message Date
Lea Anthony
670b769f82 version bump 2019-03-09 05:18:23 +11:00
Lea Anthony
eb53399824 add wails bridge assets 2019-03-08 20:39:09 +11:00
Lea Anthony
24e4fbfb68 ignore frontend files when using wails serve 2019-03-08 20:38:55 +11:00
Lea Anthony
7f54ca4ac3 version bump 2019-03-07 21:30:30 +11:00
Lea Anthony
b224803e4d fix vue basic template 2019-03-07 21:29:55 +11:00
Lea Anthony
28b2025aaa Merge pull request #63 from wailsapp/0.9.9
0.9.9
2019-03-07 08:25:23 +11:00
Lea Anthony
77e85705d1 Version bump 2019-03-07 08:23:38 +11:00
Lea Anthony
9fd24595c7 fix asset imports in vue basic template 2019-03-07 08:23:29 +11:00
4 changed files with 20 additions and 10 deletions

File diff suppressed because one or more lines are too long

View File

@@ -5,11 +5,11 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"os/exec" "os/exec"
"path"
"path/filepath" "path/filepath"
"runtime" "runtime"
"time" "time"
mewn "github.com/leaanthony/mewn"
"github.com/leaanthony/slicer" "github.com/leaanthony/slicer"
"github.com/leaanthony/spinner" "github.com/leaanthony/spinner"
) )
@@ -77,7 +77,13 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
packSpinner.Start() packSpinner.Start()
buildCommand := slicer.String() buildCommand := slicer.String()
buildCommand.AddSlice([]string{"mewn", "build"}) buildCommand.Add("mewn")
if buildMode == BuildModeBridge {
// Ignore errors
buildCommand.Add("-i")
}
buildCommand.Add("build")
if binaryName != "" { if binaryName != "" {
buildCommand.Add("-o") buildCommand.Add("-o")
@@ -240,10 +246,10 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
} }
// Copy bridge to project // Copy bridge to project
_, filename, _, _ := runtime.Caller(1) bridgeAssets := mewn.Group("../wailsruntimeassets/bridge/")
bridgeFileSource := filepath.Join(path.Dir(filename), "..", "..", "wailsruntimeassets", "bridge", bridgeFile) bridgeFileData := bridgeAssets.Bytes(bridgeFile)
bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, projectOptions.FrontEnd.Bridge, "wailsbridge.js") bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, projectOptions.FrontEnd.Bridge, "wailsbridge.js")
err = fs.CopyFile(bridgeFileSource, bridgeFileTarget) err = fs.CreateFile(bridgeFileTarget, bridgeFileData)
if err != nil { if err != nil {
return err return err
} }

View File

@@ -11,12 +11,15 @@ func basic() string {
func main() { func main() {
js := mewn.String("./frontend/dist/app.js")
css := mewn.String("./frontend/dist/app.css")
app := wails.CreateApp(&wails.AppConfig{ app := wails.CreateApp(&wails.AppConfig{
Width: 1024, Width: 1024,
Height: 768, Height: 768,
Title: "{{.Name}}", Title: "{{.Name}}",
JS: mewn.String("./frontend/dist/app.js"), JS: js,
CSS: mewn.String("./frontend/dist/app.css"), CSS: css,
Colour: "#131313", Colour: "#131313",
}) })
app.Bind(basic) app.Bind(basic)

View File

@@ -2,4 +2,4 @@ package cmd
// Version - Wails version // Version - Wails version
// ...oO(There must be a better way) // ...oO(There must be a better way)
const Version = "v0.9.8" const Version = "v0.10.0"