crosspack 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd9fa9d325c41f9b9b56fcbaf6fca186f28fcfff888002ba7f2f896e9f93fd38
-  data.tar.gz: c9281e44840c2f238ae49feacebb269f822f3ea15fb38681ac47f41804221bf2
+  metadata.gz: da2fde445d69125a1c1ebd8120b06bb06d37400cb65d5bf95ee773c89223a235
+  data.tar.gz: cdcefb6dcc30071b80b640e319a13e11691cdbd7b8cb8a511f07173b53da6100
 SHA512:
-  metadata.gz: c13e601a7402da31931e3d2a8b93a7e9120369a5a157327992ed8aea827b756684f5e320e8880d4e3d1168e18d4e886ed3e6e0465d749d5c308feb628de9afa2
-  data.tar.gz: 924c9c9a07cdbfd2661f20e07eb0137566a8935f96d7b420275ecc27c3d513e59e885cf6f3a4f2345552f8540b4466213caf9c6f87f41f6c4c03335fe558a463
+  metadata.gz: e05e92f827a5128d77a58c3d9655d4f5ffe0e4aaa39fd4bee1fde34e20a20ed320b6295d2f5fcffc92698afc3b3a9580a3397d1287b097c83ed6c56969ae6371
+  data.tar.gz: d8a2a11bfd9ea856eb1fc08322a2848be3f630003767981b5d9bf3b394127800d1bcd4f6eb165db79e64a38446653db159c256a71f27f551948335cb3bf27440

data/CHANGELOG.md

@@ -5,6 +5,58 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.7.3] - 2026-09-26
+
+### Fixed
+- The manifest icon keeps its real extension everywhere: an SVG now installs
+  to `share/icons/hicolor/scalable/apps/<name>.svg` (it was forced to
+  `share/pixmaps/<name>.png`, where desktops never found it); PNG/XPM keep
+  going to pixmaps.
+- `.desktop` `Categories` values are terminated with `;` per the spec — a
+  manifest value like `Utility;Audio` produced an invalid entry GNOME could
+  refuse to show.
+- macOS `Info.plist` escapes XML entities (`&`/`<` in the summary no longer
+  corrupt the plist), `CFBundleExecutable` is the first `package.executables`
+  entry (not the package name) and the bundle icon from `icon:` is copied to
+  `Contents/Resources` and referenced via `CFBundleIconFile`.
+- RPM `%description` carries the full package description, not just the
+  summary line.
+- PKGBUILD quotes the `license` value (a license with spaces broke the
+  generated bash).
+- deb omits an empty `Depends:` field instead of writing an invalid one.
+- WiX `Source` paths are XML-escaped (`&` in a path no longer breaks the
+  generated `.wxs`).
+
+### Added
+- The PKGBUILD now installs the `.desktop` file and the icon — desktop
+  integration was deb/rpm-only. The source tarball must carry the icon under
+  its own file name and the `.desktop` file as `<name>.desktop`.
+
+[0.7.3]: https://github.com/OrelSokolov/crosspack/releases/tag/v0.7.3
+
+## [0.7.2] - 2026-09-26
+
+### Fixed
+- Windows MSI no longer fails to install with error 1324: the payload
+  directory is now `INSTALLFOLDER` (WiX v4+ treats any other Id as "author
+  did not define it" and injects a phantom `[Manufacturer] [ProductName]`
+  directory). The deb-style `Name <email>` maintainer is sanitized to the
+  name half before it reaches the MSI Manufacturer property.
+- calver versions (e.g. `2026.09.26`) map to a valid MSI ProductVersion
+  (`26.9.26`) in the `Package@Version` attribute too, not just the file
+  name — a major >= 256 tripped WIX1148.
+
+### Added
+- The Windows MSI now has a standard install wizard (`ui:WixUI
+  WixUI_InstallDir` with the license dialog): crosspack generates the
+  license `.rtf` and builds with `-ext WixToolset.UI.wixext`, installing the
+  UI extension itself when missing (`WixToolset.UI.wixext/6.0.1` on WiX 6).
+- Start Menu and Desktop shortcuts for the first `package.executables`
+  entry; the display name comes from `package.desktop.name` (falling back
+  to the package name). Previously the winget target ignored `desktop:`.
+
+[0.7.2]: https://github.com/OrelSokolov/crosspack/releases/tag/v0.7.2
+
 ## [0.7.0] - 2026-09-13
 
 ### Added

data/README.md

@@ -1,5 +1,11 @@
+<p align="center">
+  <img src="logo.png" width="220" alt="crosspack" />
+</p>
+
 # crosspack
 
+> Painless packaging for any platform.
+
 Cross-platform build **and** pack toolchain for Wails-style desktop apps,
 shipped as one gem, one command, one config file and a staged pipeline:
 

data/lib/crosspack/builders/app_dir.rb

@@ -10,9 +10,11 @@ module Crosspack
     # as-is.
     class AppDir
       # files: { source_path => basename inside Contents/MacOS }
-      # executables: basenames to chmod 0755
+      # executables: basenames to chmod 0755 (the first one is the bundle's
+      #   CFBundleExecutable, falling back to the package name)
+      # icon: path to the bundle icon, copied into Contents/Resources
       def self.build(name:, version:, summary:, files:, executables: [],
-                     identifier: nil, output:)
+                     display_name: nil, icon: nil, identifier: nil, output:)
         app_dir = File.join(output, "#{name}.app")
         FileUtils.rm_rf(app_dir)
         macos_dir = File.join(app_dir, 'Contents', 'MacOS')
@@ -34,9 +36,19 @@ module Crosspack
           FileUtils.chmod(executables.include?(dst) ? 0o755 : 0o644, target)
         end
 
+        icon_file = nil
+        if icon
+          raise BuildError, "icon: file not found #{icon}" unless File.file?(icon)
+
+          icon_file = File.basename(icon)
+          FileUtils.cp(icon, File.join(resources_dir, icon_file))
+        end
+
         write_info_plist(File.join(app_dir, 'Contents', 'Info.plist'),
                          name: name, version: version, summary: summary,
-                         identifier: identifier)
+                         executable: executables.first || name,
+                         display_name: display_name || name,
+                         icon_file: icon_file, identifier: identifier)
 
         File.write(File.join(output, 'BUILD-DMG.txt'), <<~TXT)
           DMG not built: hdiutil only exists on macOS.
@@ -46,27 +58,31 @@ module Crosspack
         app_dir
       end
 
-      def self.write_info_plist(path, name:, version:, summary:, identifier: nil)
+      def self.write_info_plist(path, name:, version:, summary:, executable:,
+                                display_name:, icon_file: nil, identifier: nil)
         bundle_id = identifier || "org.crosspack.#{name}"
+        # Without the extension .icns is assumed; other formats (png) must
+        # be named in full.
+        icon_ref = icon_file.nil? ? nil : icon_file.sub(/\.icns\z/i, '')
         File.write(path, <<~PLIST)
           <?xml version="1.0" encoding="UTF-8"?>
           <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
           <plist version="1.0">
           <dict>
             <key>CFBundleName</key>
-            <string>#{name}</string>
+            <string>#{escape(name)}</string>
             <key>CFBundleDisplayName</key>
-            <string>#{name}</string>
+            <string>#{escape(display_name)}</string>
             <key>CFBundleExecutable</key>
-            <string>#{name}</string>
+            <string>#{escape(executable)}</string>
             <key>CFBundleIdentifier</key>
-            <string>#{bundle_id}</string>
+            <string>#{escape(bundle_id)}</string>
             <key>CFBundlePackageType</key>
             <string>APPL</string>
             <key>CFBundleShortVersionString</key>
-            <string>#{version}</string>
+            <string>#{escape(version)}</string>
             <key>CFBundleVersion</key>
-            <string>#{version}</string>
+            <string>#{escape(version)}</string>
             <key>CFBundleInfoDictionaryVersion</key>
             <string>6.0</string>
             <key>LSMinimumSystemVersion</key>
@@ -78,11 +94,23 @@ module Crosspack
             <key>NSSupportsSuddenTermination</key>
             <false/>
             <key>NSMicrophoneUsageDescription</key>
-            <string>#{summary}</string>
+            <string>#{escape(summary)}</string>
+          #{plist_icon_entry(icon_ref)}
           </dict>
           </plist>
         PLIST
       end
+
+      def self.plist_icon_entry(icon_ref)
+        return '' if icon_ref.nil?
+
+        "    <key>CFBundleIconFile</key>\n    <string>#{escape(icon_ref)}</string>"
+      end
+
+      # Escapes XML entities so manifest values never break the plist.
+      def self.escape(text)
+        text.to_s.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;')
+      end
     end
   end
 end

data/lib/crosspack/builders/deb.rb

@@ -104,17 +104,13 @@ module Crosspack
         summary = description_lines.shift || @name
         body = description_lines.map { |l| " #{l}" }
 
-        File.write(File.join(debian_dir, 'control'), <<~CONTROL)
-          Package: #{@name}
-          Version: #{@version}
-          Section: #{@section}
-          Priority: #{@priority}
-          Architecture: #{@architecture}
-          Maintainer: #{@maintainer}
-          Depends: #{@depends}
-          Description: #{summary}
-          #{body.join("\n")}
-        CONTROL
+        fields = ["Package: #{@name}", "Version: #{@version}", "Section: #{@section}",
+                  "Priority: #{@priority}", "Architecture: #{@architecture}",
+                  "Maintainer: #{@maintainer}"]
+        # An empty Depends: field is invalid; omit it instead.
+        fields << "Depends: #{@depends}" unless @depends.to_s.strip.empty?
+        File.write(File.join(debian_dir, 'control'),
+                   "#{(fields + ["Description: #{summary}"]).join("\n")}\n#{body.join("\n")}\n")
       end
     end
   end

data/lib/crosspack/builders/pkgbuild.rb

@@ -49,7 +49,7 @@ module Crosspack
           pkgdesc='#{escaped_desc}'
           arch=(#{arch.join(' ')})
           url='#{url}'
-          license=(#{license})
+          license=('#{license}')
           depends=(#{depends_line})
           source=(#{source_line})
           sha256sums=('SKIP')

data/lib/crosspack/builders/wix.rb

@@ -12,11 +12,23 @@ module Crosspack
     # complete .wxs source plus build instructions — packaging is not blocked
     # by the toolchain.
     class Wix
-      # MSI ProductVersion only honours three numeric fields (x.y.z).
+      # The UI extension providing the standard install wizard dialogs.
+      UI_EXTENSION = 'WixToolset.UI.wixext'
+      # WiX v6 cannot use the unpinned extension (it pulls the incompatible
+      # 7.0.0, WIX6101 wixext7); 7+ resolves a matching version on its own.
+      UI_EXTENSION_V6_PIN = "#{UI_EXTENSION}/6.0.1"
+
+      # MSI ProductVersion honours three numeric fields (x.y.z), each 0..255:
+      # a calver year (2026) would trip WIX1148, so it maps to the short
+      # form (26) and leading zeros are dropped (2026.09.26 -> 26.9.26).
       def self.msi_version(version)
         fields = version.to_s.split(/[.-]/).first(3)
         fields << '0' while fields.size < 3
-        fields.map { |f| f.gsub(/\D/, '').empty? ? '0' : f.gsub(/\D/, '') }.join('.')
+        fields.map do |f|
+          n = f.to_i
+          n %= 100 if n > 255
+          n.to_s
+        end.join('.')
       end
 
       # Deterministic UpgradeCode derived from the package name, so upgrades
@@ -27,40 +39,73 @@ module Crosspack
         "#{hex[0, 8]}-#{hex[8, 4]}-#{hex[12, 4]}-#{hex[16, 4]}-#{hex[20, 12]}"
       end
 
-      # Escapes XML entities so manifest values (e.g. a maintainer with
-      # "Name <email>") never break the generated .wxs.
+      # Escapes XML entities so manifest values never break the generated .wxs.
       def self.escape(text)
         text.to_s.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;').gsub('"', '&quot;')
       end
 
+      # The deb-style "Name <email>" maintainer must not reach the MSI
+      # Manufacturer property: it lands in ARP/Publisher (and an angle-bracket
+      # email is invalid in Windows Installer paths), so only the name half
+      # is kept.
+      def self.sanitize_manufacturer(manufacturer)
+        name = manufacturer.to_s.sub(/\s*<[^<>]*>\s*/, '').strip
+        name.empty? ? manufacturer.to_s.delete('<>') : name
+      end
+
+      # Minimal RTF for the WixUI_InstallDir license dialog — it requires
+      # WixUILicenseRtf to point at a real .rtf file, else the build fails.
+      def self.license_rtf(text)
+        escaped = text.to_s.gsub('\\', '\\\\\\\\').gsub('{', '\\{').gsub('}', '\\}')
+        lines = escaped.lines.map(&:chomp)
+        lines = [''] if lines.empty?
+        "{\\rtf1\\ansi\n#{lines.join("\\par\n")}\n}\n"
+      end
+
+      # shortcuts: nil, or { name: "Display Name", target: "app.exe" } (the
+      # payload file inside INSTALLFOLDER the shortcuts launch) — installs
+      # Start Menu and Desktop shortcuts.
       def self.generate_wxs(name:, version:, manufacturer:, summary:, files:,
-                            arch: 'x64')
+                            arch: 'x64', shortcuts: nil)
+        license_rtf_file = "#{name}-license.rtf"
         name = escape(name)
-        manufacturer = escape(manufacturer)
+        manufacturer = escape(sanitize_manufacturer(manufacturer))
         summary = escape(summary)
         directory = arch == 'arm64' ? 'ProgramFiles6432Folder' : 'ProgramFiles64Folder'
         components = files.values.each_with_index.map do |dst, i|
-          src = files.key(dst).gsub('/', '\\')
+          src = escape(files.key(dst).gsub('/', '\\'))
           "      <Component Id=\"c#{i}\" Guid=\"*\">\n" \
             "        <File Id=\"f#{i}\" Source=\"#{src}\" />\n" \
             '      </Component>'
         end.join("\n")
 
+        # Id must be INSTALLFOLDER: WiX v4+ auto-creates a directory with
+        # this exact Id (named "[Manufacturer] [ProductName]") only when the
+        # author has not defined one; a different Id makes it add a phantom
+        # sibling directory and Manufacturer leaks into install paths.
+        shortcut_xml = shortcuts ? shortcuts_fragment(shortcuts) : nil
+        feature_refs = ["<ComponentGroupRef Id=\"Payload\" />"]
+        feature_refs << '<ComponentGroupRef Id="Shortcuts" />' if shortcuts
+
         <<~WXS
           <?xml version="1.0" encoding="UTF-8"?>
-          <!-- Generated by crosspack. Build with: wix build -arch #{arch} -o #{name}.msi #{name}.wxs -->
-          <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+          <!-- Generated by crosspack. Build with: wix build -arch #{arch} -ext #{UI_EXTENSION} -o #{name}.msi #{name}.wxs -->
+          <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+               xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
             <Package Name="#{name}" Manufacturer="#{manufacturer}" Version="#{msi_version(version)}"
                      UpgradeCode="{#{upgrade_code(name)}}" Scope="perMachine">
               <SummaryInformation Description="#{summary}" />
               <MajorUpgrade DowngradeErrorMessage="A newer version of #{name} is already installed." />
 
               <StandardDirectory Id="#{directory}">
-                <Directory Id="INSTALLDIR" Name="#{name}" />
+                <Directory Id="INSTALLFOLDER" Name="#{name}" />
               </StandardDirectory>
 
+              <Property Id="WixUILicenseRtf" Value="#{license_rtf_file}" />
+              <ui:WixUI Id="WixUI_InstallDir" InstallDirectory="INSTALLFOLDER" />
+
               <Feature Id="Main" Title="#{name}" Level="1">
-                <ComponentGroupRef Id="Payload" />
+          #{feature_refs.map { |r| "        #{r}" }.join("\n")}
               </Feature>
             </Package>
 
@@ -69,14 +114,40 @@ module Crosspack
           #{components}
               </ComponentGroup>
             </Fragment>
+          #{shortcut_xml}
           </Wix>
         WXS
       end
 
-      # Writes the .wxs next to the output and, when WiX is installed,
-      # builds a real MSI. Returns the path of whatever was produced.
+      # Start Menu + Desktop shortcuts for the main executable. The shortcut
+      # component's KeyPath is a marker registry value (a shortcut cannot be
+      # a KeyPath itself); the icon comes from the exe.
+      def self.shortcuts_fragment(shortcuts)
+        name = escape(shortcuts[:name])
+        target = escape(shortcuts[:target])
+        <<~XML
+          <Fragment>
+            <ComponentGroup Id="Shortcuts" Directory="INSTALLFOLDER">
+              <Component Id="c.shortcuts" Guid="*">
+                <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuFolder"
+                          Name="#{name}" Target="[INSTALLFOLDER]#{target}"
+                          WorkingDirectory="INSTALLFOLDER" />
+                <Shortcut Id="DesktopShortcut" Directory="DesktopFolder"
+                          Name="#{name}" Target="[INSTALLFOLDER]#{target}"
+                          WorkingDirectory="INSTALLFOLDER" />
+                <RegistryValue Root="HKLM" Key="Software\\#{name}"
+                               Name="installed" Type="integer" Value="1" KeyPath="yes" />
+              </Component>
+            </ComponentGroup>
+          </Fragment>
+        XML
+      end
+
+      # Writes the .wxs (plus the license .rtf the UI wizard shows) next to
+      # the output and, when WiX is installed, builds a real MSI. Returns
+      # the path of whatever was produced.
       def self.build(name:, version:, manufacturer:, summary:, files:, output:,
-                     arch: 'x64')
+                     arch: 'x64', shortcuts: nil, license: nil)
         arch = { 'x86_64' => 'x64', 'aarch64' => 'arm64' }.fetch(arch, arch)
         missing = files.reject { |src, _dst| File.file?(src) }
         unless missing.empty?
@@ -92,7 +163,9 @@ module Crosspack
         File.write(wxs_path, generate_wxs(name: name, version: version,
                                           manufacturer: manufacturer,
                                           summary: summary, files: files,
-                                          arch: arch))
+                                          arch: arch, shortcuts: shortcuts))
+        File.write(File.join(out_dir, "#{name}-license.rtf"),
+                   license_rtf(license || summary))
 
         wix = wix_command
         unless wix
@@ -100,13 +173,17 @@ module Crosspack
             MSI not built: WiX toolset not found in PATH.
             Install the .NET SDK and WiX:
               dotnet tool install -g wix
+            The install wizard needs the UI extension:
+              wix extension add -g #{UI_EXTENSION_V6_PIN}   # WiX 6.x (no pin needed for WiX 7+)
             Then build with:
-              wix build -arch #{arch} -o #{File.basename(output)} #{name}.wxs
+              wix build -arch #{arch} -ext #{UI_EXTENSION} -o #{File.basename(output)} #{name}.wxs
           TXT
           return wxs_path
         end
 
+        ensure_ui_extension(wix)
         out, status = Open3.capture2e(wix, 'build', '-arch', arch.to_s,
+                                      '-ext', UI_EXTENSION,
                                       '-o', output, wxs_path)
         unless status.success?
           raise BuildError, "wix build failed to build #{output}:\n#{out}"
@@ -124,6 +201,21 @@ module Crosspack
       rescue Errno::ENOENT
         nil
       end
+
+      # The WixUI dialogs live in the UI extension, so it must be installed
+      # before `wix build -ext WixToolset.UI.wixext` can resolve it. A no-op
+      # when it is already present.
+      def self.ensure_ui_extension(wix = 'wix')
+        list, = Open3.capture2e(wix, 'extension', 'list', '-g')
+        return if list.include?(UI_EXTENSION)
+
+        version, = Open3.capture2e(wix, '--version')
+        spec = version.to_i >= 7 ? UI_EXTENSION : UI_EXTENSION_V6_PIN
+        out, status = Open3.capture2e(wix, 'extension', 'add', '-g', spec)
+        return if status.success?
+
+        raise BuildError, "cannot install the WiX UI extension (#{spec}):\n#{out}"
+      end
     end
   end
 end

data/lib/crosspack/packer.rb

@@ -99,10 +99,7 @@ module Crosspack
       files = @pkg.payload_for(@target).to_h { |n| [File.join(src_dir, n), File.join(lib_dst, n)] }
 
       if @pkg.icon
-        icon_src = File.expand_path(@pkg.icon, @root)
-        raise BuildError, "icon: file not found #{icon_src}" unless File.file?(icon_src)
-
-        files[icon_src] = File.join(@pkg.prefix, 'share', 'pixmaps', "#{@pkg.name}.png")
+        files[icon_source] = icon_destination
       end
 
       if @pkg.desktop
@@ -123,6 +120,10 @@ module Crosspack
       FileUtils.mkdir_p(dir)
       path = File.join(dir, "#{@pkg.name}.desktop")
       d = @pkg.desktop
+      # The spec requires each list value terminated with ";"; a manifest
+      # value like "Utility;Audio" would otherwise produce an invalid entry.
+      categories = d['categories'].to_s.empty? ? 'Utility;' : d['categories'].to_s
+      categories += ';' unless categories.end_with?(';')
       File.write(path, <<~DESKTOP)
         [Desktop Entry]
         Type=Application
@@ -131,11 +132,30 @@ module Crosspack
         Exec=#{d['exec'] || @pkg.name}
         Icon=#{@pkg.name}
         Terminal=false
-        Categories=#{d['categories'] || 'Utility;'}
+        Categories=#{categories}
       DESKTOP
       path
     end
 
+    def icon_source
+      src = File.expand_path(@pkg.icon, @root)
+      raise BuildError, "icon: file not found #{src}" unless File.file?(src)
+
+      src
+    end
+
+    # Desktop icon lookup keeps the real extension: PNG/XPM go to the
+    # classic pixmaps dir, SVG needs the hicolor scalable theme dir (a .svg
+    # named .png in pixmaps is never found).
+    def icon_destination
+      ext = File.extname(@pkg.icon).downcase
+      if ext == '.svg'
+        File.join(@pkg.prefix, 'share', 'icons', 'hicolor', 'scalable', 'apps', "#{@pkg.name}#{ext}")
+      else
+        File.join(@pkg.prefix, 'share', 'pixmaps', "#{@pkg.name}#{ext}")
+      end
+    end
+
     def resolved_depends(format)
       Resolver.new(@deps).depends(@target, format: format)
     end
@@ -173,7 +193,7 @@ module Crosspack
         files: @pkg_data[:files],
         symlinks: @pkg_data[:symlinks],
         executables: @pkg_data[:executables],
-        description: @pkg.summary,
+        description: @pkg.description,
         arch: @target.package_arch(:rpm),
         output: output
       )
@@ -183,6 +203,15 @@ module Crosspack
     def pack_pkgbuild
       version, release = split_version
       output = File.join(@target.output_dir(@output_base, :pkgbuild), 'PKGBUILD')
+      # Same desktop integration as deb/rpm: the .desktop file and the icon
+      # go to the same destinations; their sources are archive-relative
+      # names (the icon under its own file name).
+      files = @pkg.payload_for(@target).to_h { |n| [n, File.join(@pkg_data[:lib_dst], n)] }
+      if @pkg.desktop
+        files["#{@pkg.name}.desktop"] = File.join(@pkg.prefix, 'share', 'applications',
+                                                  "#{@pkg.name}.desktop")
+      end
+      files[File.basename(@pkg.icon)] = icon_destination if @pkg.icon
       Builders::Pkgbuild.generate(
         name: @pkg.name,
         version: version,
@@ -192,7 +221,7 @@ module Crosspack
         depends: resolved_depends(:pkgbuild),
         arch: [@target.package_arch(:pkgbuild)],
         # PKGBUILD sources are archive-relative names, not local paths.
-        files: @pkg.payload_for(@target).to_h { |n| [n, File.join(@pkg_data[:lib_dst], n)] },
+        files: files,
         symlinks: @pkg_data[:symlinks],
         executables: @pkg_data[:executables],
         source: ["#{@pkg.name}-#{version}.tar.gz"],
@@ -210,6 +239,7 @@ module Crosspack
 
     # Windows: flat payload under Program Files/<name>/ via WiX. Unix symlinks
     # do not apply; everything from `sources` goes in as regular files.
+    # desktop:/executables: drive the Start Menu / Desktop shortcuts.
     def pack_windows
       output = File.join(@target.output_dir(@output_base, :winget),
                          "#{@pkg.name}-#{Builders::Wix.msi_version(@version)}.msi")
@@ -219,22 +249,38 @@ module Crosspack
         version: @version,
         manufacturer: @pkg.maintainer,
         summary: @pkg.summary,
+        license: @pkg.license,
         files: files,
+        shortcuts: windows_shortcuts,
         arch: @target.package_arch(:winget),
         output: output
       )
     end
 
+    # Shortcut facts for the MSI: the display name from desktop: (falling
+    # back to the package name) and the first executable as the target.
+    def windows_shortcuts
+      target = @pkg.executables_for(@target).first
+      return nil if target.nil?
+
+      { name: (@pkg.desktop && @pkg.desktop['name']) || @pkg.name,
+        target: target }
+    end
+
     # macOS: .app bundle staging; DMG itself requires a Mac (hdiutil).
+    # desktop.name becomes the display name; the manifest icon lands in
+    # Contents/Resources (CFBundleIconFile).
     def pack_macos
       output_dir = @target.output_dir(@output_base, :cask)
       files = @pkg.payload_for(@target).to_h { |n| [File.join(@pkg_data[:src_dir], n), n] }
       Builders::AppDir.build(
         name: @pkg.name,
+        display_name: (@pkg.desktop && @pkg.desktop['name']) || @pkg.name,
         version: @version,
         summary: @pkg.summary,
         files: files,
         executables: @pkg.executables_for(@target),
+        icon: @pkg.icon && File.expand_path(@pkg.icon, @root),
         output: output_dir
       )
     end

data/lib/crosspack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Crosspack
-  VERSION = '0.7.1'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crosspack
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Oleg Orlov