X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=commitid.scad.pl;h=ebdbe917a39a6cb73db24da322d83a22e85af045;hp=422926e4f82cc832ce8ca913fe80e578e237fff8;hb=bf19d2a95b043beeab235234d8f2aaebf774c370;hpb=16fd2d6dd11867cfb1ccf1f8fcc86a3e1e9db2bb diff --git a/commitid.scad.pl b/commitid.scad.pl index 422926e..ebdbe91 100755 --- a/commitid.scad.pl +++ b/commitid.scad.pl @@ -4,7 +4,29 @@ use strict; $SIG{__WARN__} = sub { die @_; }; # xxx much of the comment below is TODO - +# +# Usage: +# +# .../commitid.scad.pl [OPTION...] [STRING...] >commitid.scad.new \ +# && mv -f commitid.scad.new commitid.scad +# +# Options: +# +# --git generate git commit indications, as shown below +# (this is the default if no strings are requested with -t) +# +# --git=object +# generate git commit indication based on commit object only +# (ie avoid counting commits) +# +# -i do not generate `+' if git-untracked files are present +# +# [-t[FORM]] TEXT +# generate a form FORM containing TEXT +# TEXT can contain newlines (final newline usually undesirable) +# if FORM not specified, generates Arg0 Arg1 Arg2 in sequence +# character set is SPC 0-9 a-f + * +# # We generate a physical indication of which commit was used. # # We provide for scaling factors with dynamic variables: @@ -30,40 +52,73 @@ $SIG{__WARN__} = sub { die @_; }; # # We can generate these forms: # -# Tiny3: -# Tiny4: -# Tiny5: -# Tiny6: -# Tiny7: -# Tiny8: +# In each case: +# if tree is dirty, * is suffixed or prefixed to count or commitid +# if tree has untracked files, + is added +# (where it is added depends on the Form; in any case it does not +# change the size, but steals space from digits) +# +# Small3: +# Small4: +# Small5: +# Small6: +# Small7: +# Small8: +# Small9: +# Small10: # git rev-list --first-parent --count HEAD # typically 3-4 characters but we allow for up to 6 # padded with zeroes; if too long we reduce mod 10^n -# eg -# Tiny4 1070 -# -# Tiny4Q: -# Tiny6Q: -# Tiny9Q: -# same but in two lines eg -# Tiny4Q 10 -# 70 -# -# Git4 Git4Q -# Git6 Git6Q -# Git8 Git8Q +# eg if the count is 123456 +# Small5 3456* +# Small8 __123456 (where _ are spaces) +# +# Small4S: +# Small6S: Small6T: +# Small8S: Small9T: +# Small10S: +# same but split into two lines (S) or three lines (T) eg +# Small4S 45 Small6T _3 +# 6* 45 +# 6* +# +# Git4 Git4S +# Git6 Git6S Git6T +# Git8 Git8S +# Git9 Git9T +# Git10 Git10S # git-rev-parse HEAD (prefix of requested length) -# eg -# Git6 82f2a2 +# eg if the commitid is abcdef0123... +# Git5 abcd* -# Small4 -# Small6 -# Small8 +# Full3 +# Full4 +# Full5 +# Full6 +# Full7 +# Full8 +# Full9 +# Full10 # git-rev-list --first-parent --count HEAD # git-rev-parse HEAD # eg -# Small6 1070 -# 82f2a2 +# Full6 abcdef Full8 abcdef01 +# 23456* _123456* +# +# Full6T +# Full9T +# Full12T +# Full15T +# as Full but commit is split over two lines +# for a 3-line message; eg +# Full9T abc +# de* +# 456 +# +# FontDemo +# +# Arg0, Arg1, ... +# Strings passed on command line sub p { print @_ or die $!; } @@ -85,6 +140,15 @@ sub chrmodname ($) { return "Commitid__chr_$chrx"; } +our $gtm_demo_i = -1; +our $gtm_demo_j; +our @gtm_demo_o; + +sub gentextmodule_demo_start_batch ($;$) { + ($gtm_demo_i, $gtm_demo_j) = @_; + $gtm_demo_j //= 0; +} + sub gentextmodule ($@) { my ($form, @lines) = @_; my $modb = "Commitid_$form"; @@ -97,9 +161,9 @@ sub gentextmodule ($@) { $y--; my $x = 0; foreach my $chr (split //, $line) { - next if $chr !~ m/\S/; p sprintf " translate([%d * 0.8, %d * 1.2]) %s();\n", - $x, $y, chrmodname $chr; + $x, $y, chrmodname $chr + if $chr =~ m/\S/; $x++; } $cols = $x if $x > $cols; @@ -110,8 +174,20 @@ sub gentextmodule ($@) { p " d=Commitid_depth();\n"; p " translate([0,0,-d]) linear_extrude(height=d*2) ${modb}_2D();\n"; p "}\n"; + p sprintf "function %s_sz() = Commitid__scale() * 0.1 * [ %d, %d ];\n", $modb, 2 * ($cols * 4 - 1), 2 * (@lines * 6 - 1); + + push @gtm_demo_o, < $sz + ? substr($whole, $lw-$sz) + : sprintf "%${sz}s", $whole; +} + +sub ljustt ($$$) { # always includes $suffix + my ($sz, $whole, $suffix) = @_; + $sz -= length $suffix; + return sprintf "%-${sz}.${sz}s%s", $whole, $suffix; +} + +sub gentextmodule_q ($$$) { + my ($form, $s, $lines) = @_; + $gtm_demo_j++; + my $l = length $s; + return if $l % $lines; + my $e = $l/$lines; + return if $e < 2; + $gtm_demo_j--; + gentextmodule($form, $s =~ m/.{$e}/g); +} + +sub gentextmodule_plusq ($$) { + my ($form, $s) = @_; + gentextmodule($form, $s); + gentextmodule_q("${form}S", $s, 2); + gentextmodule_q("${form}T", $s, 3); +} + +our @gcmd; + +sub gitrun_start () { + open F, "-|", @gcmd or die "$gcmd[0]: start: $!"; +} + +sub gitrun_done (;$) { + my ($errok) = @_; + $?=0; $!=0; + return if close F; + return if $errok; + die $! if $!; + die "@gcmd failed ($?)\n"; +} + +sub gitoutput (@) { + (@gcmd) = (qw(git), @_); + gitrun_start; + $_ = ; + gitrun_done; + defined or die "@gcmd produced no output"; + chomp or die "@gcmd produced no final newline"; + $_; +} + +sub do_git () { + return unless $do_git; + + @gcmd = qw(git status --porcelain); + push @gcmd, qw(--untracked=no) unless $do_git_untracked; + + my $git_dirty = ''; + gitrun_start; + while () { + if (m/^\?\?/ && $do_git_untracked) { + $git_dirty = '+'; + next; + } + $git_dirty = '*'; + last; + } + gitrun_done($git_dirty eq '*'); + + my $git_count; + my $git_object; + + if ($do_git =~ m/c/) { + $git_count = gitoutput qw(rev-list --first-parent --count HEAD); + } + if ($do_git =~ m/o/) { + $git_object = gitoutput qw(rev-parse HEAD); + } + + foreach my $sz (3..10) { + gentextmodule_demo_start_batch($sz-3); + + gentextmodule_plusq("Small$sz", rjustt($sz, $git_count.$git_dirty)) + if defined $git_count; + + gentextmodule_plusq("Git$sz", ljustt($sz, $git_object, $git_dirty)) + if defined $git_object; + + if (defined $git_count && defined $git_object) { + gentextmodule("Full$sz", + ljustt($sz, $git_object, ''), + rjustt($sz, $git_count.$git_dirty)); + + if (!($sz % 2)) { + my $e = $sz/2; + gentextmodule("Full".($e*3)."T", + ljustt($e*2, $git_object, $git_dirty) + =~ m/.{$e}/g, + rjustt($e, $git_count)); + } + } + } +} + +while (@ARGV) { + $_ = shift; + if (m/^--(no)?-git$/) { + $do_git = $1 ? '' : 'co'; + } elsif (m/^---git=object$/) { + $do_git = 'o'; + } elsif (m/^-i$/) { + $do_git_untracked = 0; + } elsif (m/^-t(.*)$/) { + my $form = $1; + die "bad usage: -t needs string argument\n"; + $_ = shift; + gentextmodule($form, split /\n/, $_); + $argcounter //= 0; + } elsif (m/^[^-]/) { + gentextmodule("Arg$argcounter", $_); + $argcounter++; + } else { + die "bad usage: unknown option \`$_'\n"; + } +} + +$do_git //= defined($argcounter) ? '' : 'co'; + +gentextmodule_demo_start_batch(-1); gentextmodule('FontDemo', @demo); +do_git(); + +p "module Commitid_2DDemo(){\n"; +p " st = Commitid__scale() * [ 10, 5 ];\n"; +p " e = Commitid_pixelsz();\n"; +p $_ foreach @gtm_demo_o; +p "}\n"; + +flush STDOUT or die $!; +close STDOUT or die $!; + __DATA__ # 00 20 22 02 @@ -216,3 +442,10 @@ a b c d e f # # # # # # # #/ # \## ##/ \## \## \#/ # ++ * + + # # + # \#/ +### ### + # /#\ + # #