joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-07 02:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/gio: change all occurences of *appID with the buildInfo field

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-08-24 17:44:14 +01:00
parent b34389ac2c
commit 6433cb2d88
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/gio/androidbuild.go
+2 -2
View File
@@ -200,7 +200,7 @@ func archiveAndroid(tmpDir string, bi *buildInfo) (err error) {
} }
func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err error) { func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err error) {
if *appID == "" { if bi.appID == "" {
return errors.New("app id is empty; use -appid to set it") return errors.New("app id is empty; use -appid to set it")
} }
classes := filepath.Join(tmpDir, "classes") classes := filepath.Join(tmpDir, "classes")
@@ -310,7 +310,7 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err error) {
</intent-filter> </intent-filter>
</activity> </activity>
</application> </application>
</manifest>`, *appID, bi.version, bi.version, iconSnip, appName, appName) </manifest>`, bi.appID, bi.version, bi.version, iconSnip, appName, appName)
manifest := filepath.Join(tmpDir, "AndroidManifest.xml") manifest := filepath.Join(tmpDir, "AndroidManifest.xml")
if err := ioutil.WriteFile(manifest, []byte(manifestSrc), 0660); err != nil { if err := ioutil.WriteFile(manifest, []byte(manifestSrc), 0660); err != nil {
return err return err
cmd/gio/iosbuild.go
+5 -5
View File
@@ -68,7 +68,7 @@ func buildIOS(tmpDir, target string, bi *buildInfo) error {
if err := exeIOS(tmpDir, target, appDir, bi); err != nil { if err := exeIOS(tmpDir, target, appDir, bi); err != nil {
return err return err
} }
if err := signIOS(tmpDir, appDir, out); err != nil { if err := signIOS(bi, tmpDir, appDir, out); err != nil {
return err return err
} }
return zipDir(out, tmpDir, "Payload") return zipDir(out, tmpDir, "Payload")
@@ -77,7 +77,7 @@ func buildIOS(tmpDir, target string, bi *buildInfo) error {
} }
} }
func signIOS(tmpDir, app, ipa string) error { func signIOS(bi *buildInfo, tmpDir, app, ipa string) error {
home, err := os.UserHomeDir() home, err := os.UserHomeDir()
if err != nil { if err != nil {
return err return err
@@ -114,7 +114,7 @@ func signIOS(tmpDir, app, ipa string) error {
if err != nil { if err != nil {
return err return err
} }
expAppID := fmt.Sprintf("%s.%s", appIDPrefix, *appID) expAppID := fmt.Sprintf("%s.%s", appIDPrefix, bi.appID)
avail = append(avail, provAppID) avail = append(avail, provAppID)
if expAppID != provAppID { if expAppID != provAppID {
continue continue
@@ -146,11 +146,11 @@ func signIOS(tmpDir, app, ipa string) error {
_, err = runCmd(exec.Command("codesign", "-s", signIdentity, "--entitlements", entFile, app)) _, err = runCmd(exec.Command("codesign", "-s", signIdentity, "--entitlements", entFile, app))
return err return err
} }
return fmt.Errorf("sign: no valid provisioning profile found for bundle id %q among %v", *appID, avail) return fmt.Errorf("sign: no valid provisioning profile found for bundle id %q among %v", bi.appID, avail)
} }
func exeIOS(tmpDir, target, app string, bi *buildInfo) error { func exeIOS(tmpDir, target, app string, bi *buildInfo) error {
if *appID == "" { if bi.appID == "" {
return errors.New("app id is empty; use -appid to set it") return errors.New("app id is empty; use -appid to set it")
} }
if err := os.RemoveAll(app); err != nil { if err := os.RemoveAll(app); err != nil {