mirror of
https://github.com/wailsapp/wails.git
synced 2025-05-03 00:41:59 +08:00
Added serve.
Serve only builds backend. Build is always release build.
This commit is contained in:
parent
8b2168abe7
commit
259eec97d6
@ -17,17 +17,14 @@ func init() {
|
||||
|
||||
var packageApp = false
|
||||
var forceRebuild = false
|
||||
var releaseMode = false
|
||||
buildSpinner := spinner.NewSpinner()
|
||||
buildSpinner.SetSpinSpeed(50)
|
||||
|
||||
commandDescription := `This command will check to ensure all pre-requistes are installed prior to building. If not, it will attempt to install them. Building comprises of a number of steps: install frontend dependencies, build frontend, pack frontend, compile main application.`
|
||||
initCmd := app.Command("build", "Builds your Wails project").
|
||||
LongDescription(commandDescription).
|
||||
BoolFlag("p", "Package application on successful build (Implies -r)", &packageApp).
|
||||
BoolFlag("f", "Force rebuild of application components", &forceRebuild).
|
||||
BoolFlag("r", "Build in Release mode", &releaseMode)
|
||||
|
||||
BoolFlag("p", "Package application on successful build", &packageApp).
|
||||
BoolFlag("f", "Force rebuild of application components", &forceRebuild)
|
||||
initCmd.Action(func() error {
|
||||
log := cmd.NewLogger()
|
||||
message := "Building Application"
|
||||
@ -145,11 +142,7 @@ func init() {
|
||||
}
|
||||
|
||||
// Determine which wails bridge to install
|
||||
var bridgeFile = "wailsbridge.js"
|
||||
if releaseMode || packageApp {
|
||||
// Release mode
|
||||
bridgeFile = "wailsbridge.prod.js"
|
||||
}
|
||||
bridgeFile := "wailsbridge.prod.js"
|
||||
|
||||
// Copy bridge to project
|
||||
_, filename, _, _ := runtime.Caller(1)
|
||||
@ -193,9 +186,6 @@ func init() {
|
||||
depSpinner.Success()
|
||||
|
||||
compileMessage := "Packing + Compiling project"
|
||||
if releaseMode || packageApp {
|
||||
compileMessage += " (Release Mode)"
|
||||
}
|
||||
|
||||
packSpinner := spinner.New(compileMessage + "...")
|
||||
packSpinner.SetSpinSpeed(50)
|
||||
@ -222,9 +212,8 @@ func init() {
|
||||
}
|
||||
|
||||
// Release mode
|
||||
if releaseMode || packageApp {
|
||||
buildCommand.AddSlice([]string{"-ldflags", "-X github.com/wailsapp/wails.DebugMode=false"})
|
||||
}
|
||||
buildCommand.AddSlice([]string{"-ldflags", "-X github.com/wailsapp/wails.DebugMode=false"})
|
||||
|
||||
err = program.RunCommandArray(buildCommand.AsSlice())
|
||||
if err != nil {
|
||||
packSpinner.Error()
|
231
cmd/wails/6_serve.go
Normal file
231
cmd/wails/6_serve.go
Normal file
@ -0,0 +1,231 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"os"
|
||||
"os/exec"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
|
||||
"github.com/leaanthony/slicer"
|
||||
"github.com/leaanthony/spinner"
|
||||
"github.com/wailsapp/wails/cmd"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
var forceRebuild = false
|
||||
buildSpinner := spinner.NewSpinner()
|
||||
buildSpinner.SetSpinSpeed(50)
|
||||
|
||||
commandDescription := `This command builds then serves your application in bridge mode. Useful for developing your app in a browser.`
|
||||
initCmd := app.Command("serve", "Runs your Wails project in bridge mode").
|
||||
LongDescription(commandDescription).
|
||||
BoolFlag("f", "Force rebuild of application components", &forceRebuild)
|
||||
|
||||
initCmd.Action(func() error {
|
||||
log := cmd.NewLogger()
|
||||
message := "Building Application"
|
||||
if forceRebuild {
|
||||
message += " (force rebuild)"
|
||||
}
|
||||
log.WhiteUnderline(message)
|
||||
|
||||
// Project options
|
||||
projectOptions := &cmd.ProjectOptions{}
|
||||
|
||||
// Check we are in project directory
|
||||
// Check project.json loads correctly
|
||||
fs := cmd.NewFSHelper()
|
||||
err := projectOptions.LoadConfig(fs.Cwd())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// // Validate config
|
||||
// // Check if we have a frontend
|
||||
// if projectOptions.FrontEnd != nil {
|
||||
// if projectOptions.FrontEnd.Dir == "" {
|
||||
// return fmt.Errorf("Frontend directory not set in project.json")
|
||||
// }
|
||||
// if projectOptions.FrontEnd.Build == "" {
|
||||
// return fmt.Errorf("Frontend build command not set in project.json")
|
||||
// }
|
||||
// if projectOptions.FrontEnd.Install == "" {
|
||||
// return fmt.Errorf("Frontend install command not set in project.json")
|
||||
// }
|
||||
// if projectOptions.FrontEnd.Bridge == "" {
|
||||
// return fmt.Errorf("Frontend bridge config not set in project.json")
|
||||
// }
|
||||
|
||||
// }
|
||||
|
||||
// // Check pre-requisites are installed
|
||||
|
||||
// Program checker
|
||||
program := cmd.NewProgramHelper()
|
||||
|
||||
// if projectOptions.FrontEnd != nil {
|
||||
// // npm
|
||||
// if !program.IsInstalled("npm") {
|
||||
// return fmt.Errorf("it appears npm is not installed. Please install and run again")
|
||||
// }
|
||||
// }
|
||||
|
||||
// packr
|
||||
if !program.IsInstalled("packr") {
|
||||
buildSpinner.Start("Installing packr...")
|
||||
err := program.InstallGoPackage("github.com/gobuffalo/packr/...")
|
||||
if err != nil {
|
||||
buildSpinner.Error()
|
||||
return err
|
||||
}
|
||||
buildSpinner.Success()
|
||||
}
|
||||
|
||||
// Save project directory
|
||||
projectDir := fs.Cwd()
|
||||
|
||||
// Install backend deps - needed?
|
||||
// if projectOptions.FrontEnd != nil {
|
||||
// // Install frontend deps
|
||||
// err = os.Chdir(projectOptions.FrontEnd.Dir)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
// // Check if frontend deps have been updated
|
||||
// feSpinner := spinner.New("Installing frontend dependencies (This may take a while)...")
|
||||
// feSpinner.SetSpinSpeed(50)
|
||||
// feSpinner.Start()
|
||||
|
||||
// requiresNPMInstall := true
|
||||
|
||||
// // Read in package.json MD5
|
||||
// packageJSONMD5, err := fs.FileMD5("package.json")
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
// const md5sumFile = "package.json.md5"
|
||||
|
||||
// // If we aren't forcing the install and the md5sum file exists
|
||||
// if !forceRebuild && fs.FileExists(md5sumFile) {
|
||||
// // Yes - read contents
|
||||
// savedMD5sum, err := fs.LoadAsString(md5sumFile)
|
||||
// // File exists
|
||||
// if err == nil {
|
||||
// // Compare md5
|
||||
// if savedMD5sum == packageJSONMD5 {
|
||||
// // Same - no need for reinstall
|
||||
// requiresNPMInstall = false
|
||||
// feSpinner.Success("Skipped frontend dependencies (-f to force rebuild)")
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// // Md5 sum package.json
|
||||
// // Different? Build
|
||||
// if requiresNPMInstall || forceRebuild {
|
||||
// // Install dependencies
|
||||
// err = program.RunCommand(projectOptions.FrontEnd.Install)
|
||||
// if err != nil {
|
||||
// feSpinner.Error()
|
||||
// return err
|
||||
// }
|
||||
// feSpinner.Success()
|
||||
|
||||
// // Update md5sum file
|
||||
// ioutil.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
|
||||
// }
|
||||
|
||||
// Copy bridge to project
|
||||
var bridgeFile = "wailsbridge.js"
|
||||
_, filename, _, _ := runtime.Caller(1)
|
||||
bridgeFileSource := filepath.Join(path.Dir(filename), "..", "assets", "default", bridgeFile)
|
||||
bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, projectOptions.FrontEnd.Bridge, "wailsbridge.js")
|
||||
err = fs.CopyFile(bridgeFileSource, bridgeFileTarget)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// // Build frontend
|
||||
// buildFESpinner := spinner.New("Building frontend...")
|
||||
// buildFESpinner.SetSpinSpeed(50)
|
||||
// buildFESpinner.Start()
|
||||
// err = program.RunCommand(projectOptions.FrontEnd.Build)
|
||||
// if err != nil {
|
||||
// buildFESpinner.Error()
|
||||
// return err
|
||||
// }
|
||||
// buildFESpinner.Success()
|
||||
// }
|
||||
|
||||
// Run packr in project directory
|
||||
err = os.Chdir(projectDir)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Support build tags
|
||||
buildTags := []string{}
|
||||
|
||||
depSpinner := spinner.New("Installing Dependencies...")
|
||||
depSpinner.SetSpinSpeed(50)
|
||||
depSpinner.Start()
|
||||
installCommand := "go get"
|
||||
err = program.RunCommand(installCommand)
|
||||
if err != nil {
|
||||
depSpinner.Error()
|
||||
return err
|
||||
}
|
||||
depSpinner.Success()
|
||||
|
||||
compileMessage := "Packing + Compiling project"
|
||||
|
||||
packSpinner := spinner.New(compileMessage + "...")
|
||||
packSpinner.SetSpinSpeed(50)
|
||||
packSpinner.Start()
|
||||
|
||||
buildCommand := slicer.String()
|
||||
buildCommand.AddSlice([]string{"packr", "build"})
|
||||
|
||||
// Add build tags
|
||||
if len(buildTags) > 0 {
|
||||
buildCommand.Add("--tags")
|
||||
buildCommand.AddSlice(buildTags)
|
||||
|
||||
}
|
||||
|
||||
if projectOptions.BinaryName != "" {
|
||||
buildCommand.Add("-o")
|
||||
buildCommand.Add(projectOptions.BinaryName)
|
||||
}
|
||||
|
||||
// If we are forcing a rebuild
|
||||
if forceRebuild {
|
||||
buildCommand.Add("-a")
|
||||
}
|
||||
|
||||
err = program.RunCommandArray(buildCommand.AsSlice())
|
||||
if err != nil {
|
||||
packSpinner.Error()
|
||||
return err
|
||||
}
|
||||
packSpinner.Success()
|
||||
|
||||
// Run the App
|
||||
logger.Yellow("Awesome! Project '%s' built!", projectOptions.Name)
|
||||
logger.Yellow("Serving Application: " + projectOptions.BinaryName)
|
||||
cmd := exec.Command(projectOptions.BinaryName)
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
err = cmd.Run()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
})
|
||||
}
|
Loading…
Reference in New Issue
Block a user