crosspack 0.7.1 → 0.8.0

data/lib/crosspack/packer.rb

@@ -2,6 +2,8 @@
 
 require 'fileutils'
 require 'tmpdir'
+require 'open3'
+require 'digest'
 
 module Crosspack
   # Single entry point: takes a Config (the package: and deps: sections of
@@ -99,10 +101,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,19 +122,55 @@ 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
         Name=#{d['name'] || @pkg.name}
         Comment=#{d['comment'] || @pkg.summary}
-        Exec=#{d['exec'] || @pkg.name}
+        Exec=#{d['exec'] || desktop_exec}
         Icon=#{@pkg.name}
         Terminal=false
-        Categories=#{d['categories'] || 'Utility;'}
+        Categories=#{categories}
       DESKTOP
       path
     end
 
+    # Absolute launcher path: a bare name only resolves when prefix/bin is
+    # in PATH (true for usr/local, not for custom prefixes). Prefer the
+    # bin/ symlink from links:, else the executable inside lib_dir.
+    def desktop_exec
+      link = @pkg.links.keys.find { |l| l.split('/').first == 'bin' }
+      return File.join('/', @pkg.prefix, link) if link
+
+      exe = @pkg.executables.first
+      return File.join('/', @pkg.prefix, @pkg.lib_dir, exe) if exe
+
+      @pkg.name
+    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 +208,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 +218,24 @@ 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).
+      sources = @pkg.payload_for(@target).to_h { |n| [n, File.join(@pkg_data[:src_dir], n)] }
+      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")
+        sources["#{@pkg.name}.desktop"] = desktop_entry_path
+      end
+      if @pkg.icon
+        files[File.basename(@pkg.icon)] = icon_destination
+        sources[File.basename(@pkg.icon)] = icon_source
+      end
+      sha256 = write_source_tarball(
+        File.join(File.dirname(output), "#{@pkg.name}-#{version}.tar.gz"),
+        "#{@pkg.name}-#{version}", sources
+      )
       Builders::Pkgbuild.generate(
         name: @pkg.name,
         version: version,
@@ -192,16 +245,41 @@ 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"],
+        sha256: sha256,
         license: @pkg.license,
         output: output
       )
       output
     end
 
+    # makepkg needs the source archive referenced by the PKGBUILD, and it
+    # must extract into <name>-<version>/ with the exact file names the
+    # install lines use. Crosspack builds it from the staged artifacts, so
+    # the PKGBUILD works out of the box (with a real sha256 instead of
+    # SKIP). Returns the hex digest.
+    def write_source_tarball(tarball, root, sources)
+      require 'tmpdir'
+      missing = sources.values.reject { |src| File.file?(src) }
+      unless missing.empty?
+        raise BuildError, "Source files for the PKGBUILD tarball not found:\n" \
+                          "#{missing.map { |s| "  ✗ #{s}" }.join("\n")}"
+      end
+
+      FileUtils.mkdir_p(File.dirname(tarball))
+      Dir.mktmpdir('crosspack-pkgbuild') do |stage|
+        root_dir = File.join(stage, root)
+        FileUtils.mkdir_p(root_dir)
+        sources.each_value { |src| FileUtils.cp(src, File.join(root_dir, File.basename(src))) }
+        out, status = Open3.capture2e('tar', '-czf', tarball, '-C', stage, root)
+        raise BuildError, "tar failed to build #{tarball}:\n#{out}" unless status.success?
+      end
+      Digest::SHA256.file(tarball).hexdigest
+    end
+
     def split_version
       parts = @version.split('-', 2)
       parts << '1' if parts.size == 1
@@ -210,6 +288,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 +298,55 @@ module Crosspack
         version: @version,
         manufacturer: @pkg.maintainer,
         summary: @pkg.summary,
+        license: @pkg.license,
         files: files,
+        shortcuts: windows_shortcuts,
+        icon: windows_arp_icon,
         arch: @target.package_arch(:winget),
         output: output
       )
     end
 
+    # The ARP icon must be an .ico (the MSI Icons table does not take a
+    # png). The manifest icon is used when it is one; otherwise a sibling
+    # .ico with the same basename (appicon.png -> appicon.ico) is picked up
+    # when the build produces it. A png-only project gets no ARP icon — the
+    # exe icon still shows in Start Menu shortcuts.
+    def windows_arp_icon
+      return nil unless @pkg.icon
+
+      src = File.expand_path(@pkg.icon, @root)
+      return src if File.file?(src) && File.extname(src).casecmp('.ico').zero?
+
+      sibling = File.join(File.dirname(src), "#{File.basename(src, '.*')}.ico")
+      File.file?(sibling) ? sibling : nil
+    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),
+        min_macos: @pkg.min_macos,
         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.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crosspack
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Oleg Orlov
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Painless packaging for any platform
 test_files: []