status-im
/
mobile
mirror of
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/gomobile: ios builds should be achievable without an assets dir 

Fixes golang/go#11445.

Change-Id: Ie1eb6df1501aeb651439711d08f2a7505b386614
Reviewed-on: https://go-review.googlesource.com/11585
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
This commit is contained in:
Burcu Dogan 2015-06-29 10:52:22 -07:00
parent 8cac158036
commit ef2d0c9811
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cmd/gomobile/ios.go
View File

@ -130,37 +130,45 @@ func goIOSBuild(src string) error {
}
func iosCopyAssets(xcodeProjDir string) error {
assetsDir := filepath.Join(pkg.Dir, "assets")
assetsDirExists := true
fi, err := os.Stat(assetsDir)
if err != nil {
if os.IsNotExist(err) {
assetsDirExists = false
} else {
dstAssets := xcodeProjDir + "/main/assets"
if buildX {
printcmd("mkdir -p %s", dstAssets)
}
if !buildN {
if err := os.MkdirAll(dstAssets, 0755); err != nil {
return err
}
} else {
assetsDirExists = fi.IsDir()
}
if !assetsDirExists {
srcAssets := filepath.Join(pkg.Dir, "assets")
fi, err := os.Stat(srcAssets)
if err != nil {
if os.IsNotExist(err) {
// skip walking through the directory to deep copy.
return nil
}
return err
}
if !fi.IsDir() {
// skip walking through to deep copy.
return nil
}
if buildX {
printcmd("cp -R %s %s", filepath.Join(pkg.Dir, "assets"), xcodeProjDir+"/main/assets")
printcmd("cp -R %s %s", filepath.Join(pkg.Dir, "assets"), dstAssets)
}
if buildN {
return nil
}
return filepath.Walk(assetsDir, func(path string, info os.FileInfo, err error) error {
return filepath.Walk(srcAssets, func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
}
if info.IsDir() {
return nil
}
dst := xcodeProjDir + "/main/assets/" + path[len(assetsDir)+1:]
dst := dstAssets + "/" + path[len(srcAssets)+1:]
if err := os.MkdirAll(filepath.Dir(dst), 0755); err != nil {
return err
}
@ -176,7 +184,6 @@ func iosCopyAssets(xcodeProjDir string) error {
_, err = io.Copy(w, f)
return err
})
return nil
}
func goBuild(src, o string, env []string) error {