contrib fig

diff --git a/.gitignore b/.gitignore
index 6a07ca6c821707f4d81e0e4fb60414aecbd9ab22..dba5bbfcc20a259ecac3aeb7f365ac95ca5e8d3d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ jobs-branches.fig
 jobs-branches.fig.*.[0-9]
 blessings.fig
 hostflags.txt
+contrib-names.txt
+contrib-slide.fig

diff --git a/Makefile b/Makefile
index 29e352a6f3e69a95a9211bd06ce7eb6985a7591a..4aebed67d77e3d0b52e1a4028ada5ca7fb00e108 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 SLIDES=title listscreenshot bisection jobs-branches readme-excerpt blessings
+SLIDES+=contrib-slide
 SLIDEFILES=$(addsuffix .ps, $(SLIDES))
 
 o= >$@.new && mv -f $@.new $@
@@ -6,7 +7,9 @@ o= >$@.new && mv -f $@.new $@
 all:   slides.pdf talk.ps
 
 %.ps:  %.fig
-       fig2dev -L ps -l dummy -z A4 <$< $o
+       iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
+       # wtf!
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 <$@.1 $o
 
 talk.ps: talk.txt
        a2ps -1 -o $@ -B talk.txt
@@ -20,6 +23,11 @@ reports.ps: listscreenshot.ps bisection.ps Makefile
        psnup -pa4 -2 <$@.2 $o
 #      pstops -w297 -h210 '2:0+1(297mm,0)' <$@.2 $o
 
+contrib.ps: %.ps: %.runes Makefile
+       gnuplot $< $<
+
+contrib.ps: contrib.gnuplot
+
 slides.ps: $(SLIDEFILES) Makefile
        cat $(SLIDEFILES) $o
 
@@ -31,11 +39,18 @@ datascript-run gitminescript-run: %-run: %
 
 jobsbreak=40
 
-blessings.fig: blessings.fig.in hostflags.txt fig-filler-in Makefile 
+blessings.fig jobs-branches.fig contrib-slide.fig: fig-filler-in Makefile 
+
+blessings.fig: blessings.fig.in hostflags.txt
        ./fig-filler-in <$< L hostflags.txt $o
 
-jobs-branches.fig: fig-filler-in Makefile
+contrib-slide.fig: contrib-slide.fig.in contrib-names.txt
+       ./fig-filler-in <$< L contrib-names.txt $o
+
+contrib-slide.ps: contrib.ps
+
 jobs-branches.fig: jobs-branches.fig.in list-branches.data list-jobs.data
        sed -n '1,$(jobsbreak)p' list-jobs.data >$@.j.0
        sed -e '1,$(jobsbreak)d' list-jobs.data >$@.j.1
        ./fig-filler-in <$< BRANCH list-branches.data JOB0 $@.j.0 JOB1 $@.j.1 $o
+

diff --git a/contrib-slide.fig.in b/contrib-slide.fig.in
new file mode 100644 (file)
index 0000000..9309ef1
--- /dev/null
+++ b/contrib-slide.fig.in
@@ -0,0 +1,17 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+0 32 #484848
+2 2 0 1 7 7 50 -1 -1 0.000 0 0 7 0 0 5
+        12600 9540 12330 9540 12330 9810 12600 9810 12600 9540
+2 5 0 1 32 -1 50 -1 -1 0.000 0 0 -1 0 0 5
+       0 contrib.ps
+        270 360 13125 360 13125 9359 270 9359 270 360
+4 0 0 40 -1 14 16 0.0000 4 180 495 1890 1305 %L0\001
+4 0 0 40 -1 14 16 0.0000 4 180 495 1890 1530 %L1\001

diff --git a/contrib.runes b/contrib.runes
index c89440d21be6a06eeda100d39f770950527d1974..556058fab66e643df881b1538e5892c5509b46af 100644 (file)
--- a/contrib.runes
+++ b/contrib.runes
@@ -1,4 +1,8 @@
+set terminal epscairo size 5.0, 3.5
+set output 'contrib.ps'
+
 set xrange ["1311264120":"1405958544"]
+set yrange [0:800]
 set xdata time
 set timefmt "%s"
 set style fill solid 0.5

diff --git a/fig-filler-in b/fig-filler-in
index d1949fb34ef473ea574f945c2ca123b990c488b6..fb7b9b81e9704dd6c6addb8df0baae5257adc2f3 100755 (executable)
--- a/fig-filler-in
+++ b/fig-filler-in
@@ -47,8 +47,6 @@ while (@ARGV) {
         my $rtmpl = $tmpl;
         foreach my $entry (@{ $tmpl{$key}[2] }) {
             next unless m/$entry->{Regexp}/;
-use Data::Dumper;
-print STDERR "matched $_:",Dumper($entry);
             $rtmpl = $entry;
             last;
         }

diff --git a/git-contrib-graph b/git-contrib-graph
index 414a80d782ab6a8b9dcbb55a38fea7f28caf3a7a..2e97be764ff9adba635d29dc572843477ca8b7ed 100755 (executable)
--- a/git-contrib-graph
+++ b/git-contrib-graph
@@ -1,6 +1,5 @@
 #!/bin/sh
 set -e
-: ${OSSTEST_GIT:=$HOME/work/testing.git/.git}
 
 git --git-dir=$OSSTEST_GIT ls-files |
 egrep -v 'AGPLv3|COPYING' |

diff --git a/gitminescript b/gitminescript
new file mode 100755 (executable)
index 0000000..6bf6c02
--- /dev/null
+++ b/gitminescript
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+: ${OSSTEST_GIT:=$HOME/work/testing.git/.git}
+export OSSTEST_GIT
+
+./git-contrib-graph >contrib.gnuplot
+./make-log >contrib-names.txt

diff --git a/talk.txt b/talk.txt
index 5c716cbba69ae03592c0918d6a0b3129bfe34e8e..9fe69a5c7ee841306ed6d2b9021d6e13555e80dc 100644 (file)
--- a/talk.txt
+++ b/talk.txt
@@ -75,7 +75,7 @@ alternatives such as XenRT, so if we want to consider moving away from
 osstest, this new facility will give us the ability to evaluate
 the alternatives and plan a transition.
 
-[contributor list and commit histogram]
+[7 contributor list and commit histogram]
 
 osstest was originally written by Ian Jackson, starting in November
 2009.  Ian is still the lead maintainer.