From 8e46bea6dc6d07e7b32b8d97406a0fb36f4d1a90 Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Sat, 6 Jul 2019 15:30:39 +0200
Subject: [PATCH] cmd/gio: use package name for app name in -buildmode=exe

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 cmd/gio/androidbuild.go | 5 +++--
 cmd/gio/iosbuild.go     | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cmd/gio/androidbuild.go b/cmd/gio/androidbuild.go
index b57f90f1..e2fa9e61 100644
--- a/cmd/gio/androidbuild.go
+++ b/cmd/gio/androidbuild.go
@@ -233,6 +233,7 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err error) {
 			return err
 		}
 	}
+	appName := strings.Title(filepath.Base(bi.pkg))
 	manifestSrc := fmt.Sprintf(`<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="%s"
@@ -243,7 +244,7 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err error) {
 	<uses-feature android:glEsVersion="0x00030000"/>
 	<application android:label="Gio">
 		<activity android:name="org.gioui.GioActivity"
-			android:label="Gio"
+			android:label="%s"
 			android:theme="@android:style/Theme.NoTitleBar"
 			android:configChanges="orientation|keyboardHidden">
 			<intent-filter>
@@ -252,7 +253,7 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err error) {
 			</intent-filter>
 		</activity>
 	</application>
-</manifest>`, *appID)
+</manifest>`, *appID, appName)
 	manifest := filepath.Join(tmpDir, "AndroidManifest.xml")
 	if err := ioutil.WriteFile(manifest, []byte(manifestSrc), 0600); err != nil {
 		return err
diff --git a/cmd/gio/iosbuild.go b/cmd/gio/iosbuild.go
index 95982a03..63d41b0a 100644
--- a/cmd/gio/iosbuild.go
+++ b/cmd/gio/iosbuild.go
@@ -174,6 +174,7 @@ int main(int argc, char * argv[]) {
 	if _, err := runCmd(lipo); err != nil {
 		return err
 	}
+	appName := strings.Title(filepath.Base(bi.pkg))
 	infoPlistSrc := fmt.Sprintf(`<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -187,7 +188,7 @@ int main(int argc, char * argv[]) {
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Gio</string>
+	<string>%s</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -197,7 +198,7 @@ int main(int argc, char * argv[]) {
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 </dict>
-</plist>`, *appID)
+</plist>`, *appID, appName)
 	infoPlist := filepath.Join(app, "Info.plist")
 	if err := ioutil.WriteFile(infoPlist, []byte(infoPlistSrc), 0600); err != nil {
 		return err