scripts: ability to diff with multiple versions

Useful for releases with non-material changes.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

6 files changed, 35 insertions, 6 deletions

diff --git a/DIFFVERSION b/DIFFVERSION
new file mode 100644
index 0000000..9aa2cca
--- /dev/null
+++ b/DIFFVERSION
@@ -0,0 +1 @@
+v1.1-csprd01
diff --git a/makediff.sh b/makediff.sh
index 4d48519..ef538c5 100755
--- a/makediff.sh
+++ b/makediff.sh
@@ -2,6 +2,7 @@
 #this way they don't appear in the diff
 export SPECDOC=${SPECDOC:-`cat REVISION`}
 export DATESTR=${DATESTR:-`cat REVISION-DATE`}
+export FROMVERSION=${FROMVERSION:-`cat DIFFVERSION`}
 
 #make pdf diff using latexpand and latexdiff-fast
 #preamble in diffpreamble.tex
@@ -9,7 +10,7 @@ export DATESTR=${DATESTR:-`cat REVISION-DATE`}
 MAIN=$1
 PATH=.:${PATH}
 cur="$PWD"
-oldrev=`git rev-list -1 tags/v1.0-cs04`
+oldrev=`git rev-list -1 tags/${FROMVERSION}`
 newrev=`git rev-list -1 HEAD`
 rm -fr old new
 git clone $PWD old
diff --git a/makediffall.sh b/makediffall.sh
index 51a6ec6..caff23e 100755
--- a/makediffall.sh
+++ b/makediffall.sh
@@ -1,11 +1,12 @@
 export SPECDOC=${SPECDOC:-`cat REVISION`}
 export DATESTR=${DATESTR:-`cat REVISION-DATE`}
+export FROMVERSION=${FROMVERSION:-`cat DIFFVERSION`}
 ./makezip.sh
-./makehtml.sh
+mv -f $SPECDOC.zip $SPECDOC-diff-from-${FROMVERSION}.pdf
 ./makediffhtml.sh
-./makepdf.sh
 ./makediffpdf.sh
-zip $SPECDOC.zip $SPECDOC.pdf $SPECDOC-diff.html $SPECDOC-diff.css $SPECDOC-diff.pdf
+zip $SPECDOC-diff-from-${FROMVERSION}.zip \
+	$SPECDOC-diff-from-${FROMVERSION}.pdf
 echo Generated file $SPECDOC.zip
 echo To change output file name, set SPECDOC environment variable
 echo Examples:
diff --git a/makediffhtml.sh b/makediffhtml.sh
index f8f8783..4960624 100755
--- a/makediffhtml.sh
+++ b/makediffhtml.sh
@@ -3,7 +3,8 @@
 ./makediff.sh virtio-html.tex || exit 3
 
 SPECDOC=${SPECDOC:-`cat REVISION`}
-SPECDOC="${SPECDOC}-diff"
+FROMVERSION=${FROMVERSION:-`cat DIFFVERSION`}
+SPECDOC="${SPECDOC}-diff-from-${FROMVERSION}"
 
 ./make-setup-generated.sh "$SPECDOC"
 
diff --git a/makediffpdf.sh b/makediffpdf.sh
index b3031c4..1ec55f6 100755
--- a/makediffpdf.sh
+++ b/makediffpdf.sh
@@ -1,7 +1,8 @@
 #make pdf diff using latexpand and latexdiff-fast
 ./makediff.sh virtio.tex || exit 3
 SPECDOC=${SPECDOC:-`cat REVISION`}
-SPECDOC="${SPECDOC}-diff"
+FROMVERSION=${FROMVERSION:-`cat DIFFVERSION`}
+SPECDOC="${SPECDOC}-diff-from-${FROMVERSION}"
 rm $SPECDOC.aux $SPECDOC.pdf $SPECDOC.out
 xelatex --jobname $SPECDOC virtio-diff.tex
 xelatex --jobname $SPECDOC virtio-diff.tex
diff --git a/makediffwithbase.sh b/makediffwithbase.sh
new file mode 100755
index 0000000..8cd3c7a
--- /dev/null
+++ b/makediffwithbase.sh
@@ -0,0 +1,24 @@
+export SPECDOC=${SPECDOC:-`cat REVISION`}
+export DATESTR=${DATESTR:-`cat REVISION-DATE`}
+./makezip.sh
+./makehtml.sh
+./makepdf.sh
+zip $SPECDOC.zip $SPECDOC.pdf
+for version in v1.0-cs04 v1.1-csprd01; do
+	export FROMVERSION="${version}"
+	mv -f $SPECDOC.zip $SPECDOC-diff-from-${FROMVERSION}.zip
+	./makediffhtml.sh
+	./makediffpdf.sh
+	zip $SPECDOC-diff-from-${FROMVERSION}.zip $SPECDOC-diff-from-${FROMVERSION}.pdf
+	mv -f $SPECDOC-diff-from-${FROMVERSION}.zip ${SPECDOC}.zip
+done
+mv -f $SPECDOC.zip ${SPECDOC}-diffs.zip
+echo Generated file $SPECDOC-diffs.zip
+echo To change output file name, set SPECDOC environment variable
+echo Examples:
+echo     SPECDOC=virtio-v1.0-wd01 $0
+echo     SPECDOC=virtio-v1.0-csd01 $0
+echo     SPECDOC=virtio-v1.0-csprd01 $0
+echo     SPECDOC=virtio-v1.0-cs01 $0
+echo     SPECDOC=virtio-v1.0-os $0
+