From 8171b644cac283eb737d8d75d8ff141ec33ca26e Mon Sep 17 00:00:00 2001
From: Travis McLane <tmclane@gmail.com>
Date: Sat, 4 Apr 2020 14:02:54 -0500
Subject: [PATCH] use 'build' dir for windows resources + cleanup

---
 cmd/package.go | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/cmd/package.go b/cmd/package.go
index f4df79e1..36883f7e 100644
--- a/cmd/package.go
+++ b/cmd/package.go
@@ -85,7 +85,7 @@ func (b *PackageHelper) Package(po *ProjectOptions) error {
 		}
 		return b.packageOSX(po)
 	case "windows":
-		return b.PackageWindows(po, false)
+		return b.PackageWindows(po, true)
 	case "linux":
 		return b.packageLinux(po)
 	default:
@@ -175,10 +175,11 @@ func (b *PackageHelper) packageOSX(po *ProjectOptions) error {
 
 // PackageWindows packages the application for windows platforms
 func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
+	build := path.Join(b.fs.Cwd(), "build")
 	basename := strings.TrimSuffix(po.BinaryName, ".exe")
 
 	// Copy icon
-	tgtIconFile := filepath.Join(b.fs.Cwd(), basename+".ico")
+	tgtIconFile := filepath.Join(build, basename+".ico")
 	if !b.fs.FileExists(tgtIconFile) {
 		srcIconfile := filepath.Join(b.getPackageFileBaseDir(), "wails.ico")
 		err := b.fs.CopyFile(srcIconfile, tgtIconFile)
@@ -188,7 +189,7 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 	}
 
 	// Copy manifest
-	tgtManifestFile := filepath.Join(b.fs.Cwd(), basename+".exe.manifest")
+	tgtManifestFile := filepath.Join(build, basename+".exe.manifest")
 	if !b.fs.FileExists(tgtManifestFile) {
 		srcManifestfile := filepath.Join(b.getPackageFileBaseDir(), "wails.exe.manifest")
 		err := b.fs.CopyFile(srcManifestfile, tgtManifestFile)
@@ -198,7 +199,7 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 	}
 
 	// Copy rc file
-	tgtRCFile := filepath.Join(b.fs.Cwd(), basename+".rc")
+	tgtRCFile := filepath.Join(build, basename+".rc")
 	if !b.fs.FileExists(tgtRCFile) {
 		srcRCfile := filepath.Join(b.getPackageFileBaseDir(), "wails.rc")
 		rcfilebytes, err := ioutil.ReadFile(srcRCfile)
@@ -213,18 +214,13 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 	}
 
 	// Build syso
-	sysofile := filepath.Join(b.fs.Cwd(), basename+"-res.syso")
+	sysofile := filepath.Join(build, basename+"-res.syso")
 
 	// cross-compile
 	if b.platform != runtime.GOOS {
-		folder, err := os.Getwd()
-		if err != nil {
-			return err
-		}
-
 		args := []string{
 			"docker", "run", "--rm",
-			"-v", folder + ":/build",
+			"-v", build + ":/build",
 			"--entrypoint", "/bin/sh",
 			"wailsapp/xgo:latest",
 			"-c", "/usr/bin/x86_64-w64-mingw32-windres -o /build/" + basename + "-res.syso /build/" + basename + ".rc",