litbuild 1.0.11 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 450a93fb7a60735ed6618b58aff828dd2c6a8846b7664e7916df70ca319f1f4c
-  data.tar.gz: 0f7523cd36707b6748f868b6229d69413874503282511929891e1d4ea344d8df
+  metadata.gz: 3f420862b3a3dd758ef05aed2b717defe89a48a34944b25b3af4042a0d47a749
+  data.tar.gz: bfb4c6364c57b9b9220d0bd43113f4a8b2ff0639b106b675a9e8af3c85982eab
 SHA512:
-  metadata.gz: '08ee5269104135777fb2dd06c225b03854b8b38c61723c0652b98aebc1fef19cad4ded3267249312e8821de764fab8360189216bf50e6b039f442a48cc9ed169'
-  data.tar.gz: 4626ce942e4afd88bca32d3613488bd2ac509107c90f467ae0deb3f14c0086ff6fd401647a9173ab5906284a042422802c0dc0fb067e80645217cf70e98e4686
+  metadata.gz: 22838c4497fdb70a5140507dcc0a10f511f9751bd36197ec3dc88a8c5e7bc6fda27b8678bd34f46ea7d21b9f06c944e52b3bcd7ffee00713d9aa34a56d168387
+  data.tar.gz: 01f7b1eab7fe96e96fbd04dd446743259786bb54a8556f379627c13153c0e917ea6af368fdc4bb3c4f201666f32d78380a9c416ee238e3e39a4c07305b200edd

data/lib/litbuild/bash_script_visitor.rb

@@ -167,9 +167,14 @@ module Litbuild
       script.string
     end
 
+    # Timestamps are written with default format plus
+    # seconds-since-epoch (in parentheses), to make it as easy as
+    # possible to calculate how long things take.
+    DATECMD = "date '+%a %b %e %H:%M:%S %Z %Y (%s)'"
+
     def write_components(location:, script:)
       @written[location].map do |target|
-        script.puts("echo \"At $(date): Beginning #{target}:\"")
+        script.puts("echo \"At $(#{DATECMD}): Beginning #{target}:\"")
         script.puts("./#{target}")
       end
     end
@@ -339,7 +344,7 @@ module Litbuild
       render_restart_header(script, restart_file, package.version, pkgusr_dir)
       pkgusr_srcdir = File.join(pkgusr_dir, package.name_and_version)
       render_add_package_user(package, script, log)
-      @scm.copy_source_files_commands(package).each do |cp_command|
+      @scm.copy_files_commands(package).each do |cp_command|
         render_command(script, cp_command, log)
       end
       script.puts("export LB_SOURCE_DIR=#{quote(pkgusr_srcdir)}")
@@ -505,6 +510,7 @@ module Litbuild
     def render_service_pipeline(script, spipe)
       pname = spipe['name'].first
       spipe['bundle']&.each do |bundle|
+        script.puts("mkdir -p #{bundle}")
         script.puts("grep -q '^#{pname}$' #{bundle}/contents || " \
                     "echo #{pname} >> #{bundle}/contents")
       end

data/lib/litbuild/package.rb

@@ -131,11 +131,16 @@ module Litbuild
         end
 
         # otherwise, the default version goes right *before* the *first
-        # directive of the next stage* (which will always be present).
+        # directive of the next stage* (which *should* always be present)...
         next_stage = STAGE_DIRECTIVES[STAGE_DIRECTIVES.index(stg) + 1]
         first_idx = grafs.index do |graf|
           graf.respond_to?(:key) && graf.key?(next_stage)
         end
+
+        # ...but if, for whatever reason, we haven't found a place to
+        # put the default directives, just put them at the beginning.
+        first_idx ||= 0
+
         grafs.insert(first_idx, stg => to_add[stg])
       end
     end

data/lib/litbuild/source_code_manager.rb

@@ -13,7 +13,8 @@ module Litbuild
   #
   # Note, SourceCodeManager does not recurse into additional levels of
   # subdirectories -- it turns out that makes the test suite really
-  # slow.
+  # slow, and recursive search is not useful to me, so I'm just
+  # skipping it.
   class SourceCodeManager
     def initialize(*dirs)
       all_pkgfiles = dirs.map do |d|
@@ -55,13 +56,39 @@ module Litbuild
     end
 
     ##
-    # Package Users expect to have tarfiles for the top-level package
-    # and any in-tree packages in their `src` directory, and patches in
-    # their `patches` directory. This produces commands that copy needed
-    # files from the TARFILE_DIR and PATCH_DIR to those directories, if
-    # not already present there.
-    def copy_source_files_commands(package)
+    # Typically, Package Users expect to have tarfiles for the top-level
+    # package and any in-tree packages in their `src` directory, and
+    # patches in their `patches` directory. This method arranges things
+    # that way: it produces commands that copy all the necessary files
+    # from TARFILE_DIR and/or PATCH_DIR to the destination directory,
+    # skipping any that are already present where the Package Users
+    # build script expects to find them.
+    #
+    # Binary package files are an exception to the typical case. A
+    # binary package file has name `binary-#{packagename}.tar.lz` (no
+    # version number, and always lzip-compressed), and contains the
+    # files produced by the compilation and installation process. If
+    # such a file is present in the Package User home directory, the
+    # build script simply unpacks it and does nothing else.
+    #
+    # So: if a binary package file is present in the tarfile directory,
+    # this method simply emits a command to copy it to the Package User
+    # home directory; and if there is already a binary package file
+    # present in the Package User home directory, this method does
+    # nothing.
+    def copy_files_commands(package)
       pkgusr = pkgusr_name(package)
+
+      # copy binary file if available, then return
+      binfile = "binary-#{package.name}.tar.lz"
+      return ["cp #{find_file(binfile)} ~#{pkgusr}"] \
+        if @available_files.detect { |f| /#{binfile}/ =~ f }
+
+      # do nothing if binary file is present in home dir already
+      return [] if homedir(package) && File.exist?(
+        File.join(homedir(package), binfile)
+      )
+
       mkdir_commands = %w[src patches].map do |dir|
         "mkdir -p ~#{pkgusr}/#{dir}"
       end

data/lib/litbuild/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Litbuild
-  VERSION = '1.0.11'
+  VERSION = '1.0.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: litbuild
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.14
 platform: ruby
 authors:
 - Brett Neumeier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-02-19 00:00:00.000000000 Z
 dependencies: []
 description: A build system based on Knuth's idea of literate programming.
 email:
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: A literate build system