Import Dev86src-0.16.8.tar.gzv0.16.8

1 files changed, 63 insertions, 14 deletions

diff --git a/Mk_dist b/Mk_dist
index a72b9c9..86218e8 100644
--- a/Mk_dist
+++ b/Mk_dist
@@ -1,4 +1,4 @@
-#!/bin/sh -
+#!/bin/bash -
 #
 # This script builds _and checks_ all the distribution files from my source
 # directory. It's very selective because I've got a lot of historical and
@@ -68,15 +68,46 @@ mkdir ${TMPDIST}/doselks
 
 rm -f /tmp/bootblocks.tar.gz /tmp/doselks.tar.gz /tmp/libc-8086-$VERSION.tar.gz
 
-echo Extracting previous version
-rm -f $ARCDIR/Dev86src-$VERSION.tar.gz
+MINOR=${VERSION##*.}
+MAJOR=${VERSION%.*}
+MID=${MAJOR##*.}
+MAJOR=${MAJOR%.*}
+OLDVER=
+
+case "$VERSION" in
+0.0.0 )  BASEVER=0.0.0.0 ;;	# Naa.
+*.0.0 )  BASEVER=$((MAJOR-1)).$MID.$MINOR ;;
+*.*.0 )  BASEVER=$MAJOR.$((MID-1)).$MINOR ;;
+* )      BASEVER=$MAJOR.$MID.$((MINOR-1))
+         OLDVER=$MAJOR.$MID.0
+         ;;
+esac
+if [ "$MAJOR.$MID.$((MINOR-1))" != "$BASEVER" ]
+then PATCHNAME="$VERSION-$BASEVER"
+else PATCHNAME="$VERSION"
+fi
+
+[ -f $ARCDIR/Dev86src-$BASEVER.tar.gz ] && {
+   echo "Extracting previous version ($BASEVER)"
+
+   mkdir ${TMPDIST}.tmp
+   ( cd ${TMPDIST}.tmp
+     tar xzf $ARCDIR/Dev86src-$BASEVER.tar.gz
+     mv * ${TMPDIST}.old
+   )
+   rmdir ${TMPDIST}.tmp
+}
 
-mkdir ${TMPDIST}.tmp
-( cd ${TMPDIST}.tmp
-  tar xzf `ls -tr $ARCDIR/Dev86src*.0.tar.gz | tail -1`
-  mv * ${TMPDIST}.old
-)
-rmdir ${TMPDIST}.tmp
+[ "$OLDVER" != "" -a -f $ARCDIR/Dev86src-$OLDVER.tar.gz ] && {
+   echo "Extracting previous version ($OLDVER)"
+
+   mkdir ${TMPDIST}.tmp
+   ( cd ${TMPDIST}.tmp
+     tar xzf $ARCDIR/Dev86src-$OLDVER.tar.gz
+     mv * ${TMPDIST}.vold
+   )
+   rmdir ${TMPDIST}.tmp
+}
 
 # ARCDIR=${TMPDIR}/arc ; mkdir -p ${ARCDIR}
 cd ${TMPDIST}
@@ -101,21 +132,39 @@ cd ${TMPDIST}
   rm -f $EXCL
   rm -f `find . -type l`
 
-echo Generating patch against previous .0 version.
-
 cd ${TMPDIR}
 
+[ -d ${TMPSRC}.old ] && {
+echo "Generating patch against version $BASEVER."
+
 mv ${TMPSRC}.old/bootblocks boot.old
 mv ${TMPSRC}/bootblocks boot
 
-diff -Nurd ${TMPSRC}.old ${TMPSRC} > ${ARCDIR}/Dev86src-$VERSION.patch
+diff -Nurd ${TMPSRC}.old ${TMPSRC} > ${ARCDIR}/patch-$PATCHNAME
 
 mv boot.old ${TMPSRC}.old/bootblocks
 mv boot ${TMPSRC}/bootblocks
 
-diff -Nurd ${TMPSRC}.old/bootblocks ${TMPSRC}/bootblocks >> ${ARCDIR}/Dev86src-$VERSION.patch
+diff -Nurd ${TMPSRC}.old/bootblocks ${TMPSRC}/bootblocks >> ${ARCDIR}/patch-$PATCHNAME
+
+gzip -f9 ${ARCDIR}/patch-$PATCHNAME
+}
+
+[ -d ${TMPSRC}.vold ] && {
+echo "Generating patch against version $OLDVER."
+
+mv ${TMPSRC}.vold/bootblocks boot.old
+mv ${TMPSRC}/bootblocks boot
+
+diff -Nurd ${TMPSRC}.vold ${TMPSRC} > ${ARCDIR}/patch-$VERSION-$OLDVER
+
+mv boot.old ${TMPSRC}.vold/bootblocks
+mv boot ${TMPSRC}/bootblocks
+
+diff -Nurd ${TMPSRC}.vold/bootblocks ${TMPSRC}/bootblocks >> ${ARCDIR}/patch-$VERSION-$OLDVER
 
-gzip -f9 ${ARCDIR}/Dev86src-$VERSION.patch
+gzip -f9 ${ARCDIR}/patch-$VERSION-$OLDVER
+}
 
 echo Creating full source archive.
 ln -s ${TMPSRC} dev86-$VERSION