From b10175b2336ba057fff8b5fb2f9e8ae7487e5d3a Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Wed, 14 Aug 2019 17:07:16 +0200
Subject: [PATCH] cmd/gio: add -version flag

For Android and iOS.

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

diff --git a/cmd/gio/androidbuild.go b/cmd/gio/androidbuild.go
index e0f27c52..03c3554a 100644
--- a/cmd/gio/androidbuild.go
+++ b/cmd/gio/androidbuild.go
@@ -280,8 +280,8 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err error) {
 	manifestSrc := fmt.Sprintf(`<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="%s"
-	android:versionCode="1"
-	android:versionName="1.0">
+	android:versionCode="%d"
+	android:versionName="1.0.%d">
 	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-feature android:glEsVersion="0x00030000"/>
@@ -297,7 +297,7 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err error) {
 			</intent-filter>
 		</activity>
 	</application>
-</manifest>`, *appID, appName)
+</manifest>`, *appID, bi.version, bi.version, appName)
 	manifest := filepath.Join(tmpDir, "AndroidManifest.xml")
 	if err := ioutil.WriteFile(manifest, []byte(manifestSrc), 0660); err != nil {
 		return err
diff --git a/cmd/gio/gio.go b/cmd/gio/gio.go
index 0c8f8d24..ed479b6b 100644
--- a/cmd/gio/gio.go
+++ b/cmd/gio/gio.go
@@ -20,6 +20,7 @@ var (
 	buildMode     = flag.String("buildmode", "exe", "specify buildmode: archive or exe")
 	destPath      = flag.String("o", "", `output path. Specify a path with the ".app" suffix for iOS simulators.`)
 	appID         = flag.String("appid", "org.gioui.app", "app identifier (for -buildmode=exe)")
+	version       = flag.Int("version", 1, "app version (for -buildmode=exe)")
 	printCommands = flag.Bool("x", false, "print the commands")
 	keepWorkdir   = flag.Bool("work", false, "print the name of the temporary work directory and do not delete it when exiting.")
 )
@@ -30,6 +31,7 @@ type buildInfo struct {
 	ldflags string
 	target  string
 	appID   string
+	version int
 	archs   []string
 }
 
@@ -67,10 +69,11 @@ func main() {
 	}
 	name = filepath.Base(name)
 	bi := &buildInfo{
-		name:   name,
-		pkg:    pkg,
-		target: *target,
-		appID:  *appID,
+		name:    name,
+		pkg:     pkg,
+		target:  *target,
+		appID:   *appID,
+		version: *version,
 	}
 	switch *target {
 	case "js":
diff --git a/cmd/gio/iosbuild.go b/cmd/gio/iosbuild.go
index 9ef39d3b..3ca196fb 100644
--- a/cmd/gio/iosbuild.go
+++ b/cmd/gio/iosbuild.go
@@ -231,9 +231,9 @@ func buildInfoPlist(bi *buildInfo) string {
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.%d</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>%d</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -249,7 +249,7 @@ func buildInfoPlist(bi *buildInfo) string {
 		<integer>1</integer>
 	</array>
 </dict>
-</plist>`, bi.appID, appName, platform)
+</plist>`, bi.appID, appName, bi.version, bi.version, platform)
 }
 
 func archiveIOS(tmpDir, target, frameworkRoot string, bi *buildInfo) error {