From cde040369cfca37e1acfc90f63d4d49928711a65 Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Sat, 13 Jul 2019 20:19:25 +0200
Subject: [PATCH] cmd/gio: use the import path as basis for the output file

Before this change `go list <pkg>` was used to sanitize the import
path of the package argument. That doesn't work well for building
Go source files directly:

gio -target android helloworld.go

where `go list helloworld.go` simply returns "command-line-arguments".

A better way is to leave the package path alone, and compute the
output file separately from the import path, as reported by
`go list -f {{.ImportPath}} <pkg>`.

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

diff --git a/cmd/gio/androidbuild.go b/cmd/gio/androidbuild.go
index 339bc54b..d8b9f9b9 100644
--- a/cmd/gio/androidbuild.go
+++ b/cmd/gio/androidbuild.go
@@ -158,7 +158,7 @@ func compileAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err erro
 func archiveAndroid(tmpDir string, bi *buildInfo) (err error) {
 	aarFile := *destPath
 	if aarFile == "" {
-		aarFile = fmt.Sprintf("%s.aar", filepath.Base(bi.pkg))
+		aarFile = fmt.Sprintf("%s.aar", bi.name)
 	}
 	if filepath.Ext(aarFile) != ".aar" {
 		return fmt.Errorf("the specified output %q does not end in '.aar'", aarFile)
@@ -276,7 +276,7 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err error) {
 	}
 
 	// Link APK.
-	appName := strings.Title(filepath.Base(bi.pkg))
+	appName := strings.Title(bi.name)
 	manifestSrc := fmt.Sprintf(`<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="%s"
@@ -355,7 +355,7 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err error) {
 func signAPK(tmpDir string, tools *androidTools, bi *buildInfo) error {
 	apkFile := *destPath
 	if apkFile == "" {
-		apkFile = fmt.Sprintf("%s.apk", filepath.Base(bi.pkg))
+		apkFile = fmt.Sprintf("%s.apk", bi.name)
 	}
 	if filepath.Ext(apkFile) != ".apk" {
 		return fmt.Errorf("the specified output %q does not end in '.apk'", apkFile)
diff --git a/cmd/gio/gio.go b/cmd/gio/gio.go
index 3cbb1fdf..b8d02e31 100644
--- a/cmd/gio/gio.go
+++ b/cmd/gio/gio.go
@@ -10,6 +10,7 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 )
 
@@ -24,6 +25,7 @@ var (
 )
 
 type buildInfo struct {
+	name    string
 	pkg     string
 	ldflags string
 	archs   []string
@@ -56,13 +58,15 @@ func main() {
 	default:
 		errorf("invalid -buildmode %s\n", *buildMode)
 	}
-	// Expand relative package paths.
-	pkg, err := runCmd(exec.Command("go", "list", pkg))
+	// Find package name.
+	name, err := runCmd(exec.Command("go", "list", "-f", "{{.ImportPath}}", pkg))
 	if err != nil {
 		errorf("gio: %v", err)
 	}
+	name = filepath.Base(name)
 	bi := &buildInfo{
-		pkg: pkg,
+		name: name,
+		pkg:  pkg,
 	}
 	switch *target {
 	case "js":
diff --git a/cmd/gio/iosbuild.go b/cmd/gio/iosbuild.go
index 0af45f87..fce1e0ae 100644
--- a/cmd/gio/iosbuild.go
+++ b/cmd/gio/iosbuild.go
@@ -19,7 +19,7 @@ import (
 )
 
 func buildIOS(tmpDir, target string, bi *buildInfo) error {
-	appName := filepath.Base(bi.pkg)
+	appName := bi.name
 	switch *buildMode {
 	case "archive":
 		framework := *destPath
@@ -174,7 +174,7 @@ int main(int argc, char * argv[]) {
 	if _, err := runCmd(lipo); err != nil {
 		return err
 	}
-	appName := strings.Title(filepath.Base(bi.pkg))
+	appName := strings.Title(bi.name)
 	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">
diff --git a/cmd/gio/jsbuild.go b/cmd/gio/jsbuild.go
index 336881bf..03862aae 100644
--- a/cmd/gio/jsbuild.go
+++ b/cmd/gio/jsbuild.go
@@ -13,7 +13,7 @@ import (
 func buildJS(bi *buildInfo) error {
 	out := *destPath
 	if out == "" {
-		out = filepath.Base(bi.pkg)
+		out = bi.name
 	}
 	if err := os.MkdirAll(out, 0700); err != nil {
 		return err