litbuild 1.0.16 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8e6cf1338409a6f92412c572ddca22dfea69dec035c023ec029aa73b56f833f
-  data.tar.gz: 9fe0eb1366a7404cfe258081c3ef4f3f96e5214cba7f6d428dceac520d35da0f
+  metadata.gz: 22c6c387b304ec0c1abb563a8cb3f5a8812a52433c82a2cc9c4322e202b6ea65
+  data.tar.gz: e590d33d71e4c70a7a4411f67b11d17fb46f8c4846b6c1ac4fdae91dfc9205e5
 SHA512:
-  metadata.gz: 6f79a4716874345084ec1ac7fe7c41049cd09db46d46e7349125767a9598b7a079314dac3630fcc221c0365a0a6bdb033bede9a1c41ce772b5740e01c15b3a53
-  data.tar.gz: e4db23446ce1334ec23ad2e1b566195ca0eb3515cbf7876089498f144af5e9e92302b87ec8ad9c6495c61935d4dfc90b5803acb979b603cddbbefcc8890e4054
+  metadata.gz: 3fd317ab3c29b1b37ddac395ba27ab95d304c4b052c80bebab9250acb60b11946e51f432fdc39c761a392a0d96714a21981c5adfbd726c0654d30b520ad33eb5
+  data.tar.gz: 37e5f89cce214d9a2fcd4ce4ce44b00aa44d5da9cfc6ce564f7a142c9b2c8bdde1eeeb822b2e125e3a3b450bb78db61017f9eaa94b400baa0668699be29dba8a

data/lib/litbuild/bash_script_visitor.rb

@@ -103,21 +103,63 @@ module Litbuild
 
       script_name = File.join(script_dir, "#{target}.sh")
       File.open(script_name, 'w') do |f|
-        f.puts("#!#{find_bash}/bash")
-        skip_line(f)
-        f.puts("trap 'echo UTTER FAILURE on line $LINENO' ERR")
-        f.puts('set -e -v')
-        f.puts('cd $(dirname $0)')
-        skip_line(f)
+        write_toplevel_intro(f)
         write_components(location: script_dir, script: f)
-        f.puts('set +v')
-        f.puts('echo TOTAL SUCCESS')
+        write_toplevel_outro(f, target)
       end
       FileUtils.chmod('ugo+x', script_name)
     end
 
     private
 
+    def write_toplevel_intro(file)
+      file.puts("#!#{find_bash}/bash")
+      skip_line(file)
+      file.puts("trap 'echo UTTER FAILURE on line $LINENO' ERR")
+      file.puts('set -e -v')
+      file.puts('cd $(dirname $0)')
+      skip_line(file)
+      file.puts('if [ -n "$LITBUILDDBDIR" ]')
+      file.puts('then')
+      file.puts('  if [ -d "${LITBUILDDBDIR}" -a -w "${LITBUILDDBDIR}" ]')
+      file.puts('  then')
+      file.puts('    mkdir -p "${LITBUILDDBDIR}/BUILD-LOG"')
+      file.puts('  fi')
+      file.puts('fi')
+      skip_line(file)
+      file.puts("begin_time=$(date '+%a %b %e %H:%M:%S %Z %Y (%s)')")
+      file.puts('begin_seconds=$(date +%s)')
+      skip_line(file)
+    end
+
+    def write_toplevel_outro(file, target)
+      skip_line(file)
+      file.puts("complete_time=$(date '+%a %b %e %H:%M:%S %Z %Y (%s)')")
+      file.puts('complete_seconds=$(date +%s)')
+      file.puts('elapsed_time=$((complete_seconds - begin_seconds))')
+      skip_line(file)
+      bldir = '"${LITBUILDDBDIR}/BUILD-LOG"'
+      file.puts("if [ -d #{bldir} -a -w #{bldir} ]")
+      file.puts('then')
+      file.puts('  lbfile="${LITBUILDDBDIR}/BUILD-LOG/$(date +%s)"')
+      file.puts("  echo 'Blueprint: #{target}' > $lbfile")
+      file.puts('  echo "Started:   $begin_time" >> $lbfile')
+      file.puts('  echo "Completed: $complete_time" >> $lbfile')
+      file.puts('  echo "Elapsed:   $elapsed_time" >> $lbfile')
+      write_toplevel_parameters(file)
+      file.puts('fi')
+      skip_line(file)
+      file.puts('set +v')
+      file.puts('echo TOTAL SUCCESS')
+    end
+
+    def write_toplevel_parameters(file)
+      file.puts('  echo "Parameters:" >> $lbfile')
+      @parameters.keys.sort.each do |k|
+        file.puts("  echo '  #{k}: #{ENV[k]}' >> $lbfile") if ENV.key?(k)
+      end
+    end
+
     def write(blueprint:, location:, &block)
       return if @all_written_targets.include?(blueprint.target_name)
 
@@ -176,6 +218,7 @@ module Litbuild
       @written[location].map do |target|
         script.puts("echo \"At $(#{DATECMD}): Beginning #{target}:\"")
         script.puts("./#{target}")
+        script.puts("echo \"At $(#{DATECMD}): Completed #{target}:\"")
       end
     end
 
@@ -390,6 +433,8 @@ module Litbuild
       options.puts("cat > ~#{package.pkgusr_name}/options <<'LBEOF'")
       options.puts("export version=#{package.version}")
       options.puts("export LB_SOURCE_DIR=#{quote(srcdir)}")
+      phase = package.active_phase || 'default'
+      options.puts("export LB_PHASE=#{quote(phase)}")
       environment_commands(package).each { |cmd| options.puts(cmd) }
       package.build_dir && options.puts("export build_dir=#{package.build_dir}")
       render_intree_commands(package, options)
@@ -580,7 +625,7 @@ module Litbuild
       end
       render_command(script, 'cfggit stageall', log)
       bp = "#{blueprint.class.name.split('::').last} #{blueprint.name}"
-      cmd = "cfggit as-default -m 'Configuration files for #{bp}'"
+      cmd = "cfggit as-lb -m 'Configuration files for #{bp}'"
       render_command(script, cmd, log)
     end
 

data/lib/litbuild/source_code_manager.rb

@@ -51,7 +51,7 @@ module Litbuild
 
       package.patch_files.map do |patch_file|
         full_fn = find_file(patch_file)
-        "#{decompress_command(full_fn)} < #{full_fn} | patch -p1"
+        "#{decompress_command(full_fn)} < #{full_fn} | git apply"
       end
     end
 

data/lib/litbuild/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: litbuild
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.21
 platform: ruby
 authors:
 - Brett Neumeier
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-18 00:00:00.000000000 Z
+date: 2024-08-16 00:00:00.000000000 Z
 dependencies: []
 description: A build system based on Knuth's idea of literate programming.
 email:
@@ -45,10 +45,10 @@ files:
 - lib/litbuild/visitor.rb
 homepage: http://git.freesa.org/freesa/litbuild
 licenses:
-- GPL-3.0
+- GPL-3.0-only
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -63,8 +63,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.5.17
+signing_key: 
 specification_version: 4
 summary: A literate build system
 test_files: []