diff --git a/makefile b/makefile index ffe9bd1..1b118ff 100644 --- a/makefile +++ b/makefile @@ -6,9 +6,9 @@ # # For Program Updates See: http://www.tundraware.com/Software/tmkproject # -# $Id: makefile,v 1.107 2012/06/05 23:50:24 tundra Exp $ +# $Id: makefile,v 1.108 2012/06/06 01:57:59 tundra Exp $ -CVSID='$Id: makefile,v 1.107 2012/06/05 23:50:24 tundra Exp $' +CVSID='$Id: makefile,v 1.108 2012/06/06 01:57:59 tundra Exp $' # Uncomment One Of The Following For Early Releases @@ -24,7 +24,7 @@ TYPE = sh PROGMAIN = tmkproject.sh -PROGFILES = ${PROGMAIN} tokens .tmkprojectrc +PROGFILES = ${PROGMAIN} tokens .tmkproject PROGDOCS = ${PROGMAIN}.ps SUPPDIRS = ./common ./pl ./py ./sh diff --git a/tmkproject.rst b/tmkproject.rst index 0fc1f73..8c692b4 100644 --- a/tmkproject.rst +++ b/tmkproject.rst @@ -78,31 +78,31 @@ Each time you run ``tmkproject.sh``, it looks in its own directory for -a file called ``.tmkprojectrc``. This file contains site-specific +a file called ``.tmkproject``. This file contains site-specific items you may wish to customize. These are things like the vendor name, program author's name, the editor to use, and so on. The information found in this file is applied to each new project you create. -Each user can also maintain their own copy of the ``.tmkprojectrc`` +Each user can also maintain their own copy of the ``.tmkproject`` file. By default, after ``tmkproject.sh`` reads the "master" copy in its own directory, it looks for a copy in the user's home directory. That way, each user can override the site-wide defaults to suit themselves. You can change where ``tmkproject.sh`` looks for the user's copy by changing the ``USERCONFIGDIR`` variable in the master -copy of ``.tmkprojectrc``. +copy of ``.tmkproject``. CREATING A NEW PROJECT ---------------------- -Once you've edited ``.tmkprojectrc``, you are ready to create a new +Once you've edited ``.tmkproject``, you are ready to create a new project. Recall that you do this:: tmkproject.sh name type cost 'description` This will generate a project under the ``PROJECTSDIR`` directory -defined in ``.tmkprojectrc``, and check them in to ``CVS``. +defined in ``.tmkproject``, and check them in to ``CVS``. For example:: @@ -180,14 +180,14 @@ Token Replaced By ----- ----------- - __AUTHOR__ Program author's name (.tmkprojectrc) - __COPYOWNER__ Copyright string (.tmkprojectrc) + __AUTHOR__ Program author's name (.tmkproject) + __COPYOWNER__ Copyright string (.tmkproject) __COPYRIGHT__ Full copyright string (internal) __COST__ Cost (command line argument) __DESCRIPTION__ Project description (command line argument) - __EDITOR__ Name of editor (.tmkprojectrc) - __EDITARGS__ Editor arguments (.tmkprojectrc) - __EMAILSUPPORT__ Email support address (.tmkprojectrc) + __EDITOR__ Name of editor (.tmkproject) + __EDITARGS__ Editor arguments (.tmkproject) + __EMAILSUPPORT__ Email support address (.tmkproject) __ID__ CVS version string, ``$Id`` (internal) __INTERPRETER__ "Hash bang" string for the selected language. __LANGUAGE__ Name of the language (internal) @@ -196,8 +196,8 @@ __RESERVED__ "All Rights Reserved ..." string (internal) __TYPE__ Program type (command line argument) __UPDATES__ Reference to the update website (internal) - __VENDORNAME__ Name of the project vendor (.tmkprojectrc) - __WEBSITE__ Website where updates can be found (.tmkprojectrc) + __VENDORNAME__ Name of the project vendor (.tmkproject) + __WEBSITE__ Website where updates can be found (.tmkproject) You can also define additional substitution tokens of your own by editing the ``tokens`` file provided with the program distribution. @@ -213,7 +213,7 @@ appropriately in both the ``tokens`` file and anywhere a variable is defined that is referenced in a substitution token definition. For example, ``__WEBSITE__`` refers to ``${WEBSITE}`` which actually gets -defined in ``.tmkprojectrc``. If you look there, you will see that all +defined in ``.tmkproject``. If you look there, you will see that all the forward slashes have been escaped in anticipation of the fact that we're going to feed the string to ``sed``. @@ -253,7 +253,7 @@ :: - $Id: tmkproject.rst,v 1.117 2012/06/05 23:49:10 tundra Exp $ + $Id: tmkproject.rst,v 1.118 2012/06/06 01:57:59 tundra Exp $ You can find the latest version of this program at: diff --git a/tmkproject.sh b/tmkproject.sh index 1940919..155a2cd 100755 --- a/tmkproject.sh +++ b/tmkproject.sh @@ -3,9 +3,9 @@ # # Copyright (c) 2012, TundraWare Inc., Des Plaines, IL 60018 USA # All Rights Reserved. For Terms Of Use, See: tmkproject-license.txt -# $Id: tmkproject.sh,v 1.107 2012/06/05 23:49:10 tundra Exp $ +# $Id: tmkproject.sh,v 1.108 2012/06/06 01:57:59 tundra Exp $ -CVSID='$Id: tmkproject.sh,v 1.107 2012/06/05 23:49:10 tundra Exp $' +CVSID='$Id: tmkproject.sh,v 1.108 2012/06/06 01:57:59 tundra Exp $' # Make sure we have a valid command line @@ -29,11 +29,11 @@ # Readin site-wide configuration -. ${BASE}/.tmkprojectrc +. ${BASE}/.tmkproject # Readin the user's configuration if there is one -USERCONFIG=${USERCONFIGDIR}/.tmkprojectrc +USERCONFIG=${USERCONFIGDIR}/.tmkproject if [ -e ${USERCONFIG} ] then