From c58aba718c492cb799fdd85eb0371a60de4e514e Mon Sep 17 00:00:00 2001 From: Burcu Dogan Date: Thu, 1 Oct 2015 18:47:53 -0400 Subject: [PATCH] cmd/gomobile: title case framework bundles Traditionally, framework bundles have title case names such as CoreFoundation.framework and UIKIt.framework. gomobile bind should generate framework bundles named similarly, following this convention. Change-Id: Ia6082ed351ddc6fc97e0435e24e5f79c5afbaea4 Reviewed-on: https://go-review.googlesource.com/15330 Reviewed-by: Hyang-Ah Hana Kim --- cmd/gomobile/bind_iosapp.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cmd/gomobile/bind_iosapp.go b/cmd/gomobile/bind_iosapp.go index 1b9b097..41499f4 100644 --- a/cmd/gomobile/bind_iosapp.go +++ b/cmd/gomobile/bind_iosapp.go @@ -21,12 +21,13 @@ func goIOSBind(pkg *build.Package) error { return err } name := binder.pkg.Name() + title := strings.Title(name) if buildO != "" && !strings.HasSuffix(buildO, ".framework") { return fmt.Errorf("static framework name %q missing .framework suffix", buildO) } if buildO == "" { - buildO = name + ".framework" + buildO = title + ".framework" } if err := binder.GenGo(filepath.Join(tmpdir, "src")); err != nil { @@ -68,19 +69,19 @@ func goIOSBind(pkg *build.Package) error { if err := symlink("Versions/Current/Headers", buildO+"/Headers"); err != nil { return err } - if err := symlink("Versions/Current/"+strings.Title(name), buildO+"/"+strings.Title(name)); err != nil { + if err := symlink("Versions/Current/"+title, buildO+"/"+title); err != nil { return err } - cmd.Args = append(cmd.Args, "-o", buildO+"/Versions/A/"+strings.Title(name)) + cmd.Args = append(cmd.Args, "-o", buildO+"/Versions/A/"+title) if err := runCmd(cmd); err != nil { return err } // Copy header file next to output archive. err = copyFile( - headers+"/"+strings.Title(name)+".h", - tmpdir+"/objc/Go"+strings.Title(name)+".h", + headers+"/"+title+".h", + tmpdir+"/objc/Go"+title+".h", ) if err != nil { return err @@ -101,8 +102,8 @@ func goIOSBind(pkg *build.Package) error { Module string Header string }{ - Module: name, - Header: strings.Title(name) + ".h", + Module: title, + Header: title + ".h", } err = writeFile(buildO+"/Versions/A/Modules/module.modulemap", func(w io.Writer) error { return iosModuleMapTmpl.Execute(w, mmVals)