mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-26 11:48:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmd/ebitenmobile: Run gomobile init

Browse Source
This commit is contained in:
Hajime Hoshi 2019-08-18 17:11:53 +09:00
parent e735e26450
commit 2ff0ccf4cc
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/ebitenmobile/gomobile.go
View File

@ -24,16 +24,12 @@ import (
const gomobileHash = "597adff16ade9d88626f8caea514bb189b8c74ee" const gomobileHash = "597adff16ade9d88626f8caea514bb189b8c74ee"
func runGo(args ...string) error { func runCommand(command string, args []string, env []string) error {
env := []string{
"GO111MODULE=on",
}
if buildX || buildN { if buildX || buildN {
for _, e := range env { for _, e := range env {
fmt.Printf("%s ", e) fmt.Printf("%s ", e)
} }
fmt.Print("go") fmt.Print(command)
for _, arg := range args { for _, arg := range args {
fmt.Printf(" %s", arg) fmt.Printf(" %s", arg)
} }
@ -44,14 +40,23 @@ func runGo(args ...string) error {
return nil return nil
} }
cmd := exec.Command("go", args...) cmd := exec.Command(command, args...)
cmd.Env = append(os.Environ(), env...) if len(env) > 0 {
cmd.Env = append(os.Environ(), env...)
}
if out, err := cmd.CombinedOutput(); err != nil { if out, err := cmd.CombinedOutput(); err != nil {
return fmt.Errorf("go %v failed: %v\n%v", args, string(out), err) return fmt.Errorf("%s %v failed: %v\n%v", command, args, string(out), err)
} }
return nil return nil
} }
func runGo(args ...string) error {
env := []string{
"GO111MODULE=on",
}
return runCommand("go", args, env)
}
func prepareGomobileCommands() error { func prepareGomobileCommands() error {
tmp, err := ioutil.TempDir("", "ebitenmobile-") tmp, err := ioutil.TempDir("", "ebitenmobile-")
if err != nil { if err != nil {
@ -62,7 +67,12 @@ func prepareGomobileCommands() error {
if path := os.Getenv("PATH"); path != "" { if path := os.Getenv("PATH"); path != "" {
newpath += string(filepath.ListSeparator) + path newpath += string(filepath.ListSeparator) + path
} }
os.Setenv("PATH", newpath) if buildX || buildN {
fmt.Printf("PATH=%s\n", newpath)
}
if !buildN {
os.Setenv("PATH", newpath)
}
pwd, err := os.Getwd() pwd, err := os.Getwd()
if err != nil { if err != nil {
@ -104,7 +114,9 @@ func prepareGomobileCommands() error {
return err return err
} }
// TODO: Create a gobind wrapper if err := runCommand("gomobile", []string{"init"}, nil); err != nil {
return err
}
return nil return nil
} }