litbuild 1.0.19 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fdf64e3774cac3d1e67cd815c79d78e048bdc76fd4ea95ea83225f28bbe1779
-  data.tar.gz: a4e2e13fdebdbb7d7c069a93b10b255c511dae2f2818a81c3aaf9067a6404594
+  metadata.gz: 22c6c387b304ec0c1abb563a8cb3f5a8812a52433c82a2cc9c4322e202b6ea65
+  data.tar.gz: e590d33d71e4c70a7a4411f67b11d17fb46f8c4846b6c1ac4fdae91dfc9205e5
 SHA512:
-  metadata.gz: 7f5e42e9df787b906f49770dac68b7de9f43b4fc18f9d75e3bd275a8a1efc7b4edf037d492220ea6557885be95ee66e3edc923cbe38ebc4f949754883b5e2465
-  data.tar.gz: 6107bb2f698c7644d96241b45d570d82bf66897e40148055cc1af4330578a8e00d2f7f75230f03a3846861c8c9cf688198e89dd9d8c84a1050bd66a73309e7aa
+  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)
 

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.19'
+  VERSION = '1.0.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: litbuild
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.21
 platform: ruby
 authors:
 - Brett Neumeier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-03 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:
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.17
 signing_key: 
 specification_version: 4
 summary: A literate build system