diff --git a/makefile b/makefile index a3a45fa..fb34507 100644 --- a/makefile +++ b/makefile @@ -4,9 +4,11 @@ # Uncomment One Of The Following For Early Releases -#EARLY = Alpha -#EARLY = Beta -#EARLY = RC1 +#EARLY = -Alpha +#EARLY = -Beta +#EARLY = -RC1 +VERSION = $(shell cat version)${EARLY} + ##### # Definitions Relevant To This Program @@ -16,7 +18,7 @@ PROGMAIN = tsshbatch.py PROGFILES = ${PROGMAIN} -PROGDOCS = ${PROGMAIN}.ps +PROGDOCS = ${PROGMAIN}.ps DOCS = tsshbatch-license.txt \ ${PROGNAME}.1.gz \ @@ -40,7 +42,6 @@ RELEASES = "Releases" TARBALL = ${DIR}.tar.gz TMPFILE = tmpfile -VERSION = $(shell cvs log ${PROGMAIN} | grep ^head\: | cut -f2 -d " ")${EARLY} ##### @@ -69,7 +70,7 @@ LATEX = latex %.dvi : %.latex - ${LATEX} $*.latex + ${LATEX} $*.latex %.html : %.rst ${2HTML} <$*.rst >$*.html @@ -126,13 +127,17 @@ @emacs -nw $@ @cvs commit -m${HEADER1} $@ -docs: ${DOCS} ${PROGDOCS} +docs: ${DOCS} ${PROGDOCS} @chmod 644 ${DOCS} ${PROGDOCS} @chmod 644 *.gz *.txt -release: docs WHATSNEW.txt ${PROGFILES} +fixrev: FORCE + @sed -i "s/^GITID.*/GITID = \'$(shell git log --pretty=format:"%h%x20%an%x20%ad\'" | head -n1)/" ${PROGNAME}.py + @sed -i "s/^VERSION.*/VERSION = \'${VERSION}'/" ${PROGNAME}.py + +release: docs WHATSNEW.txt fixrev ${PROGFILES} @mkdir ${DIR} - -@mkdir ${RELEASES} 2>&1 >/dev/null + -@mkdir -p ${RELEASES} 2>&1 >/dev/null @cp -pv WHATSNEW.txt ${PROGFILES} ${DOCS} ${PROGDOCS} ${DIR} @tar -czvf ${TARBALL} --exclude CVS ${DIR} @rm -rf ${DIR} @@ -153,5 +158,3 @@ init: scrub cvs update - - diff --git a/tsshbatch.py b/tsshbatch.py index 3de802b..6e11258 100755 --- a/tsshbatch.py +++ b/tsshbatch.py @@ -11,6 +11,14 @@ # http://jessenoller.com/2009/02/05/ssh-programming-with-paramiko-completely-different/ ##### +# Version Information - Overwritten by makefile during release process +##### + +GITID = 'ef767bc tundra Wed Sep 28 10:34:57 2016 -0500' +VERSION = '1.301' + + +##### # Program Housekeeping ##### @@ -20,8 +28,6 @@ CMDINCL = PROGENV + "CMDS" HOSTINCL = PROGENV + "HOSTS" -GITID = "$Id: tsshbatch.py,v 1.228 2016/01/18 23:23:18 tundra Exp $" -VERSION = "1.300' CPRT = "(c)" PROGDATE = "2011-2016" OWNER = "TundraWare Inc." diff --git a/version b/version new file mode 100644 index 0000000..a0f1e42 --- /dev/null +++ b/version @@ -0,0 +1 @@ +1.301