Skip to content

Commit a478d62

Browse files
author
jld3103
authored
Merge pull request #158 from sidevesh/master
Add packageName to CFBundleIdentifier, add .png extension to linuxDesktopFileIconPath and rename darwin app bundle to remove version in the darwin-dmg packaging
2 parents aa3008e + 8335827 commit a478d62

File tree

11 files changed

+33
-18
lines changed

11 files changed

+33
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<key>CFBundleIconFile</key>
1212
<string>icon.icns</string>
1313
<key>CFBundleIdentifier</key>
14-
<string>{{.organizationName}}</string>
14+
<string>{{.organizationName}}.{{.packageName}}</string>
1515
<key>CFBundleInfoDictionaryVersion</key>
1616
<string>6.0</string>
1717
<key>CFBundleLongVersionString</key>

‎assets/packaging/darwin-pkg/Distribution.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<installer-gui-script minSpecVersion="1">
33
<title>{{.applicationName}}</title>
4-
<background alignment="topleft" file="root/Applications/{{.applicationName}} {{.version}}.app/Contents/MacOS/assets/icon.png"/>
4+
<background alignment="topleft" file="root/Applications/{{.applicationName}}.app/Contents/MacOS/assets/icon.png"/>
55
<choices-outline>
66
<line choice="choiceBase"/>
77
</choices-outline>

‎assets/packaging/darwin-pkg/PackageInfo.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<pkg-info format-version="2" identifier="{{.organizationName}}.base.pkg" version="{{.version}}" install-location="/" auth="root">
22
<bundle-version>
3-
<bundle id="{{.organizationName}}" CFBundleIdentifier="{{.organizationName}}.{{.packageName}}" path="./Applications/{{.applicationName}} {{.version}}.app" CFBundleVersion="{{.version}}"/>
3+
<bundle id="{{.organizationName}}" CFBundleIdentifier="{{.organizationName}}.{{.packageName}}" path="./Applications/{{.applicationName}}.app" CFBundleVersion="{{.version}}"/>
44
</bundle-version>
55
</pkg-info>

‎assets/packaging/linux/app.desktop.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Version=1.0
33
Type=Application
44
Terminal=false
55
Categories=
6+
Comment={{.description}}
67
Name={{.applicationName}}
78
Icon={{.iconPath}}
89
Exec={{.executablePath}}

‎cmd/packaging/darwin-dmg.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"os"
66
"os/exec"
7+
"path/filepath"
78
)
89

910
// DarwinDmgTask packaging for darwin as dmg
@@ -22,6 +23,12 @@ var DarwinDmgTask = &packagingTask{
2223
if err != nil {
2324
return "", err
2425
}
26+
appBundleOriginalPath := filepath.Join(tmpPath, "dmgdir", fmt.Sprintf("%s %s.app", applicationName, version))
27+
appBundleFinalPath := filepath.Join(tmpPath, "dmgdir", fmt.Sprintf("%s.app", applicationName))
28+
err = os.Rename(appBundleOriginalPath, appBundleFinalPath)
29+
if err != nil {
30+
return "", err
31+
}
2532
cmdGenisoimage := exec.Command("genisoimage", "-V", packageName, "-D", "-R", "-apple", "-no-pad", "-o", outputFileName, "dmgdir")
2633
cmdGenisoimage.Dir = tmpPath
2734
cmdGenisoimage.Stdout = os.Stdout

‎cmd/packaging/darwin-pkg.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ var DarwinPkgTask = &packagingTask{
2727
return "", err
2828
}
2929

30+
appBundleOriginalPath := filepath.Join(tmpPath, "flat", "root", "Applications", fmt.Sprintf("%s %s.app", applicationName, version))
31+
appBundleFinalPath := filepath.Join(tmpPath, "flat", "root", "Applications", fmt.Sprintf("%s.app", applicationName))
32+
err = os.Rename(appBundleOriginalPath, appBundleFinalPath)
33+
if err != nil {
34+
return "", err
35+
}
36+
3037
cmdFind := exec.Command("find", ".")
3138
cmdFind.Dir = filepath.Join(tmpPath, "flat", "root")
3239
cmdCpio := exec.Command("cpio", "-o", "--format", "odc", "--owner", "0:80")

‎cmd/packaging/linux-deb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var LinuxDebTask = &packagingTask{
1919
"usr/share/applications/{{.executableName}}.desktop",
2020
},
2121
linuxDesktopFileExecutablePath: "/usr/lib/{{.packageName}}/{{.executableName}}",
22-
linuxDesktopFileIconPath: "/usr/lib/{{.packageName}}/assets/icon",
22+
linuxDesktopFileIconPath: "/usr/lib/{{.packageName}}/assets/icon.png",
2323
flutterBuildOutputDirectory: "usr/lib/{{.packageName}}",
2424
packagingFunction: func(tmpPath, applicationName, packageName, executableName, version, release string) (string, error) {
2525
outputFileName := fmt.Sprintf("%s_%s_amd64.deb", packageName, version)

‎cmd/packaging/linux-pkg.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var LinuxPkgTask = &packagingTask{
1919
"src/usr/share/applications/{{.executableName}}.desktop",
2020
},
2121
linuxDesktopFileExecutablePath: "/usr/lib/{{.packageName}}/{{.executableName}}",
22-
linuxDesktopFileIconPath: "/usr/lib/{{.packageName}}/assets/icon",
22+
linuxDesktopFileIconPath: "/usr/lib/{{.packageName}}/assets/icon.png",
2323
flutterBuildOutputDirectory: "src/usr/lib/{{.packageName}}",
2424
packagingFunction: func(tmpPath, applicationName, packageName, executableName, version, release string) (string, error) {
2525
cmdMakepkg := exec.Command("makepkg")

‎cmd/packaging/linux-rpm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var LinuxRpmTask = &packagingTask{
1919
"BUILDROOT/{{.packageName}}-{{.version}}-{{.release}}.x86_64/usr/share/applications/{{.executableName}}.desktop",
2020
},
2121
linuxDesktopFileExecutablePath: "/usr/lib/{{.packageName}}/{{.executableName}}",
22-
linuxDesktopFileIconPath: "/usr/lib/{{.packageName}}/assets/icon",
22+
linuxDesktopFileIconPath: "/usr/lib/{{.packageName}}/assets/icon.png",
2323
flutterBuildOutputDirectory: "BUILD/{{.packageName}}-{{.version}}-{{.release}}.x86_64/usr/lib/{{.packageName}}",
2424
packagingFunction: func(tmpPath, applicationName, packageName, executableName, version, release string) (string, error) {
2525
cmdRpmbuild := exec.Command("rpmbuild", "--define", fmt.Sprintf("_topdir %s", tmpPath), "--define", "_unpackaged_files_terminate_build 0", "-ba", fmt.Sprintf("./SPECS/%s.spec", packageName))

‎cmd/packaging/linux-snap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var LinuxSnapTask = &packagingTask{
1414
"linux/app.desktop.tmpl": "snap/local/{{.executableName}}.desktop.tmpl",
1515
},
1616
linuxDesktopFileExecutablePath: "/{{.executableName}}",
17-
linuxDesktopFileIconPath: "/icon",
17+
linuxDesktopFileIconPath: "/icon.png",
1818
flutterBuildOutputDirectory: "build",
1919
packagingFunction: func(tmpPath, applicationName, packageName, executableName, version, release string) (string, error) {
2020
cmdSnapcraft := exec.Command("snapcraft")

‎internal/fileutils/rice-box.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func init() {
6767
Filename: "packaging/darwin-bundle/Info.plist.tmpl",
6868
FileModTime: time.Unix(1588579782, 0),
6969

70-
Content: string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n <dict>\n <key>CFBundleDevelopmentRegion</key>\n <string>English</string>\n <key>CFBundleExecutable</key>\n <string>{{.executableName}}</string>\n <key>CFBundleGetInfoString</key>\n <string>{{.description}}</string>\n <key>CFBundleIconFile</key>\n <string>icon.icns</string>\n <key>CFBundleIdentifier</key>\n <string>{{.organizationName}}</string>\n <key>CFBundleInfoDictionaryVersion</key>\n <string>6.0</string>\n <key>CFBundleLongVersionString</key>\n <string>{{.version}}</string>\n <key>CFBundleName</key>\n <string>{{.applicationName}}</string>\n <key>CFBundlePackageType</key>\n <string>APPL</string>\n <key>CFBundleShortVersionString</key>\n <string>{{.version}}</string>\n <key>CFBundleSignature</key>\n <string>{{.organizationName}}.{{.packageName}}</string>\n <key>CFBundleVersion</key>\n <string>{{.version}}</string>\n <key>CSResourcesFileMapped</key>\n <true/>\n <key>NSHumanReadableCopyright</key>\n <string></string>\n </dict>\n</plist>\n"),
70+
Content: string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n <dict>\n <key>CFBundleDevelopmentRegion</key>\n <string>English</string>\n <key>CFBundleExecutable</key>\n <string>{{.executableName}}</string>\n <key>CFBundleGetInfoString</key>\n <string>{{.description}}</string>\n <key>CFBundleIconFile</key>\n <string>icon.icns</string>\n <key>CFBundleIdentifier</key>\n <string>{{.organizationName}}.{{.packageName}}</string>\n <key>CFBundleInfoDictionaryVersion</key>\n <string>6.0</string>\n <key>CFBundleLongVersionString</key>\n <string>{{.version}}</string>\n <key>CFBundleName</key>\n <string>{{.applicationName}}</string>\n <key>CFBundlePackageType</key>\n <string>APPL</string>\n <key>CFBundleShortVersionString</key>\n <string>{{.version}}</string>\n <key>CFBundleSignature</key>\n <string>{{.organizationName}}.{{.packageName}}</string>\n <key>CFBundleVersion</key>\n <string>{{.version}}</string>\n <key>CSResourcesFileMapped</key>\n <true/>\n <key>NSHumanReadableCopyright</key>\n <string></string>\n </dict>\n</plist>\n"),
7171
}
7272
fileg := &embedded.EmbeddedFile{
7373
Filename: "packaging/darwin-pkg/Distribution.tmpl",
@@ -85,7 +85,7 @@ func init() {
8585
Filename: "packaging/linux/app.desktop.tmpl",
8686
FileModTime: time.Unix(1588579782, 0),
8787

88-
Content: string("[Desktop Entry]\nVersion=1.0\nType=Application\nTerminal=false\nCategories=\nName={{.applicationName}}\nIcon={{.iconPath}}\nExec={{.executablePath}}\n"),
88+
Content: string("[Desktop Entry]\nVersion=1.0\nType=Application\nTerminal=false\nCategories=\nComment={{.description}}\nName={{.applicationName}}\nIcon={{.iconPath}}\nExec={{.executablePath}}\n"),
8989
}
9090
filek := &embedded.EmbeddedFile{
9191
Filename: "packaging/linux/bin.tmpl",
@@ -322,15 +322,15 @@ func init() {
322322
"plugin": dirx,
323323
},
324324
Files: map[string]*embedded.EmbeddedFile{
325-
"README.md": file2,
326-
"app/gitignore": file4,
327-
"app/go.mod": file5,
328-
"app/hover.yaml.tmpl": file6,
329-
"app/icon.png": file7,
330-
"app/main.go": file8,
331-
"app/main_desktop.dart": file9,
332-
"app/options.go": filea,
333-
"packaging/README.md": filec,
325+
"README.md": file2,
326+
"app/gitignore": file4,
327+
"app/go.mod": file5,
328+
"app/hover.yaml.tmpl": file6,
329+
"app/icon.png": file7,
330+
"app/main.go": file8,
331+
"app/main_desktop.dart": file9,
332+
"app/options.go": filea,
333+
"packaging/README.md": filec,
334334
"packaging/darwin-bundle/Info.plist.tmpl": filee,
335335
"packaging/darwin-pkg/Distribution.tmpl": fileg,
336336
"packaging/darwin-pkg/PackageInfo.tmpl": fileh,

0 commit comments

Comments
 (0)