Merge pull request #163 from sidevesh/master

NSHighResolutionCapable true, local building of darwin packages

Author: jld3103

assets/packaging/darwin-bundle/Info.plist.tmpl

@@ -10,6 +10,8 @@
         <string>{{.description}}</string>
         <key>CFBundleIconFile</key>
         <string>icon.icns</string>
+        <key>NSHighResolutionCapable</key>
+        <true/>
         <key>CFBundleIdentifier</key>
         <string>{{.organizationName}}.{{.packageName}}</string>
         <key>CFBundleInfoDictionaryVersion</key>

cmd/packaging/darwin-bundle.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 )
 
 // DarwinBundleTask packaging for darwin as bundle
@@ -21,7 +22,13 @@ var DarwinBundleTask = &packagingTask{
 		if err != nil {
 			return "", err
 		}
-		cmdPng2icns := exec.Command("png2icns", filepath.Join(outputFileName, "Contents", "Resources", "icon.icns"), filepath.Join(outputFileName, "Contents", "MacOS", "assets", "icon.png"))
+		var cmdPng2icns *exec.Cmd
+		switch os := runtime.GOOS; os {
+		case "darwin":
+			cmdPng2icns = exec.Command("png2icons", filepath.Join(outputFileName, "Contents", "MacOS", "assets", "icon.png"), filepath.Join(outputFileName, "Contents", "Resources", "icon"), "-icns")
+		case "linux":
+			cmdPng2icns = exec.Command("png2icns", filepath.Join(outputFileName, "Contents", "Resources", "icon.icns"), filepath.Join(outputFileName, "Contents", "MacOS", "assets", "icon.png"))
+		}
 		cmdPng2icns.Dir = tmpPath
 		cmdPng2icns.Stdout = os.Stdout
 		cmdPng2icns.Stderr = os.Stderr
@@ -32,6 +39,7 @@ var DarwinBundleTask = &packagingTask{
 		return outputFileName, nil
 	},
 	requiredTools: map[string][]string{
-		"linux": {"png2icns"},
+		"linux":  {"png2icns"},
+		"darwin": {"png2icons"},
 	},
 }

cmd/packaging/darwin-dmg.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 )
 
 // DarwinDmgTask packaging for darwin as dmg
@@ -29,7 +30,14 @@ var DarwinDmgTask = &packagingTask{
 		if err != nil {
 			return "", err
 		}
-		cmdGenisoimage := exec.Command("genisoimage", "-V", packageName, "-D", "-R", "-apple", "-no-pad", "-o", outputFileName, "dmgdir")
+
+		var cmdGenisoimage *exec.Cmd
+		switch os := runtime.GOOS; os {
+		case "darwin":
+			cmdGenisoimage = exec.Command("hdiutil", "create", "-volname", packageName, "-srcfolder", "dmgdir", "-ov", "-format", "UDBZ", outputFileName)
+		case "linux":
+			cmdGenisoimage = exec.Command("genisoimage", "-V", packageName, "-D", "-R", "-apple", "-no-pad", "-o", outputFileName, "dmgdir")
+		}
 		cmdGenisoimage.Dir = tmpPath
 		cmdGenisoimage.Stdout = os.Stdout
 		cmdGenisoimage.Stderr = os.Stderr
@@ -41,6 +49,7 @@ var DarwinDmgTask = &packagingTask{
 	},
 	skipAssertInitialized: true,
 	requiredTools: map[string][]string{
-		"linux": {"ln", "genisoimage"},
+		"linux":  {"ln", "genisoimage"},
+		"darwin": {"ln", "hdiutil"},
 	},
 }

cmd/packaging/darwin-pkg.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 
 	"github.com/pkg/errors"
 )
@@ -76,7 +77,13 @@ var DarwinPkgTask = &packagingTask{
 			return "", err
 		}
 
-		cmdMkbom := exec.Command("mkbom", "-u", "0", "-g", "80", filepath.Join("flat", "root"), filepath.Join("flat", "base.pkg", "Payload"))
+		var cmdMkbom *exec.Cmd
+		switch os := runtime.GOOS; os {
+		case "darwin":
+			cmdMkbom = exec.Command("mkbom", filepath.Join("flat", "root"), filepath.Join("flat", "base.pkg", "Payload"))
+		case "linux":
+			cmdMkbom = exec.Command("mkbom", "-u", "0", "-g", "80", filepath.Join("flat", "root"), filepath.Join("flat", "base.pkg", "Payload"))
+		}
 		cmdMkbom.Dir = tmpPath
 		cmdMkbom.Stdout = os.Stdout
 		cmdMkbom.Stderr = os.Stderr
@@ -109,6 +116,7 @@ var DarwinPkgTask = &packagingTask{
 		return outputFileName, nil
 	},
 	requiredTools: map[string][]string{
-		"linux": {"find", "cpio", "gzip", "mkbom", "xar"},
+		"linux":  {"find", "cpio", "gzip", "mkbom", "xar"},
+		"darwin": {"find", "cpio", "gzip", "mkbom", "xar"},
 	},
 }