status-im/mobile
2
0
Fork 0
mirror of synced 2025-02-23 14:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/gomobile: accept -o for target=ios

Browse Source 
Fixes golang/go#11447.

Change-Id: I6298927eb7d434ec4865c3fa45dd9e4dede17d8c
Reviewed-on: https://go-review.googlesource.com/11968
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
This commit is contained in:
Burcu Dogan 2015-07-08 09:46:18 -06:00
parent b546dd39ba
commit 80eb606a0f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/gomobile/ios.go
View File

@ -5,6 +5,7 @@
package main package main
import ( import (
"fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"
@ -16,6 +17,10 @@ import (
) )
func goIOSBuild(src string) error { func goIOSBuild(src string) error {
if buildO != "" && !strings.HasSuffix(buildO, ".app") {
return fmt.Errorf("-o must have an .app for target=ios")
}
dir := "$XCODEPROJ" dir := "$XCODEPROJ"
if !buildN { if !buildN {
tmp, err := ioutil.TempDir("", "xcodeproject") tmp, err := ioutil.TempDir("", "xcodeproject")
@ -107,19 +112,18 @@ func goIOSBuild(src string) error {
} }
// TODO(jbd): Fallback to copying if renaming fails. // TODO(jbd): Fallback to copying if renaming fails.
out := path.Base(pkg.ImportPath) + ".app" if buildO == "" {
if buildO != "" { buildO = path.Base(pkg.ImportPath) + ".app"
out = filepath.Join(buildO, out)
} }
if buildX { if buildX {
printcmd("mv %s %s", dir+"/build/Release-iphoneos/main.app", out) printcmd("mv %s %s", dir+"/build/Release-iphoneos/main.app", buildO)
} }
if !buildN { if !buildN {
// if output already exists, remove. // if output already exists, remove.
if err := os.RemoveAll(out); err != nil { if err := os.RemoveAll(buildO); err != nil {
return err return err
} }
if err := os.Rename(dir+"/build/Release-iphoneos/main.app", out); err != nil { if err := os.Rename(dir+"/build/Release-iphoneos/main.app", buildO); err != nil {
return err return err
} }
} }