diff --git a/.tmkproject b/.tmkproject index 132d22f..79a44f1 100644 --- a/.tmkproject +++ b/.tmkproject @@ -1,9 +1,9 @@ # Configuration Data For 'tmkproject' # -# Copyright (c) 2012, TundraWare Inc., Des Plaines, IL 60018 USA +# Copyright (c) 2012-2015, TundraWare Inc., Des Plaines, IL 60018 USA # All Rights Reserved. For Terms Of Use, See: tmkproject-license.txt # -# $Id: .tmkproject,v 1.105 2012/06/05 23:49:10 tundra Exp $ +# $Id: .tmkproject,v 1.106 2015/02/12 23:15:41 tundra Exp $ # NOTE: Any strings below that need the "/" in them - # like the website URL - must escape them for diff --git a/TODO b/TODO index 6aceef1..5681534 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -$Id: TODO,v 1.9 2015/02/12 16:07:40 tundra Exp $ +$Id: TODO,v 1.10 2015/02/12 23:15:41 tundra Exp $ - Pull out all literals and substitutions from the tmkproject script itself into the tokens file and include that file early in the @@ -14,7 +14,4 @@ - Change sh skeleton code to use optargs to handle command line argument passing. -- Add ability to produce an rst-only documentation project - - diff --git a/common/TODO b/common/TODO index ed02f9c..122ac3c 100644 --- a/common/TODO +++ b/common/TODO @@ -1,2 +1,4 @@ # List of open To Do items for __PROJECTNAME__ +# $Id: TODO,v 1.2 2015/02/12 23:15:41 tundra Exp $ + diff --git a/makefile b/makefile index 9b7bd2b..191a16a 100644 --- a/makefile +++ b/makefile @@ -1,14 +1,14 @@ # Build a release of 'tmkproject' using 'make' # Requires a modern 'make' like GNU. # -# Copyright (c) 2012 TundraWare Inc., Des Plaines, IL 60018 USA +# Copyright (c) 2012-2015 TundraWare Inc., Des Plaines, IL 60018 USA # All Rights Reserved. For Terms Of Use See: tmkproject-license.txt # # For Program Updates See: http://www.tundraware.com/Software/tmkproject # -# $Id: makefile,v 1.111 2013/03/04 20:49:28 tundra Exp $ +# $Id: makefile,v 1.112 2015/02/12 23:15:41 tundra Exp $ -CVSID='$Id: makefile,v 1.111 2013/03/04 20:49:28 tundra Exp $' +CVSID='$Id: makefile,v 1.112 2015/02/12 23:15:41 tundra Exp $' # Uncomment One Of The Following For Early Releases diff --git a/tmkproject-license.txt b/tmkproject-license.txt index 8f2834e..fc55fc2 100644 --- a/tmkproject-license.txt +++ b/tmkproject-license.txt @@ -1,4 +1,4 @@ -$Id: tmkproject-license.txt,v 1.102 2012/06/05 23:49:10 tundra Exp $ +$Id: tmkproject-license.txt,v 1.103 2015/02/12 23:15:41 tundra Exp $ In order to use, study, modify, or copy 'tmkproject', you must read and agree to all the licensing terms below. If you do not agree with @@ -39,7 +39,7 @@ 2) OWNERSHIP -'tmkproject' Is Copyright (c) 2012 TundraWare Inc., Des Plaines, IL 60018 USA +'tmkproject' Is Copyright (c) 2012-2015 TundraWare Inc., Des Plaines, IL 60018 USA All Rights Reserved. diff --git a/tmkproject.rst b/tmkproject.rst index b8d2c53..f01a1e6 100644 --- a/tmkproject.rst +++ b/tmkproject.rst @@ -15,7 +15,7 @@ -c Create project, but do not check into CVS name Name of the project - type Programmnig language (pl, py, sh ...) + type Programming language (pl, py, rst, sh ...) 'description' A brief description of the project Must be passed as a single argument @@ -242,7 +242,7 @@ COPYRIGHT AND LICENSING ----------------------- -**tmkproject** is Copyright (c) 2012 TundraWare Inc., Des Plaines, IL 60018 USA +**tmkproject** is Copyright (c) 2012-2015 TundraWare Inc., Des Plaines, IL 60018 USA For terms of use, see the ``tmkproject-license.txt`` file in the program distribution. @@ -262,7 +262,7 @@ :: - $Id: tmkproject.rst,v 1.129 2014/10/08 22:19:43 tundra Exp $ + $Id: tmkproject.rst,v 1.130 2015/02/12 23:15:41 tundra Exp $ You can find the latest version of this program at: diff --git a/tmkproject.sh b/tmkproject.sh index e35ec55..ef85c95 100755 --- a/tmkproject.sh +++ b/tmkproject.sh @@ -1,11 +1,11 @@ #!/bin/sh # tmkproject.sh - Create A New Project Skeleton # -# Copyright (c) 2012, TundraWare Inc., Des Plaines, IL 60018 USA +# Copyright (c) 2012-2015, TundraWare Inc., Des Plaines, IL 60018 USA # All Rights Reserved. For Terms Of Use, See: tmkproject-license.txt -# $Id: tmkproject.sh,v 1.118 2013/03/04 20:46:29 tundra Exp $ +# $Id: tmkproject.sh,v 1.119 2015/02/12 23:15:41 tundra Exp $ -CVSID='$Id: tmkproject.sh,v 1.118 2013/03/04 20:46:29 tundra Exp $' +CVSID='$Id: tmkproject.sh,v 1.119 2015/02/12 23:15:41 tundra Exp $' # If user just wants program version, display it and exit. @@ -84,6 +84,11 @@ LANGUAGE="python" ;; + "rst") + INTERPRETER="" + LANGUAGE="Restructured Text" + ;; + "sh") INTERPRETER="\/bin\/sh" LANGUAGE="the shell interpreter" @@ -131,10 +136,16 @@ done # Combine the generic program template and the -# language-specific program template +# language-specific program template, UNLESS +# we're doing a documenation (rst) project. +# rst template is provided by common files +# and no additional files are needed. -cat program_header program.${TYPE} >${TMPFILE} -cat ${TMPFILE} >program.${TYPE} +if [ ${TYPE} != rst ] +then + cat program_header program.${TYPE} >${TMPFILE} + cat ${TMPFILE} >program.${TYPE} +fi # Clean up