From 4383e4223aab80aa9ef05572e0446ac43e3f1338 Mon Sep 17 00:00:00 2001
From: Sven Verdoolaege <skimo@kotnet.org>
Date: Sun, 18 Nov 2007 16:55:13 +0100
Subject: [PATCH] dist: update distrib and export to switch to git repo

---
 dist/distrib |  7 ++++---
 dist/export  | 22 ++++++----------------
 2 files changed, 10 insertions(+), 19 deletions(-)
 mode change 100644 => 100755 dist/distrib
 mode change 100644 => 100755 dist/export

diff --git a/dist/distrib b/dist/distrib
old mode 100644
new mode 100755
index b7086005..953eceb8
--- a/dist/distrib
+++ b/dist/distrib
@@ -12,12 +12,12 @@ aclocal -I m4
 echo "Running autoheader"
 autoheader 2>&1 | sed '/warning: AC_TRY_RUN called without default/d'
 chmod 444 config.h.in
+echo "Running automake"
+automake -a -c --foreign $@
 rm -f configure
 echo "Running autoconf"
 autoconf 2>&1 | sed '/warning: AC_TRY_RUN called without default/d'
 chmod 555 configure config.guess config.sub install-sh
-echo "Running automake"
-automake -a -c --foreign $@
 
 msg="/* Do not edit: automatically built by build/distrib. */"
 # Build automatically generated header files.
@@ -81,7 +81,8 @@ ctags $ctagsopt -w \
 	../tcl_api/*.[ch] ../vi/*.[ch]
 chmod 444 $f
 
+date=`date +%Y-%m-%d`
 echo "Building ../ex/version.h"
-echo '#define VI_VERSION "'`git-describe`'"' > ../ex/version.h
+echo '#define VI_VERSION "'`git-describe` '('$date')"' > ../ex/version.h
 
 touch stamp-h.in
diff --git a/dist/export b/dist/export
old mode 100644
new mode 100755
index d70e1691..c0fe056e
--- a/dist/export
+++ b/dist/export
@@ -1,17 +1,10 @@
 #!/bin/sh
-revision=${@:-now}
-cvsrev=`echo $revision | sed -e 's/-//;s/\./-/g'`
-option="-r $cvsrev"
-dir=$revision
-version=`echo $revision | sed -e 's/nvi-//'`
+revision=${@:-HEAD}
+gitrev=`git describe $revision`
+dir=$gitrev
+version=`echo $gitrev | sed -e 's/nvi-//'`
 date=`date +%Y-%m-%d`
-if test "$revision" = now; then 
-	dir=vi-current; 
-	option="-D now"
-	version=current;
-fi
-
-cvs export $option -d $dir vi
+(cd .. && git archive --format=tar --prefix=$dir/ $revision) | tar x $dir
 (cd $dir/dist
     sh distrib --ignore-deps
     rm export
@@ -29,8 +22,5 @@ cvs export $option -d $dir vi
     perl -pi -e "s/version 1.80/version $version/" README
     perl -pi -e "s(%H%)($date)" README
 )
-(cd $dir/ex
-    perl -pi -e "s/\\\$Revision: 8.5 $/$version/" version.h
-    perl -pi -e "s(%H%)($date)" version.h
-)
 tar czf $dir.tar.gz $dir
+tar cjf $dir.tar.bz2 $dir
-- 
2.11.4.GIT