Merge pull request #109 from jld3103/feature/automatic-tool-detection

Add automatic tool detection

Author: GeertJohan

Dockerfile

@@ -33,9 +33,10 @@ RUN git clone --single-branch --depth=1 --branch 0.2 https://github.com/hogliux/
 FROM ubuntu:bionic as appimagebuilder
 RUN apt-get update \
 	&& apt-get install -y \
-	    curl
+	    wget
 RUN cd /opt \
-	&& curl -LO https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage \
+	&& wget -c https://github.com/$(wget -q https://github.com/probonopd/go-appimage/releases -O - | grep "appimagetool-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2) \
+	&& mv appimagetool-*-x86_64.AppImage appimagetool-x86_64.AppImage \
 	&& chmod a+x appimagetool-x86_64.AppImage \
 	&& sed 's|AI\x02|\x00\x00\x00|g' -i appimagetool-x86_64.AppImage \
 	&& ./appimagetool-x86_64.AppImage --appimage-extract \

cmd/build.go

@@ -181,6 +181,9 @@ var buildWindowsMsiCmd = &cobra.Command{
 func subcommandBuild(targetOS string, packagingTask packaging.Task) {
 	assertHoverInitialized()
 	packagingTask.AssertInitialized()
+	if !buildDocker {
+		packagingTask.AssertSupported()
+	}
 
 	if !buildSkipFlutterBuildBundle {
 		cleanBuildOutputsDir(targetOS)

cmd/packaging/darwin-bundle.go

@@ -1,15 +1,37 @@
 package packaging
 
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+)
+
 // DarwinBundleTask packaging for darwin as bundle
 var DarwinBundleTask = &packagingTask{
 	packagingFormatName: "darwin-bundle",
 	templateFiles: map[string]string{
 		"darwin-bundle/Info.plist.tmpl": "{{.applicationName}} {{.version}}.app/Contents/Info.plist.tmpl",
 	},
-	executableFiles:               []string{},
-	buildOutputDirectory:          "{{.applicationName}} {{.version}}.app/Contents/MacOS",
-	packagingScriptTemplate:       "mkdir -p \"{{.applicationName}} {{.version}}.app/Contents/Resources\" && png2icns \"{{.applicationName}} {{.version}}.app/Contents/Resources/icon.icns\" \"{{.applicationName}} {{.version}}.app/Contents/MacOS/assets/icon.png\"",
-	outputFileExtension:           "app",
-	outputFileContainsVersion:     true,
-	outputFileUsesApplicationName: true,
+	executableFiles:             []string{},
+	flutterBuildOutputDirectory: "{{.applicationName}} {{.version}}.app/Contents/MacOS",
+	packagingFunction: func(tmpPath, applicationName, strippedApplicationName, packageName, executableName, version, release string) (string, error) {
+		outputFileName := fmt.Sprintf("%s %s.app", applicationName, version)
+		err := os.MkdirAll(filepath.Join(tmpPath, outputFileName, "Contents", "Resources"), 0755)
+		if err != nil {
+			return "", err
+		}
+		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
+		err = cmdPng2icns.Run()
+		if err != nil {
+			return "", err
+		}
+		return outputFileName, nil
+	},
+	requiredTools: map[string][]string{
+		"linux": {"png2icns"},
+	},
 }

cmd/packaging/darwin-dmg.go

@@ -1,14 +1,39 @@
 package packaging
 
+import (
+	"fmt"
+	"os"
+	"os/exec"
+)
+
 // DarwinDmgTask packaging for darwin as dmg
 var DarwinDmgTask = &packagingTask{
 	packagingFormatName: "darwin-dmg",
 	dependsOn: map[*packagingTask]string{
 		DarwinBundleTask: "dmgdir",
 	},
-	packagingScriptTemplate:       "ln -sf /Applications dmgdir/Applications && genisoimage -V {{.packageName}} -D -R -apple -no-pad -o \"{{.applicationName}} {{.version}}.dmg\" dmgdir",
-	outputFileExtension:           "dmg",
-	outputFileContainsVersion:     true,
-	outputFileUsesApplicationName: true,
-	skipAssertInitialized:         true,
+	packagingFunction: func(tmpPath, applicationName, strippedApplicationName, packageName, executableName, version, release string) (string, error) {
+		outputFileName := fmt.Sprintf("%s %s.dmg", applicationName, version)
+		cmdLn := exec.Command("ln", "-sf", "/Applications", "dmgdir/Applications")
+		cmdLn.Dir = tmpPath
+		cmdLn.Stdout = os.Stdout
+		cmdLn.Stderr = os.Stderr
+		err := cmdLn.Run()
+		if err != nil {
+			return "", err
+		}
+		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
+		err = cmdGenisoimage.Run()
+		if err != nil {
+			return "", err
+		}
+		return outputFileName, nil
+	},
+	skipAssertInitialized: true,
+	requiredTools: map[string][]string{
+		"linux": {"ln", "genisoimage"},
+	},
 }

cmd/packaging/darwin-pkg.go

@@ -1,5 +1,12 @@
 package packaging
 
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+)
+
 // DarwinPkgTask packaging for darwin as pkg
 var DarwinPkgTask = &packagingTask{
 	packagingFormatName: "darwin-pkg",
@@ -10,8 +17,85 @@ var DarwinPkgTask = &packagingTask{
 		"darwin-pkg/PackageInfo.tmpl":  "flat/base.pkg/PackageInfo.tmpl",
 		"darwin-pkg/Distribution.tmpl": "flat/Distribution.tmpl",
 	},
-	packagingScriptTemplate:       "(cd flat/root && find . | cpio -o --format odc --owner 0:80 | gzip -c ) > flat/base.pkg/Payload && mkbom -u 0 -g 80 flat/root flat/base.pkg/Bom && (cd flat && xar --compression none -cf \"../{{.applicationName}} {{.version}}.pkg\" * )",
-	outputFileExtension:           "pkg",
-	outputFileContainsVersion:     true,
-	outputFileUsesApplicationName: true,
+	packagingFunction: func(tmpPath, applicationName, strippedApplicationName, packageName, executableName, version, release string) (string, error) {
+		outputFileName := fmt.Sprintf("%s %s.pkg", applicationName, version)
+
+		payload, err := os.OpenFile(filepath.Join("flat", "base.pkg", "Payload"), os.O_RDWR|os.O_CREATE, 0755)
+		if err != nil {
+			return "", nil
+		}
+
+		cmdFind := exec.Command("find", ".")
+		cmdFind.Dir = filepath.Join(tmpPath, "flat", "root")
+		cmdCpio := exec.Command("cpio", "-o", "--format", "odc", "--owner", "0:80")
+		cmdCpio.Dir = filepath.Join(tmpPath, "flat", "root")
+		cmdGzip := exec.Command("gzip", "-c")
+
+		// Pipes like this: find | cpio | gzip > Payload
+		cmdCpio.Stdin, err = cmdFind.StderrPipe()
+		if err != nil {
+			return "", nil
+		}
+		cmdGzip.Stdin, err = cmdCpio.StderrPipe()
+		if err != nil {
+			return "", nil
+		}
+		cmdGzip.Stdout = payload
+
+		err = cmdGzip.Start()
+		if err != nil {
+			return "", nil
+		}
+		err = cmdCpio.Start()
+		if err != nil {
+			return "", nil
+		}
+		err = cmdFind.Run()
+		if err != nil {
+			return "", nil
+		}
+		err = cmdCpio.Wait()
+		if err != nil {
+			return "", nil
+		}
+		err = cmdGzip.Wait()
+		if err != nil {
+			return "", nil
+		}
+		err = payload.Close()
+		if err != nil {
+			return "", nil
+		}
+
+		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
+		err = cmdMkbom.Run()
+		if err != nil {
+			return "", nil
+		}
+
+		var files []string
+		err = filepath.Walk(tmpPath, func(path string, info os.FileInfo, err error) error {
+			files = append(files, path)
+			return nil
+		})
+		if err != nil {
+			return "", nil
+		}
+
+		cmdXar := exec.Command("xar", append([]string{"--compression", "none", "-cf", filepath.Join("..", outputFileName)}, files...)...)
+		cmdXar.Dir = filepath.Join(tmpPath, "flat")
+		cmdXar.Stdout = os.Stdout
+		cmdXar.Stderr = os.Stderr
+		err = cmdXar.Run()
+		if err != nil {
+			return "", nil
+		}
+		return outputFileName, nil
+	},
+	requiredTools: map[string][]string{
+		"linux": {"find", "cpio", "gzip", "mkbom", "xar"},
+	},
 }

cmd/packaging/linux-appimage.go

@@ -1,20 +1,66 @@
 package packaging
 
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+
+	copy "github.com/otiai10/copy"
+
+	"github.com/go-flutter-desktop/hover/internal/log"
+)
+
 // LinuxAppImageTask packaging for linux as AppImage
 var LinuxAppImageTask = &packagingTask{
 	packagingFormatName: "linux-appimage",
 	templateFiles: map[string]string{
 		"linux-appimage/AppRun.tmpl": "AppRun.tmpl",
-		"linux/app.desktop.tmpl":     "{{.executableName}}.desktop.tmpl",
+		"linux/app.desktop.tmpl":     "{{.strippedApplicationName}}.desktop.tmpl",
 	},
 	executableFiles: []string{
+		".",
 		"AppRun",
-		"{{.executableName}}.desktop",
+		"{{.strippedApplicationName}}.desktop",
+	},
+	linuxDesktopFileIconPath:    "{{.strippedApplicationName}}",
+	flutterBuildOutputDirectory: "build",
+	packagingFunction: func(tmpPath, applicationName, strippedApplicationName, packageName, executableName, version, release string) (string, error) {
+		sourceIconPath := filepath.Join(tmpPath, "build", "assets", "icon.png")
+		iconDir := filepath.Join(tmpPath, "usr", "share", "icons", "hicolor", "256x256", "apps")
+		if _, err := os.Stat(iconDir); os.IsNotExist(err) {
+			err = os.MkdirAll(iconDir, 0755)
+			if err != nil {
+				log.Errorf("Failed to create icon dir: %v", err)
+				os.Exit(1)
+			}
+		}
+		err := copy.Copy(sourceIconPath, filepath.Join(tmpPath, fmt.Sprintf("%s.png", strippedApplicationName)))
+		if err != nil {
+			log.Errorf("Failed to copy icon root dir: %v", err)
+			os.Exit(1)
+		}
+		err = copy.Copy(sourceIconPath, filepath.Join(iconDir, fmt.Sprintf("%s.png", strippedApplicationName)))
+		if err != nil {
+			log.Errorf("Failed to copy icon dir: %v", err)
+			os.Exit(1)
+		}
+		cmdAppImageTool := exec.Command("appimagetool", ".")
+		cmdAppImageTool.Dir = tmpPath
+		cmdAppImageTool.Stdout = os.Stdout
+		cmdAppImageTool.Stderr = os.Stderr
+		cmdAppImageTool.Env = append(
+			os.Environ(),
+			"ARCH=x86_64",
+			fmt.Sprintf("VERSION=%s", version),
+		)
+		err = cmdAppImageTool.Run()
+		if err != nil {
+			return "", err
+		}
+		return fmt.Sprintf("%s-%s-x86_64.AppImage", strippedApplicationName, version), nil
+	},
+	requiredTools: map[string][]string{
+		"linux": {"appimagetool"},
 	},
-	linuxDesktopFileIconPath:      "/build/assets/icon",
-	buildOutputDirectory:          "build",
-	packagingScriptTemplate:       "appimagetool . && mv -n {{.executableName}}-x86_64.AppImage {{.packageName}}-{{.version}}.AppImage",
-	outputFileExtension:           "AppImage",
-	outputFileContainsVersion:     true,
-	outputFileUsesApplicationName: false,
 }

cmd/packaging/linux-deb.go

@@ -1,5 +1,11 @@
 package packaging
 
+import (
+	"fmt"
+	"os"
+	"os/exec"
+)
+
 // LinuxDebTask packaging for linux as deb
 var LinuxDebTask = &packagingTask{
 	packagingFormatName: "linux-deb",
@@ -14,9 +20,20 @@ var LinuxDebTask = &packagingTask{
 	},
 	linuxDesktopFileExecutablePath: "/usr/lib/{{.packageName}}/{{.executableName}}",
 	linuxDesktopFileIconPath:       "/usr/lib/{{.packageName}}/assets/icon.png",
-	buildOutputDirectory:           "usr/lib/{{.packageName}}",
-	packagingScriptTemplate:        "dpkg-deb --build . {{.packageName}}-{{.version}}.deb",
-	outputFileExtension:            "deb",
-	outputFileContainsVersion:      true,
-	outputFileUsesApplicationName:  false,
+	flutterBuildOutputDirectory:    "usr/lib/{{.packageName}}",
+	packagingFunction: func(tmpPath, applicationName, strippedApplicationName, packageName, executableName, version, release string) (string, error) {
+		outputFileName := fmt.Sprintf("%s_%s_amd64.deb", packageName, version)
+		cmdDpkgDeb := exec.Command("dpkg-deb", "--build", ".", outputFileName)
+		cmdDpkgDeb.Dir = tmpPath
+		cmdDpkgDeb.Stdout = os.Stdout
+		cmdDpkgDeb.Stderr = os.Stderr
+		err := cmdDpkgDeb.Run()
+		if err != nil {
+			return "", err
+		}
+		return outputFileName, nil
+	},
+	requiredTools: map[string][]string{
+		"linux": {"dpkg-deb"},
+	},
 }

cmd/packaging/linux-pkg.go

@@ -1,5 +1,11 @@
 package packaging
 
+import (
+	"fmt"
+	"os"
+	"os/exec"
+)
+
 // LinuxPkgTask packaging for linux as pacman pkg
 var LinuxPkgTask = &packagingTask{
 	packagingFormatName: "linux-pkg",
@@ -14,9 +20,19 @@ var LinuxPkgTask = &packagingTask{
 	},
 	linuxDesktopFileExecutablePath: "/usr/lib/{{.packageName}}/{{.executableName}}",
 	linuxDesktopFileIconPath:       "/usr/lib/{{.packageName}}/assets/icon.png",
-	buildOutputDirectory:           "src/usr/lib/{{.packageName}}",
-	packagingScriptTemplate:        "makepkg && mv -n {{.packageName}}-{{.version}}-{{.release}}-x86_64.pkg.tar.xz {{.packageName}}-{{.version}}.pkg.tar.xz",
-	outputFileExtension:            "pkg.tar.xz",
-	outputFileContainsVersion:      true,
-	outputFileUsesApplicationName:  false,
+	flutterBuildOutputDirectory:    "src/usr/lib/{{.packageName}}",
+	packagingFunction: func(tmpPath, applicationName, strippedApplicationName, packageName, executableName, version, release string) (string, error) {
+		cmdMakepkg := exec.Command("makepkg")
+		cmdMakepkg.Dir = tmpPath
+		cmdMakepkg.Stdout = os.Stdout
+		cmdMakepkg.Stderr = os.Stderr
+		err := cmdMakepkg.Run()
+		if err != nil {
+			return "", err
+		}
+		return fmt.Sprintf("%s-%s-%s-x86_64.pkg.tar.xz", packageName, version, release), nil
+	},
+	requiredTools: map[string][]string{
+		"linux": {"makepkg"},
+	},
 }