(file) Return to TaskMakefile CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/TaskMakefile between version 1.7 and 1.8

version 1.7, 2006/03/13 17:40:20 version 1.8, 2006/03/15 23:14:31
Line 35 
Line 35 
 # #
 # There are to levels of usage statements supported within this Makefile. # There are to levels of usage statements supported within this Makefile.
 # They are usage and usage_all. These are both implemented by doing a search # They are usage and usage_all. These are both implemented by doing a search
 # across the file for 3 or 2 consecutive # charecters.  # across the file for 3 or 2 consecutive # characters.
 # #
 # This means all comments not to be dispalyed as part of these usae statements  # This means all comments not to be displayed as part of these usage statements
 # must be made with a single # charecter.  # must be made with a single # character.
 # #
 # ============================================================================ # ============================================================================
  
Line 59 
Line 59 
 ### ======================================================================== ### ========================================================================
 ### ###
 ### General Guidelines: ### General Guidelines:
 ###   Mnay of the rules will operate from any directory while others require  ###   Many of the rules will operate from any directory while others require
 ###   them to be executed at a specific directory. The commands that require a ###   them to be executed at a specific directory. The commands that require a
 ###   a specific location will return an error if they are not executed at the ###   a specific location will return an error if they are not executed at the
 ###   appropriate directory. Here are specifics: ###   appropriate directory. Here are specifics:
Line 71 
Line 71 
 ###        branch_diff_unmerged_branch, ###        branch_diff_unmerged_branch,
 ###        branch_diff_unmerged_trunk ###        branch_diff_unmerged_trunk
 ### ###
 ###     The following should be excuted from above the $(MODULE) directory.  ###     The following should be executed from above the $(MODULE) directory.
 ###     Note that some of these commands instantiate the working copy of the ###     Note that some of these commands instantiate the working copy of the
 ###     branch source tree(They have a * before and after them ). ###     branch source tree(They have a * before and after them ).
 ###        * branch_checkout  *, branch_status ###        * branch_checkout  *, branch_status
Line 79 
Line 79 
 ###        * branch_merge_out *, branch_merge_out_commit, branch_merge_out_finish ###        * branch_merge_out *, branch_merge_out_commit, branch_merge_out_finish
 ###        * branch_migrate   *, branch_migrate_commit,   branch_migrate_finish ###        * branch_migrate   *, branch_migrate_commit,   branch_migrate_finish
 ### ###
 ###     The following can be executed from anyware within a working branch  ###     The following can be executed from anywhere within a working branch
 ###     source tree. ###     source tree.
 ###        branch_commit,        branch_diff ###        branch_commit,        branch_diff
 ### ###
 ###   These rules all depend on the user having already logged into cvs with  ###   These rules all depend on the user having already logged into CVS with
 ###   appropriate user permissions. ###   appropriate user permissions.
 ### ###
 ###   These rules do not set or maintain cvs defaults. All cvs defaults should  ###   These rules do not set or maintain CVS defaults. All CVS defaults should
 ###   come from the users's .cvsrc file. These rules set specific options that  ###   come from the user's .cvsrc file. These rules set specific options that
 ###   are required for the operation to be performed. ###   are required for the operation to be performed.
 ### ###
 ###  Branch Management Terminolgy:  ###  Branch Management Terminology:
 ### ###
 ###   branch merge out - The act of merging changes from the trunk, that have occured  ###   branch merge out - The act of merging changes from the trunk, that have occurred
 ###                      since the branch was either created or last merged out ###                      since the branch was either created or last merged out
 ###                      into the branch. ###                      into the branch.
 ###   branch merge in  - The act of merging changes from the branch, that have occured  ###   branch merge in  - The act of merging changes from the branch, that have occurred
 ###                      since the branch was either created or last merged in, ###                      since the branch was either created or last merged in,
 ###                      into the trunk. ###                      into the trunk.
 ###   branch migration - The act of migrating all the changes on the branch, that have ###   branch migration - The act of migrating all the changes on the branch, that have
Line 115 
Line 115 
 ##       branch_checkout ##       branch_checkout
 ##       branch_commit ##       branch_commit
 ##       branch_diff_to_root ##       branch_diff_to_root
 ##       bracnh_diff_unmerged_branch  ##       branch_diff_unmerged_branch
 ##       branch_diff_unmerged_trunk ##       branch_diff_unmerged_trunk
 ##       branch_diff_to_trund  ##       branch_diff_to_trunk
 ##       branch_merge_in ##       branch_merge_in
 ##       branch_merge_out ##       branch_merge_out
 ##       branch_migrate ##       branch_migrate
Line 127 
Line 127 
 ## Tags created/maintained to manage the task branch by the rules within this Makefile ## Tags created/maintained to manage the task branch by the rules within this Makefile
 ## ##
 ## The [BRANCH NAME] is expected to be the combination of a PEP number or ## The [BRANCH NAME] is expected to be the combination of a PEP number or
 ## BUG number and functionality. For example PEPXXXConfigChanges or  ## BUG number and functionality. For example PEPXXX_ConfigChanges or
 ## BUGXXXXConfigChanges. The branch name should use Camel Notation and  ## BUGXXXX_ConfigChanges. The branch name should use Camel Notation and
 ## should not contain underline (_) or dash (-) charecters.  ## should not contain dash (-) characters.
 ## Note that CVS further restircts this to not use any of the following  ## Note that CVS further restricts this to not use any of the following
 ## charecters enclosed within []: [$ , . : ; @].  ## characters enclosed within []: [$ , . : ; @].
 ## ##
 ## ##
 ## Branch and branch management tag naming convention ## Branch and branch management tag naming convention
 ## ##
 ## TASK_[BRANCH_NAME]-[ACTION]_[DIRECTION]_[LOCATION]  ## TASK-[BRANCH_NAME]-[ACTION]_[DIRECTION]_[LOCATION]
 ## ##
 ## Where: ## Where:
 ##   TASK         - is constant to associate all tags to a TASK branch ##   TASK         - is constant to associate all tags to a TASK branch
Line 153 
Line 153 
 ##                  Note that the ACTION branch does not have a DIRECTION or LOCATION ##                  Note that the ACTION branch does not have a DIRECTION or LOCATION
 ##                    as it is the branch. ##                    as it is the branch.
 ## ##
 ##   (1) TASK_[BRANCH NAME]-root    - tag on trunk representing the  ##   (1) TASK-[BRANCH NAME]-root    - tag on trunk representing the
 ##                                   root of the branch. ##                                   root of the branch.
 ## ##
 ##   (2) TASK_[BRANCH NAME]-branch  - head of the branch  ##   (2) TASK-[BRANCH NAME]-branch  - head of the branch
 ## ##
 ## ##
 ##   (3) TASK_[BRANCH NAME]-merged_out_from_trunk   - The tag on the trunk which  ##   (3) TASK-[BRANCH NAME]-merged_out_from_trunk   - The tag on the trunk which
 ##                        marks the place where the last merge out operation occurred. ##                        marks the place where the last merge out operation occurred.
 ##                        It could also be said that changes on the trunk up ##                        It could also be said that changes on the trunk up
 ##                        to this label are contained on the branch. ##                        to this label are contained on the branch.
 ## ##
 ##   (4) TASK_[BRANCH NAME]-merged_out_to_branch  - The tag on the branch which  ##   (4) TASK-[BRANCH NAME]-merged_out_to_branch  - The tag on the branch which
 ##                        marks the place where the last merge out operation occurred. ##                        marks the place where the last merge out operation occurred.
 ## ##
 ##   (5) TASK_[BRANCH NAME]-merged_in_to_trunk    - The tag on the trunk which  ##   (5) TASK-[BRANCH NAME]-merged_in_to_trunk    - The tag on the trunk which
 ##                        marks the place where the last merge in operation occurred. ##                        marks the place where the last merge in operation occurred.
 ## ##
 ##   (6) TASK_[BRANCH NAME]-merged_in_from_branch   - The tag on the branch which  ##   (6) TASK-[BRANCH NAME]-merged_in_from_branch   - The tag on the branch which
 ##                        marks the place where the last merge in operation occurred. ##                        marks the place where the last merge in operation occurred.
 ##                        It could also be said that changes on the branch up to ##                        It could also be said that changes on the branch up to
 ##                        this label have been merged into the trunk. ##                        this label have been merged into the trunk.
 ## ##
 ## ##
 ## For Example if the branch name is PEPXXNewFunc then the following tags will  ## For Example if the branch name is PEPXX_NewFunc then the following tags
 ## be in use:  ## will be in use:
 ##     TASK_PEPXXNewFunc-root  ##     TASK-PEPXX_NewFunc-root
 ##     TASK_PEPXXNewFunc-branch  ##     TASK-PEPXX_NewFunc-branch
 ##     TASK_PEPXXNewFunc-merged_in_to_trunk  ##     TASK-PEPXX_NewFunc-merged_in_to_trunk
 ##     TASK_PEPXXNewFunc-merged_out_from_trunk  ##     TASK-PEPXX_NewFunc-merged_out_from_trunk
 ##     TASK_PEPXXNewFunc-merged_in_from_branch  ##     TASK-PEPXX_NewFunc-merged_in_from_branch
 ##     TASK_PEPXXNewFunc-merged_out_to_branch  ##     TASK-PEPXX_NewFunc-merged_out_to_branch
 ## ##
 ## ##
 ## Consider the following diagram: ## Consider the following diagram:
 ## ##
 ## NOTE: The numbers in these diagrams refer to the branch maintainence  ## NOTE: The numbers in these diagrams refer to the branch maintenance
 ##       symbols above. ##       symbols above.
 ## ##
 ##   After task branch has been created, and changes have been made on both ##   After task branch has been created, and changes have been made on both
Line 255 
Line 255 
 ## ========================================================================== ## ==========================================================================
  
 # =========================================================================== # ===========================================================================
 # Area to specifiy include files  # Area to specify include files
 # =========================================================================== # ===========================================================================
  
  
Line 281 
Line 281 
 ECHO ?= echo ECHO ?= echo
 ECHO_FULL_PATH = $(call pathsearch,$(ECHO)) ECHO_FULL_PATH = $(call pathsearch,$(ECHO))
  
   PATCH ?= patch
   PATCH_FULL_PATH = $(call pathsearch,$(PATCH))
   
   
   ifeq (PEGASUS_PLATFORM,WIN32_IX86_MSVC)
   ## windows
   
   GREP ?= find
   USAGE_SRCH="###"
   USAGE_ALL_SRCH="##"
   
   else
   ## not windows, assume Unix
   
 GREP ?= grep GREP ?= grep
   USAGE_SRCH="\#\#\#"
   USAGE_ALL_SRCH="\#\#"
   endif
   
 GREP_FULL_PATH = $(call pathsearch,$(GREP)) GREP_FULL_PATH = $(call pathsearch,$(GREP))
  
  
 PATCH ?= patch  
 PATCH_FULL_PATH = $(call pathsearch,$(PATCH))  
  
  
 # =============================================================================== # ===============================================================================
Line 310 
Line 326 
 FILE = $(FILE_PATH)/$(FILE_NAME) FILE = $(FILE_PATH)/$(FILE_NAME)
  
 ################################### ###################################
 # BNAME_INVAID_CHAR  # BNAME_INVALID_CHAR
 # BNAME and NEW_BNAME invalid charecters  # BNAME and NEW_BNAME invalid characters
 DASH = - DASH = -
 UNDERLINE = _  
  
 # =============================================================================== # ===============================================================================
 # The remaining defaults will be set only if they are not already set. # The remaining defaults will be set only if they are not already set.
Line 409 
Line 424 
         $(error ERROR: BNAME not set, set it on the command line )         $(error ERROR: BNAME not set, set it on the command line )
 endif endif
  
   # ======================
   # assure that BNAME does not contain invalid characters
   #
 valid_BNAME: exists_BNAME valid_BNAME: exists_BNAME
 ifneq ($(BNAME) ,$(subst $(DASH), X ,$(BNAME))) ifneq ($(BNAME) ,$(subst $(DASH), X ,$(BNAME)))
         @ $(error ERROR: BNAME contains invalid ($(DASH)) charecters)          @ $(error ERROR: BNAME contains invalid ($(DASH)) characters)
 endif  
 ifneq ($(BNAME) ,$(subst $(UNDERLINE), X ,$(BNAME)))  
         @ $(error ERROR: BNAME contains invalid ($(UNDERLINE)) charecters)  
 endif  
   
   
   
 valid_NEW_BNAME: exists_NEW_BNAME  
 ifneq ($(NEW_BNAME) ,$(subst $(DASH), X ,$(NEW_BNAME)))  
         @ $(error ERROR: NEW_BNAME contains invalid ($(DASH)) charecters)  
 endif  
 ifneq ($(NEW_BNAME) ,$(subst $(UNDERLINE), X ,$(NEW_BNAME)))  
         @ $(error ERROR: NEW_BNAME contains invalid ($(UNDERLINE)) charecters)  
 endif endif
  
  
Line 433 
Line 437 
 # assure that BNAME exist in cvs # assure that BNAME exist in cvs
 # #
 exists_cvs_BNAME: exists_BNAME exists_cvs_BNAME: exists_BNAME
 ifneq (TASK_$(BNAME)-branch, $(findstring TASK_$(BNAME)-branch, $(VALID_TAGS)))  ifneq (TASK-$(BNAME)-branch, $(findstring TASK-$(BNAME)-branch, $(VALID_TAGS)))
         @ $(error ERROR:  BNAME, $(BNAME), does not exists in cvs module $(MODULE_NAME))         @ $(error ERROR:  BNAME, $(BNAME), does not exists in cvs module $(MODULE_NAME))
 endif endif
  
  
   
   
 # ====================== # ======================
 # assure that BNAME does not exist in cvs. # assure that BNAME does not exist in cvs.
 # #
 not_exists_cvs_BNAME: exists_BNAME not_exists_cvs_BNAME: exists_BNAME
 ifeq (TASK_$(BNAME)-branch, $(findstring TASK_$(BNAME)-branch, $(VALID_TAGS)))  ifeq (TASK-$(BNAME)-branch, $(findstring TASK-$(BNAME)-branch, $(VALID_TAGS)))
         @ $(error ERROR: BNAME, $(BNAME), exists in cvs module $(MODULE_NAME))         @ $(error ERROR: BNAME, $(BNAME), exists in cvs module $(MODULE_NAME))
 endif endif
  
Line 459 
Line 461 
  
  
 # ====================== # ======================
   # assure that NEW_BNAME does not contain invalid characters
   #
   valid_NEW_BNAME: exists_NEW_BNAME
   ifneq ($(NEW_BNAME) ,$(subst $(DASH), X ,$(NEW_BNAME)))
           @ $(error ERROR: NEW_BNAME contains invalid ($(DASH)) characters)
   endif
   
   
   # ======================
 # assure that NEW_BNAME exist in cvs # assure that NEW_BNAME exist in cvs
 # #
 exists_cvs_NEW_BNAME: exists_NEW_BNAME exists_cvs_NEW_BNAME: exists_NEW_BNAME
 ifneq (TASK_$(NEW_BNAME)-branch, $(findstring TASK_$(NEW_BNAME)-branch, $(VALID_TAGS)))  ifneq (TASK-$(NEW_BNAME)-branch, $(findstring TASK-$(NEW_BNAME)-branch, $(VALID_TAGS)))
         @ $(error ERROR: NEW_BNAME, $(NEW_BNAME), does not exists in cvs module $(MODULE_NAME) )         @ $(error ERROR: NEW_BNAME, $(NEW_BNAME), does not exists in cvs module $(MODULE_NAME) )
 endif endif
  
  
   
   
 # ====================== # ======================
 # assure that NEW_BNAME does not exist in cvs. # assure that NEW_BNAME does not exist in cvs.
 # #
 not_exists_cvs_NEW_BNAME: exists_NEW_BNAME not_exists_cvs_NEW_BNAME: exists_NEW_BNAME
 ifeq (TASK_$(NEW_BNAME)-branch, $(findstring TASK_$(NEW_BNAME)-branch, $(VALID_TAGS)))  ifeq (TASK-$(NEW_BNAME)-branch, $(findstring TASK-$(NEW_BNAME)-branch, $(VALID_TAGS)))
         @ $(error ERROR: NEW_BNAME, $(NEW_BNAME), exists in cvs module $(MODULE_NAME) )         @ $(error ERROR: NEW_BNAME, $(NEW_BNAME), exists in cvs module $(MODULE_NAME) )
 endif endif
  
  
   
 ## ===================== ## =====================
 ## ##
 ### Function: usage - displays usage information ### Function: usage - displays usage information
 ##  Usage:    usage ##  Usage:    usage
 ## ##
 usage: exists_GREP usage: exists_GREP
         @ $(GREP) "\#\#\#" $(FILE)          @ $(GREP) "$(USAGE_SRCH)" $(FILE)
  
 ## ===================== ## =====================
 ## ##
Line 493 
Line 501 
 ##  Usage:    usage_all ##  Usage:    usage_all
 ## ##
 usage_all: exists_GREP usage_all: exists_GREP
         @ $(GREP) "\#\#" $(FILE)          @ $(GREP) "$(USAGE_ALL_SRCH)" $(FILE)
  
 ## ===================== ## =====================
 ## ##
Line 537 
Line 545 
         @ $(ECHO) "RDIFF_OPTIONS      = $(RDIFF_OPTIONS)"         @ $(ECHO) "RDIFF_OPTIONS      = $(RDIFF_OPTIONS)"
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) "For example"         @ $(ECHO) "For example"
         @ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_checkout BNAME=PEPXFunc MODULE=module"          @ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_checkout BNAME=PEPX_Func MODULE=module"
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) =======================================================================         @ $(ECHO) =======================================================================
  
Line 588 
Line 596 
 ## ##
 ## ##
 branch_create: exists_minimum valid_BNAME not_exists_cvs_BNAME branch_create: exists_minimum valid_BNAME not_exists_cvs_BNAME
         $(CVS) rtag -f TASK_$(BNAME)-root $(MODULE_NAME)          $(CVS) rtag -f TASK-$(BNAME)-root $(MODULE_NAME)
         $(CVS) rtag -b -r TASK_$(BNAME)-root TASK_$(BNAME)-branch $(MODULE_NAME)          $(CVS) rtag -b -r TASK-$(BNAME)-root TASK-$(BNAME)-branch $(MODULE_NAME)
         $(CVS) rtag -r TASK_$(BNAME)-root TASK_$(BNAME)-merged_in_to_trunk $(MODULE_NAME)          $(CVS) rtag -r TASK-$(BNAME)-root TASK-$(BNAME)-merged_in_to_trunk $(MODULE_NAME)
         $(CVS) rtag -r TASK_$(BNAME)-root TASK_$(BNAME)-merged_out_from_trunk $(MODULE_NAME)          $(CVS) rtag -r TASK-$(BNAME)-root TASK-$(BNAME)-merged_out_from_trunk $(MODULE_NAME)
         $(CVS) rtag -r TASK_$(BNAME)-branch TASK_$(BNAME)-merged_in_from_branch $(MODULE_NAME)          $(CVS) rtag -r TASK-$(BNAME)-branch TASK-$(BNAME)-merged_in_from_branch $(MODULE_NAME)
         $(CVS) rtag -r TASK_$(BNAME)-branch TASK_$(BNAME)-merged_out_to_branch $(MODULE_NAME)          $(CVS) rtag -r TASK-$(BNAME)-branch TASK-$(BNAME)-merged_out_to_branch $(MODULE_NAME)
  
  
 ## ===================== ## =====================
Line 603 
Line 611 
 ## ##
 ## ##
 ##  Process: ##  Process:
 ##       Rename TASK_[BNAME]-root to TASK_[NEW_BNAME]-root  ##       Rename TASK-[BNAME]-root to TASK-[NEW_BNAME]-root
 ##       Rename TASK_[BNAME]-branch to TASK_[NEW_BNAME]-branch  ##       Rename TASK-[BNAME]-branch to TASK-[NEW_BNAME]-branch
 ##       Rename TASK_[BNAME]-merged_in_to_trunk  ##       Rename TASK-[BNAME]-merged_in_to_trunk
 ##           to TASK_[NEW_BNAME]-merged_in_to_trunk  ##           to TASK-[NEW_BNAME]-merged_in_to_trunk
 ##       Rename TASK_[BNAME]-merged_out_from_trunk  ##       Rename TASK-[BNAME]-merged_out_from_trunk
 ##           to TASK_[NEW_BNAME]-merged_out_from_trunk  ##           to TASK-[NEW_BNAME]-merged_out_from_trunk
 ##       Rename TASK_[BNAME]-merged_in_from_branch  ##       Rename TASK-[BNAME]-merged_in_from_branch
 ##           to TASK_[NEW_BNAME]-merged_in_from_branch  ##           to TASK-[NEW_BNAME]-merged_in_from_branch
 ##       Rename TASK_[BNAME]-merged_out_to_branch  ##       Rename TASK-[BNAME]-merged_out_to_branch
 ##           to TASK_[NEW_BNAME]-merged_out_to_branch  ##           to TASK-[NEW_BNAME]-merged_out_to_branch
 ##       Delete Branch TASK_[BNAME]  ##       Delete Branch TASK-[BNAME]
 ## ##
 branch_rename: exists_minimum exists_cvs_BNAME not_exists_cvs_NEW_BNAME valid_NEW_BNAME branch_rename: exists_minimum exists_cvs_BNAME not_exists_cvs_NEW_BNAME valid_NEW_BNAME
 ifeq ($(BNAME),$(NEW_BNAME)) ifeq ($(BNAME),$(NEW_BNAME))
         $(error ERROR: BNAME=NEW_BNAME=($(BNAME)), They must be different.)         $(error ERROR: BNAME=NEW_BNAME=($(BNAME)), They must be different.)
 endif endif
         $(CVS) rtag -r TASK_$(BNAME)-root TASK_$(NEW_BNAME)-root $(MODULE_NAME)          $(CVS) rtag -r TASK-$(BNAME)-root TASK-$(NEW_BNAME)-root $(MODULE_NAME)
         $(CVS) rtag -b -r TASK_$(BNAME)-branch TASK_$(NEW_BNAME)-branch $(MODULE_NAME)          $(CVS) rtag -b -r TASK-$(BNAME)-branch TASK-$(NEW_BNAME)-branch $(MODULE_NAME)
         $(CVS) rtag -r TASK_$(BNAME)-merged_in_to_trunk TASK_$(NEW_BNAME)-merged_in_to_trunk $(MODULE_NAME)          $(CVS) rtag -r TASK-$(BNAME)-merged_in_to_trunk TASK-$(NEW_BNAME)-merged_in_to_trunk $(MODULE_NAME)
         $(CVS) rtag -r TASK_$(BNAME)-merged_out_from_trunk TASK_$(NEW_BNAME)-merged_out_from_trunk $(MODULE_NAME)          $(CVS) rtag -r TASK-$(BNAME)-merged_out_from_trunk TASK-$(NEW_BNAME)-merged_out_from_trunk $(MODULE_NAME)
         $(CVS) rtag -r TASK_$(BNAME)-merged_in_from_branch TASK_$(NEW_BNAME)-merged_in_from_branch $(MODULE_NAME)          $(CVS) rtag -r TASK-$(BNAME)-merged_in_from_branch TASK-$(NEW_BNAME)-merged_in_from_branch $(MODULE_NAME)
         $(CVS) rtag -r TASK_$(BNAME)-merged_out_to_branch TASK_$(NEW_BNAME)-merged_out_to_branch $(MODULE_NAME)          $(CVS) rtag -r TASK-$(BNAME)-merged_out_to_branch TASK-$(NEW_BNAME)-merged_out_to_branch $(MODULE_NAME)
         $(MAKE) -f $(FILE) branch_delete BNAME=$(BNAME)         $(MAKE) -f $(FILE) branch_delete BNAME=$(BNAME)
  
  
Line 647 
Line 655 
 ## ##
 ## ##
 branch_delete: exists_minimum exists_cvs_BNAME branch_delete: exists_minimum exists_cvs_BNAME
         $(CVS) rtag -d TASK_$(BNAME)-root $(MODULE_NAME)          $(CVS) rtag -d TASK-$(BNAME)-root $(MODULE_NAME)
         $(CVS) rtag -d TASK_$(BNAME)-merged_in_to_trunk $(MODULE_NAME)          $(CVS) rtag -d TASK-$(BNAME)-merged_in_to_trunk $(MODULE_NAME)
         $(CVS) rtag -d TASK_$(BNAME)-merged_out_from_trunk $(MODULE_NAME)          $(CVS) rtag -d TASK-$(BNAME)-merged_out_from_trunk $(MODULE_NAME)
         $(CVS) rtag -d TASK_$(BNAME)-merged_in_from_branch $(MODULE_NAME)          $(CVS) rtag -d TASK-$(BNAME)-merged_in_from_branch $(MODULE_NAME)
         $(CVS) rtag -d TASK_$(BNAME)-merged_out_to_branch $(MODULE_NAME)          $(CVS) rtag -d TASK-$(BNAME)-merged_out_to_branch $(MODULE_NAME)
         $(CVS) rtag -d TASK_$(BNAME)-merging_in_to_trunk $(MODULE_NAME)          $(CVS) rtag -d TASK-$(BNAME)-merging_in_to_trunk $(MODULE_NAME)
         $(CVS) rtag -d TASK_$(BNAME)-merging_out_from_trunk $(MODULE_NAME)          $(CVS) rtag -d TASK-$(BNAME)-merging_out_from_trunk $(MODULE_NAME)
         $(CVS) rtag -d TASK_$(BNAME)-merging_in_from_branch $(MODULE_NAME)          $(CVS) rtag -d TASK-$(BNAME)-merging_in_from_branch $(MODULE_NAME)
         $(CVS) rtag -d TASK_$(BNAME)-merging_out_to_branch $(MODULE_NAME)          $(CVS) rtag -d TASK-$(BNAME)-merging_out_to_branch $(MODULE_NAME)
         $(CVS) rtag -B -d TASK_$(BNAME)-branch $(MODULE_NAME)          $(CVS) rtag -B -d TASK-$(BNAME)-branch $(MODULE_NAME)
  
 ## ===================== ## =====================
 ## ##
Line 667 
Line 675 
 ##            directory shall be placed. ##            directory shall be placed.
 ## ##
 branch_co branch_checkout: exists_minimum exists_cvs_BNAME branch_co branch_checkout: exists_minimum exists_cvs_BNAME
         $(CVS) checkout -r TASK_$(BNAME)-branch $(MODULE_NAME)          $(CVS) checkout -r TASK-$(BNAME)-branch $(MODULE_NAME)
  
  
 ## ===================== ## =====================
Line 697 
Line 705 
 ##  Usage:    branch_diff_to_root BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)] ##  Usage:    branch_diff_to_root BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)]
 ## ##
 branch_diff_to_root: exists_minimum exists_cvs_BNAME branch_diff_to_root: exists_minimum exists_cvs_BNAME
         $(CVS) rdiff $(RDIFF_OPTIONS) -r TASK_$(BNAME)-root -r TASK_$(BNAME)-branch $(MODULE_NAME)          $(CVS) rdiff $(RDIFF_OPTIONS) -r TASK-$(BNAME)-root -r TASK-$(BNAME)-branch $(MODULE_NAME)
  
 ## ===================== ## =====================
 ## ##
Line 705 
Line 713 
 ##  Usage:    branch_diff_to_trunk BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)] ##  Usage:    branch_diff_to_trunk BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)]
 ## ##
 branch_diff_to_trunk: exists_minimum exists_cvs_BNAME branch_diff_to_trunk: exists_minimum exists_cvs_BNAME
         $(CVS) rdiff $(RDIFF_OPTIONS) -r TASK_$(BNAME)-branch $(MODULE_NAME)          $(CVS) rdiff $(RDIFF_OPTIONS) -r TASK-$(BNAME)-branch $(MODULE_NAME)
  
 ## ===================== ## =====================
 ## ##
Line 714 
Line 722 
 ##  Usage:    branch_diff_unmerged_branch BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)] ##  Usage:    branch_diff_unmerged_branch BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)]
 ## ##
 branch_diff_unmerged_branch: exists_minimum exists_cvs_BNAME branch_diff_unmerged_branch: exists_minimum exists_cvs_BNAME
         $(CVS) rdiff  $(RDIFF_OPTIONS) -r TASK_$(BNAME)-merged_in_from_branch -r TASK_$(BNAME)-branch $(MODULE_NAME)          $(CVS) rdiff  $(RDIFF_OPTIONS) -r TASK-$(BNAME)-merged_in_from_branch -r TASK-$(BNAME)-branch $(MODULE_NAME)
  
  
 ## ===================== ## =====================
Line 724 
Line 732 
 ##  Usage:    branch_diff_unmerged_trunk BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)] ##  Usage:    branch_diff_unmerged_trunk BNAME=(BRANCH NAME) [RDIFF_OPTIONS=(OPTIONS)]
 ## ##
 branch_diff_unmerged_trunk: exists_minimum exists_cvs_BNAME branch_diff_unmerged_trunk: exists_minimum exists_cvs_BNAME
         $(CVS) rdiff  $(RDIFF_OPTIONS) -r TASK_$(BNAME)-merged_out_from_trunk $(MODULE_NAME)          $(CVS) rdiff  $(RDIFF_OPTIONS) -r TASK-$(BNAME)-merged_out_from_trunk $(MODULE_NAME)
  
  
 ## ===================== ## =====================
Line 768 
Line 776 
 ##     - Move the merged_in_to_trunk tag to the merging_in_to_trunk tag ##     - Move the merged_in_to_trunk tag to the merging_in_to_trunk tag
 ##     - Move the merged_in_from_branch tag to ##     - Move the merged_in_from_branch tag to
 ##           the merging_in_from_branch tag ##           the merging_in_from_branch tag
 ##     - Delete the  TASK_$(BNAME)-merging_in_to_trunk tag  ##     - Delete the  TASK-$(BNAME)-merging_in_to_trunk tag
 ##     - Delete the  TASK_$(BNAME)-merging_in_from_branch tag  ##     - Delete the  TASK-$(BNAME)-merging_in_from_branch tag
 ## ##
 ## ##
 branch_merge_in: exists_minimum exists_cvs_BNAME branch_merge_in: exists_minimum exists_cvs_BNAME
         $(CVS) rtag -F TASK_$(BNAME)-merging_in_to_trunk $(MODULE_NAME)          $(CVS) rtag -F TASK-$(BNAME)-merging_in_to_trunk $(MODULE_NAME)
         $(CVS) rtag -F -r TASK_$(BNAME)-branch TASK_$(BNAME)-merging_in_from_branch $(MODULE_NAME)          $(CVS) rtag -F -r TASK-$(BNAME)-branch TASK-$(BNAME)-merging_in_from_branch $(MODULE_NAME)
         $(CVS) checkout -P $(MODULE_NAME)         $(CVS) checkout -P $(MODULE_NAME)
         $(CD) $(MODULE_NAME)         $(CD) $(MODULE_NAME)
         $(CVS) update -P -d -j TASK_$(BNAME)-merged_in_from_branch -j TASK_$(BNAME)-merging_in_from_branch $(MODULE_NAME)          $(CVS) update -P -d -j TASK-$(BNAME)-merged_in_from_branch -j TASK-$(BNAME)-merging_in_from_branch $(MODULE_NAME)
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) Differences from branch now merged into         @ $(ECHO) Differences from branch now merged into
         @ $(ECHO) the local working copy of the trunk.         @ $(ECHO) the local working copy of the trunk.
Line 787 
Line 795 
         @ $(ECHO)   2. Review differences to assure commit integrity.         @ $(ECHO)   2. Review differences to assure commit integrity.
         @ $(ECHO)      That is do not check in unintended white space changes,         @ $(ECHO)      That is do not check in unintended white space changes,
         @ $(ECHO)      test or debug code.         @ $(ECHO)      test or debug code.
         @ $(ECHO)   3. Check for aded files and directories and do a cvs add          @ $(ECHO)   3. Check for added files and directories and do a cvs add
         @ $(ECHO)      command for them.         @ $(ECHO)      command for them.
           @ $(ECHO)   4  Check for removed files and directories and do a
           @ $(ECHO)      cvs remove command for them.
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) Then check in the files. Either manually or by using         @ $(ECHO) Then check in the files. Either manually or by using
         @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_merge_in_ci BNAME=$(BNAME)"         @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_merge_in_ci BNAME=$(BNAME)"
Line 817 
Line 827 
  
  
 branch_merge_in_finish: exists_minimum exists_cvs_BNAME branch_merge_in_finish: exists_minimum exists_cvs_BNAME
         $(CVS) rtag -F -r TASK_$(BNAME)-merging_in_to_trunk TASK_$(BNAME)-merged_in_to_trunk $(MODULE_NAME)          $(CVS) rtag -F -r TASK-$(BNAME)-merging_in_to_trunk TASK-$(BNAME)-merged_in_to_trunk $(MODULE_NAME)
         $(CVS) rtag -F -r TASK_$(BNAME)-merging_in_from_branch TASK_$(BNAME)-merged_in_from_branch $(MODULE_NAME)          $(CVS) rtag -F -r TASK-$(BNAME)-merging_in_from_branch TASK-$(BNAME)-merged_in_from_branch $(MODULE_NAME)
         $(CVS) rtag -d TASK_$(BNAME)-merging_in_to_trunk $(MODULE_NAME)          $(CVS) rtag -d TASK-$(BNAME)-merging_in_to_trunk $(MODULE_NAME)
         $(CVS) rtag -d TASK_$(BNAME)-merging_in_from_branch $(MODULE_NAME)          $(CVS) rtag -d TASK-$(BNAME)-merging_in_from_branch $(MODULE_NAME)
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) Branch Management tags have now been updated to reflect the new branch status.         @ $(ECHO) Branch Management tags have now been updated to reflect the new branch status.
         @ $(ECHO)         @ $(ECHO)
Line 851 
Line 861 
 ##          NOTE: The merging_out tag is not used because that ##          NOTE: The merging_out tag is not used because that
 ##                would result in a Sticky tag that will preclude the ##                would result in a Sticky tag that will preclude the
 ##                subsequent commit of the merged files. The ##                subsequent commit of the merged files. The
 ##                mergeing_out tag is created because if any other commits  ##                merging_out tag is created because if any other commits
 ##                occur while the merge is in process they will be detected ##                occur while the merge is in process they will be detected
 ##                and merged on the subsequent merge_out. It is safer to ##                and merged on the subsequent merge_out. It is safer to
 ##                do this than to risk the chance of missing a commit. ##                do this than to risk the chance of missing a commit.
Line 868 
Line 878 
 ##     - Move the merged_out_from_trunk tag to the merging_out_from_trunk tag ##     - Move the merged_out_from_trunk tag to the merging_out_from_trunk tag
 ##     - Move the merged_out_to_branch tag to ##     - Move the merged_out_to_branch tag to
 ##           the merging_out_to_branch tag ##           the merging_out_to_branch tag
 ##     - Delete the  TASK_$(BNAME)-merging_out_from_trunk tag  ##     - Delete the  TASK-$(BNAME)-merging_out_from_trunk tag
 ##     - Delete the  TASK_$(BNAME)-merging_out_to_branch tag  ##     - Delete the  TASK-$(BNAME)-merging_out_to_branch tag
 ## ##
 ## ##
 branch_merge_out: exists_minimum exists_cvs_BNAME branch_merge_out: exists_minimum exists_cvs_BNAME
         $(CVS) rtag -F TASK_$(BNAME)-merging_out_from_trunk $(MODULE_NAME)          $(CVS) rtag -F TASK-$(BNAME)-merging_out_from_trunk $(MODULE_NAME)
         $(CVS) rtag -F -r TASK_$(BNAME)-branch TASK_$(BNAME)-merging_out_to_branch $(MODULE_NAME)          $(CVS) rtag -F -r TASK-$(BNAME)-branch TASK-$(BNAME)-merging_out_to_branch $(MODULE_NAME)
         $(CVS) checkout -P -r TASK_$(BNAME)-branch $(MODULE_NAME)          $(CVS) checkout -P -r TASK-$(BNAME)-branch $(MODULE_NAME)
         $(CD) $(MODULE_NAME)         $(CD) $(MODULE_NAME)
         $(CVS) update -d -j TASK_$(BNAME)-merged_out_from_trunk -j TASK_$(BNAME)-merging_out_from_trunk          $(CVS) update -P -d -j TASK-$(BNAME)-merged_out_from_trunk -j TASK-$(BNAME)-merging_out_from_trunk
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) Differences from trunk now merged into         @ $(ECHO) Differences from trunk now merged into
         @ $(ECHO) the local working copy of the branch.         @ $(ECHO) the local working copy of the branch.
Line 886 
Line 896 
         @ $(ECHO)   1. Resolve any merge conflicts.         @ $(ECHO)   1. Resolve any merge conflicts.
         @ $(ECHO)   2. Check for added files and directories and do a cvs add         @ $(ECHO)   2. Check for added files and directories and do a cvs add
         @ $(ECHO)      command for them.         @ $(ECHO)      command for them.
           @ $(ECHO)   3  Check for removed files and directories and do a
           @ $(ECHO)      cvs remove command for them.
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) Then check in the files. Either manually or by using         @ $(ECHO) Then check in the files. Either manually or by using
         @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_merge_out_ci BNAME=$(BNAME)"         @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_merge_out_ci BNAME=$(BNAME)"
Line 912 
Line 924 
         $(MAKE) -f $(FILE) branch_merge_out_finish BNAME=$(BNAME)         $(MAKE) -f $(FILE) branch_merge_out_finish BNAME=$(BNAME)
  
 branch_merge_out_finish: exists_minimum exists_cvs_BNAME branch_merge_out_finish: exists_minimum exists_cvs_BNAME
         $(CVS) rtag -F -r TASK_$(BNAME)-merging_out_from_trunk TASK_$(BNAME)-merged_out_from_trunk $(MODULE_NAME)          $(CVS) rtag -F -r TASK-$(BNAME)-merging_out_from_trunk TASK-$(BNAME)-merged_out_from_trunk $(MODULE_NAME)
         $(CVS) rtag -F -r TASK_$(BNAME)-merging_out_to_branch TASK_$(BNAME)-merged_out_to_branch $(MODULE_NAME)          $(CVS) rtag -F -r TASK-$(BNAME)-merging_out_to_branch TASK-$(BNAME)-merged_out_to_branch $(MODULE_NAME)
         $(CVS) rtag -d TASK_$(BNAME)-merging_out_from_trunk $(MODULE_NAME)          $(CVS) rtag -d TASK-$(BNAME)-merging_out_from_trunk $(MODULE_NAME)
         $(CVS) rtag -d TASK_$(BNAME)-merging_out_to_branch $(MODULE_NAME)          $(CVS) rtag -d TASK-$(BNAME)-merging_out_to_branch $(MODULE_NAME)
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) Branch Management tags have now been updated to reflect the new branch status.         @ $(ECHO) Branch Management tags have now been updated to reflect the new branch status.
         @ $(ECHO)         @ $(ECHO)
Line 964 
Line 976 
 branch_migrate: exists_minimum exists_cvs_BNAME branch_migrate: exists_minimum exists_cvs_BNAME
         $(MAKE) -f $(FILE) branch_diff_unmerged_branch BNAME=$(BNAME) 1>branch_migrate_diffs         $(MAKE) -f $(FILE) branch_diff_unmerged_branch BNAME=$(BNAME) 1>branch_migrate_diffs
         $(MAKE) -f $(FILE) branch_create BNAME=$(BNAME)_new         $(MAKE) -f $(FILE) branch_create BNAME=$(BNAME)_new
         $(CVS) checkout -P -r TASK_$(BNAME)_new-branch $(MODULE_NAME)          $(CVS) checkout -P -r TASK-$(BNAME)_new-branch $(MODULE_NAME)
         $(PATCH) -b -p0 --global-reject-file=global-reject-patch-file < branch_migrate_diffs         $(PATCH) -b -p0 --global-reject-file=global-reject-patch-file < branch_migrate_diffs
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO)         @ $(ECHO)
Line 983 
Line 995 
         @ $(ECHO) within the $(MODULE_NAME) directory.         @ $(ECHO) within the $(MODULE_NAME) directory.
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) After the commit is complete do either one of the following         @ $(ECHO) After the commit is complete do either one of the following
         @ $(ECHO) dependent on wheter you want the previous branch deleted or saved.          @ $(ECHO) dependent on whether you want the previous branch deleted or saved.
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) This will delete the previous branch and move the branch management.         @ $(ECHO) This will delete the previous branch and move the branch management.
         @ $(ECHO)         @ $(ECHO)
Line 1016 
Line 1028 
         $(MAKE) -f $(FILE) branch_diff_to_root BNAME=$(BNAME)_new > diff_to_root_$(BNAME)_new         $(MAKE) -f $(FILE) branch_diff_to_root BNAME=$(BNAME)_new > diff_to_root_$(BNAME)_new
         @ $(ECHO) Do a         @ $(ECHO) Do a
         @ $(ECHO) "  diff diff_to_root_$(BNAME) diff_to_root_$(BNAME)_new"         @ $(ECHO) "  diff diff_to_root_$(BNAME) diff_to_root_$(BNAME)_new"
         @ $(ECHO) to verify TASK_$(BNAME)_new has all the changes.          @ $(ECHO) to verify TASK-$(BNAME)_new has all the changes.
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) Then do a         @ $(ECHO) Then do a
         @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_migrate_finish BNAME=$(BNAME)"         @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_migrate_finish BNAME=$(BNAME)"
         @ $(ECHO) which will remove TASK_$(BNAME), the old branch, and then rename TASK_$(BNAME)_new to TASK_$(BNAME)          @ $(ECHO) which will remove TASK-$(BNAME), the old branch, and then rename TASK-$(BNAME)_new to TASK-$(BNAME)
         @ $(ECHO) Alternatively you can keep the old branch around for a while and just         @ $(ECHO) Alternatively you can keep the old branch around for a while and just
         @ $(ECHO) rename the new branch by doing a         @ $(ECHO) rename the new branch by doing a
         @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_rename BNAME=$(BNAME)_new NEW_BNAME=($BNAME)_X"         @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_rename BNAME=$(BNAME)_new NEW_BNAME=($BNAME)_X"

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.8
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2