commit ec7ef2212d49e91b5b605170e693b44957dfb4ac
parent d9eae39049df682ad911bafe29a6df7c1fd3c4ae
Author: Jack Mordaunt <jackmordaunt@gmail.com>
Date: Wed, 11 Nov 2020 15:08:43 +0800
refactor: rename package to be more precise
Diffstat:
| A | cmd/bundle/main.go | | | 213 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| D | cmd/release/main.go | | | 164 | ------------------------------------------------------------------------------- |
2 files changed, 213 insertions(+), 164 deletions(-)
diff --git a/cmd/bundle/main.go b/cmd/bundle/main.go
@@ -0,0 +1,213 @@
+// bundle is a tool for creating OS specific installable packages for Windows,
+// macOS and Linux.
+package main
+
+import (
+ "fmt"
+ "image/png"
+ "io"
+ "os"
+ "os/exec"
+ "path/filepath"
+ "runtime"
+
+ "github.com/jackmordaunt/icns"
+)
+
+func main() {
+ if err := func() error {
+ if len(os.Args) < 2 {
+ return fmt.Errorf("specify a platform {windows,macos,linux}")
+ }
+ binary, err := build("cmd/kanban")
+ if err != nil {
+ return fmt.Errorf("building: %w", err)
+ }
+ platform := os.Args[1]
+ switch platform {
+ case "macos":
+ if err := bundleMacOS("dist/Kanban.app", binary, "res/icon.png", "res/darwin/Info.plist"); err != nil {
+ return fmt.Errorf("bundling macos: %w", err)
+ }
+ case "windows":
+ if err := bundleWindows("dist/Kanban.exe", binary, "res/icon.png", ""); err != nil {
+ return fmt.Errorf("bundling windows: %w", err)
+ }
+ case "linux":
+ if err := bundleLinux("dist/Kanban", binary, "res/icon.png"); err != nil {
+ return fmt.Errorf("bundling linux: %w", err)
+ }
+ default:
+ return fmt.Errorf("platform %q not supported", platform)
+ }
+ return nil
+ }(); err != nil {
+ fmt.Printf("error: %v", err)
+ }
+}
+
+// bundleMacOS creates a macOS .app bundleMacOS on disk rooted at dest.
+// All paramaters are filepaths.
+// NB: Will clobber destination if it is a directory, or error if it is a file.
+func bundleMacOS(dest, binary, icon, plist string) error {
+ var (
+ contents = filepath.Join(dest, "Contents")
+ macos = filepath.Join(contents, "MacOS")
+ resources = filepath.Join(contents, "Resources")
+ )
+ m, err := os.Stat(dest)
+ if os.IsNotExist(err) || m.IsDir() {
+ os.RemoveAll(dest)
+ if err := os.MkdirAll(dest, 0777); err != nil {
+ return fmt.Errorf("preparing destination: %w", err)
+ }
+ } else if !m.IsDir() {
+ return fmt.Errorf("destination %q: not a directory", dest)
+ }
+ if err := os.MkdirAll(macos, 0777); err != nil {
+ return fmt.Errorf("preparing directory: %w", err)
+ }
+ if err := os.MkdirAll(resources, 0777); err != nil {
+ return fmt.Errorf("preparing directory: %w", err)
+ }
+ if err := cp(binary, filepath.Join(macos, "kanban")); err != nil {
+ return fmt.Errorf("copying binary: %w", err)
+ }
+ if err := cp(plist, filepath.Join(contents, "Info.plist")); err != nil {
+ return fmt.Errorf("copying plist: %w", err)
+ }
+ if err := convertIcon(icon, filepath.Join(resources, "kanban.icns")); err != nil {
+ return fmt.Errorf("converting icon to icns: %w", err)
+ }
+ switch runtime.GOOS {
+ case "linux":
+ if err := run(
+ "genisoimage",
+ "-V", "Kanban",
+ "-D",
+ "-R",
+ "-apple",
+ "-no-pad",
+ "-o", "Kanban.dmg",
+ filepath.Dir(dest),
+ ); err != nil {
+ return fmt.Errorf("genisoimage: %w", err)
+ }
+ case "darwin":
+ // dmg: | $(DMG_NAME)
+ // $(DMG_NAME): $(APP_NAME)
+ // @echo "Packing disk image..."
+ // @ln -sf /Applications $(DMG_DIR)/Applications
+ // @hdiutil create $(DMG_DIR)/$(DMG_NAME) \
+ // -volname "Kanban" \
+ // -fs HFS+ \
+ // -srcfolder $(APP_DIR) \
+ // -ov -format UDZO
+ // @echo "Packed '$@' in '$(APP_DIR)'"
+ if err := run(
+ "hdiutil",
+ "create",
+ filepath.Join(filepath.Dir(dest), "Kanban.dmg"),
+ "-volname", "Kanban",
+ "-fs", "HFS+",
+ "-srcfolder", dest,
+ "-ov", "-format", "UDZO",
+ ); err != nil {
+ return fmt.Errorf("hdiutil: %w", err)
+ }
+ case "windows":
+ return fmt.Errorf("cannot create dmg on windows yet")
+ default:
+ return fmt.Errorf("cannot create dmg on %q", runtime.GOOS)
+ }
+ return nil
+}
+
+func bundleWindows(dest, binary, icon, manifest string) error {
+ return fmt.Errorf("unimplemented")
+}
+
+func bundleLinux(dest, binary, icon string) error {
+ return fmt.Errorf("unimplemented")
+}
+
+// convertIcon converts the source png to icon and returns a path to it.
+func convertIcon(src, dst string) error {
+ srcf, err := os.Open(src)
+ if err != nil {
+ return fmt.Errorf("opening source file: %w", err)
+ }
+ defer srcf.Close()
+ img, err := png.Decode(srcf)
+ if err != nil {
+ return fmt.Errorf("decoding source png: %w", err)
+ }
+ dstf, err := os.OpenFile(dst, os.O_CREATE|os.O_RDWR, 0644)
+ if err != nil {
+ return fmt.Errorf("opening destination file: %w", err)
+ }
+ defer dstf.Close()
+ if err := icns.Encode(dstf, img); err != nil {
+ return fmt.Errorf("encoding icns: %w", err)
+ }
+ return nil
+}
+
+// build the Go program rooted at path and returns a path to it.
+func build(path string) (string, error) {
+ path, err := filepath.Abs(path)
+ if err != nil {
+ return "", fmt.Errorf("resolving absolute path: %w", err)
+ }
+ if err := run("go", "build", "-o", "dist/kanban", path); err != nil {
+ return "", err
+ }
+ return "dist/kanban", nil
+}
+
+// run the specified command and return any error.
+func run(cmd string, args ...string) error {
+ if out, err := exec.Command(cmd, args...).CombinedOutput(); err != nil {
+ return fmt.Errorf("running command %q: %v: %w", cmd, string(out), err)
+ }
+ return nil
+}
+
+// cp copies src file to destination.
+// If destination is a directory, the file will be copied into it.
+// If destination doesn't exist it will be created as a file.
+// If destination is a file an error will be returned.
+func cp(src, dst string) error {
+ if src == "" || dst == "" {
+ return nil
+ }
+ var err error
+ src, err = filepath.Abs(src)
+ if err != nil {
+ return fmt.Errorf("resolving path: %w", err)
+ }
+ dst, err = filepath.Abs(dst)
+ if err != nil {
+ return fmt.Errorf("resolving path: %w", err)
+ }
+ srcf, err := os.Open(src)
+ if err != nil {
+ return fmt.Errorf("opening %q: %w", src, err)
+ }
+ defer srcf.Close()
+ _, err = os.Stat(filepath.Dir(dst))
+ if os.IsNotExist(err) {
+ if err := os.MkdirAll(filepath.Dir(dst), 0777); err != nil {
+ return fmt.Errorf("preparing %q: %w", filepath.Dir(dst), err)
+ }
+ }
+ dstf, err := os.OpenFile(dst, os.O_CREATE|os.O_RDWR, 0777)
+ if err != nil {
+ return fmt.Errorf("creating %q: %w", dst, err)
+ }
+ defer dstf.Close()
+ if _, err := io.Copy(dstf, srcf); err != nil {
+ return fmt.Errorf("copying data: %w", err)
+ }
+ return nil
+}
diff --git a/cmd/release/main.go b/cmd/release/main.go
@@ -1,164 +0,0 @@
-// release is a tool for distributing OS specific packages to Windows, macOS
-// and Linux.
-package main
-
-import (
- "fmt"
- "image/png"
- "io"
- "os"
- "os/exec"
- "path/filepath"
- "runtime"
-
- "github.com/jackmordaunt/icns"
-)
-
-// TODO:
-// - Release for windows/linux
-// - configure things?
-// - zip results
-// - push to github releases
-// - tag a release -> upload to github
-func main() {
- if err := func() error {
- binary, err := build("cmd/kanban")
- if err != nil {
- return fmt.Errorf("building: %w", err)
- }
- if runtime.GOOS == "darwin" {
- if err := bundleDarwin("dist/Kanban.app", binary, "res/icon.png", "res/darwin/Info.plist"); err != nil {
- return fmt.Errorf("bundling: %w", err)
- }
- }
- if runtime.GOOS == "windows" {
- if err := bundleWindows("dist/Kanban.exe", binary, "res/icon.png", "res/darwin/Info.plist"); err != nil {
- return fmt.Errorf("bundling: %w", err)
- }
- }
- return nil
- }(); err != nil {
- fmt.Printf("error: %v", err)
- }
-}
-
-// bundleDarwin creates a macOS .app bundleDarwin on disk rooted at dest.
-// All paramaters are filepaths.
-// NB: Will clobber destination if it is a directory, or error if it is a file.
-func bundleDarwin(dest, binary, icon, plist string) error {
- var (
- contents = filepath.Join(dest, "Contents")
- macos = filepath.Join(contents, "MacOS")
- resources = filepath.Join(contents, "Resources")
- )
- m, err := os.Stat(dest)
- if os.IsNotExist(err) || m.IsDir() {
- os.RemoveAll(dest)
- if err := os.MkdirAll(dest, 0777); err != nil {
- return fmt.Errorf("preparing destination: %w", err)
- }
- } else if !m.IsDir() {
- return fmt.Errorf("destination %q: not a directory", dest)
- }
- if err := os.MkdirAll(macos, 0777); err != nil {
- return fmt.Errorf("preparing directory: %w", err)
- }
- if err := os.MkdirAll(resources, 0777); err != nil {
- return fmt.Errorf("preparing directory: %w", err)
- }
- if err := cp(binary, filepath.Join(macos, "kanban")); err != nil {
- return fmt.Errorf("copying binary: %w", err)
- }
- if err := cp(plist, filepath.Join(contents, "Info.plist")); err != nil {
- return fmt.Errorf("copying plist: %w", err)
- }
- if err := convertIcon(icon, filepath.Join(resources, "kanban.icns")); err != nil {
- return fmt.Errorf("converting icon to icns: %w", err)
- }
- return nil
-}
-
-func bundleWindows(dest, binary, icon, manifest string) error {
- return nil
-}
-
-// convertIcon converts the source png to icon and returns a path to it.
-func convertIcon(src, dst string) error {
- srcf, err := os.Open(src)
- if err != nil {
- return fmt.Errorf("opening source file: %w", err)
- }
- defer srcf.Close()
- img, err := png.Decode(srcf)
- if err != nil {
- return fmt.Errorf("decoding source png: %w", err)
- }
- dstf, err := os.OpenFile(dst, os.O_CREATE|os.O_RDWR, 0644)
- if err != nil {
- return fmt.Errorf("opening destination file: %w", err)
- }
- defer dstf.Close()
- if err := icns.Encode(dstf, img); err != nil {
- return fmt.Errorf("encoding icns: %w", err)
- }
- return nil
-}
-
-// build the Go program rooted at path and returns a path to it.
-func build(path string) (string, error) {
- path, err := filepath.Abs(path)
- if err != nil {
- return "", fmt.Errorf("resolving absolute path: %w", err)
- }
- if err := run("go", "build", "-o", "dist/kanban", path); err != nil {
- return "", err
- }
- return "dist/kanban", nil
-}
-
-// run the specified command and return any error.
-func run(cmd string, args ...string) error {
- if out, err := exec.Command(cmd, args...).CombinedOutput(); err != nil {
- return fmt.Errorf("running command %q: %v: %w", cmd, string(out), err)
- }
- return nil
-}
-
-// cp copies src file to destination.
-// If destination is a directory, the file will be copied into it.
-// If destination doesn't exist it will be created as a file.
-// If destination is a file an error will be returned.
-func cp(src, dst string) error {
- if src == "" || dst == "" {
- return nil
- }
- var err error
- src, err = filepath.Abs(src)
- if err != nil {
- return fmt.Errorf("resolving path: %w", err)
- }
- dst, err = filepath.Abs(dst)
- if err != nil {
- return fmt.Errorf("resolving path: %w", err)
- }
- srcf, err := os.Open(src)
- if err != nil {
- return fmt.Errorf("opening %q: %w", src, err)
- }
- defer srcf.Close()
- _, err = os.Stat(filepath.Dir(dst))
- if os.IsNotExist(err) {
- if err := os.MkdirAll(filepath.Dir(dst), 0777); err != nil {
- return fmt.Errorf("preparing %q: %w", filepath.Dir(dst), err)
- }
- }
- dstf, err := os.OpenFile(dst, os.O_CREATE|os.O_RDWR, 0777)
- if err != nil {
- return fmt.Errorf("creating %q: %w", dst, err)
- }
- defer dstf.Close()
- if _, err := io.Copy(dstf, srcf); err != nil {
- return fmt.Errorf("copying data: %w", err)
- }
- return nil
-}
