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

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

version 1.2, 2006/03/08 23:53:57 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 Terminology:
   ###
   ###   branch merge out - The act of merging changes from the trunk, that have occurred
   ###                      since the branch was either created or last merged out
   ###                      into the branch.
   ###   branch merge in  - The act of merging changes from the branch, that have occurred
   ###                      since the branch was either created or last merged in,
   ###                      into the trunk.
   ###   branch migration - The act of migrating all the changes on the branch, that have
   ###                      not been merged into the trunk, to another branch rooted at
   ###                      the current head of the trunk.
 ### ###
 ##  Functions: ##  Functions:
 ##       usage ##       usage
Line 104 
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_trunk ##       branch_diff_to_trunk
 ##       branch_merge_in ##       branch_merge_in
Line 115 
Line 126 
 ## ##
 ## 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 PEP number like PEP_XXX or  ## The [BRANCH NAME] is expected to be the combination of a PEP number or
 ## BUG number like BUG_XXXX and functionality based like like  ## BUG number and functionality. For example PEPXXX_ConfigChanges or
 ## PEP_XXX_Config_Changes or BUG_XXXX_Config_changes.  ## BUGXXXX_ConfigChanges. The branch name should use Camel Notation and
   ## should not contain dash (-) characters.
   ## Note that CVS further restricts this to not use any of the following
   ## characters enclosed within []: [$ , . : ; @].
 ## ##
 ## ##
 ## Branch and branch management tag naming convention ## Branch and branch management tag naming convention
Line 129 
Line 143 
 ##   BRANCH_NAME  - is the name of the branch as described above. ##   BRANCH_NAME  - is the name of the branch as described above.
 ##   ACTION       - is the action or purpose of the tag. It is one of the following: ##   ACTION       - is the action or purpose of the tag. It is one of the following:
 ##                  root, branch, merged_in, merged_out, merging_in or merging_out. ##                  root, branch, merged_in, merged_out, merging_in or merging_out.
 ##   DIRECTION    - is the direction of the ACTION relative to the LOCATION.  ##   DIRECTION    - is the direction of the ACTION relative to the LOCATION, either
   ##                  to or from.
 ##   LOCATION     - is the associated location of the tag. It is either on the trunk ##   LOCATION     - is the associated location of the tag. It is either on the trunk
 ##                    or branch. ##                    or branch.
 ##                  Note that the ACTION root does not have a DIRECTION or LOCATION ##                  Note that the ACTION root does not have a DIRECTION or LOCATION
Line 161 
Line 176 
 ##                        this label have been merged into the trunk. ##                        this label have been merged into the trunk.
 ## ##
 ## ##
 ## For Example if the branch name is PEPXX_FUNC 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-PEPXX_FUNC-root  ##     TASK-PEPXX_NewFunc-root
 ##     TASK-PEPXX_FUNC-branch  ##     TASK-PEPXX_NewFunc-branch
 ##     TASK-PEPXX_FUNC-merged_in_to_trunk  ##     TASK-PEPXX_NewFunc-merged_in_to_trunk
 ##     TASK-PEPXX_FUNC-merged_out_from_trunk  ##     TASK-PEPXX_NewFunc-merged_out_from_trunk
 ##     TASK-PEPXX_FUNC-merged_in_from_branch  ##     TASK-PEPXX_NewFunc-merged_in_from_branch
 ##     TASK-PEPXX_FUNC-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 240 
Line 255 
 ## ========================================================================== ## ==========================================================================
  
 # =========================================================================== # ===========================================================================
 # Area to specifiy include files  # Area to specify include files
 # =========================================================================== # ===========================================================================
  
  
Line 266 
Line 281 
 ECHO ?= echo ECHO ?= echo
 ECHO_FULL_PATH = $(call pathsearch,$(ECHO)) ECHO_FULL_PATH = $(call pathsearch,$(ECHO))
  
 GREP ?= grep  
 GREP_FULL_PATH = $(call pathsearch,$(GREP))  
   
   
 PATCH ?= patch PATCH ?= patch
 PATCH_FULL_PATH = $(call pathsearch,$(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
   USAGE_SRCH="\#\#\#"
   USAGE_ALL_SRCH="\#\#"
   endif
   
   GREP_FULL_PATH = $(call pathsearch,$(GREP))
   
   
  
  
 # =============================================================================== # ===============================================================================
Line 296 
Line 325 
  
 FILE = $(FILE_PATH)/$(FILE_NAME) FILE = $(FILE_PATH)/$(FILE_NAME)
  
   ###################################
   # BNAME_INVALID_CHAR
   # BNAME and NEW_BNAME invalid characters
   DASH = -
  
 # =============================================================================== # ===============================================================================
 # 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 320 
Line 353 
  
 RDIFF_OPTIONS ?= RDIFF_OPTIONS ?=
  
   VALID_TAGS = $(shell $(CVS) rlog $(MODULE_NAME)/$(BFILE) | $(GREP) TASK)
  
 # ================================================================================== # ==================================================================================
 # Rule definitions starts here # Rule definitions starts here
Line 336 
Line 370 
 # assure that a minimum of commands exist. # assure that a minimum of commands exist.
 # #
 # Without ECHO and CVS essentially nothing can be done. # Without ECHO and CVS essentially nothing can be done.
 exists_minimum: exists_MAKE exists_CVS exists_ECHO  exists_minimum: exists_MAKE exists_CVS exists_ECHO exists_GREP
  
 # ====================== # ======================
 # assure that MAKE exists # assure that MAKE exists
 # #
 exists_MAKE: FORCE exists_MAKE: FORCE
 ifeq ($(MAKE_FULL_PATH),) ifeq ($(MAKE_FULL_PATH),)
         $(error MAKE command ($(MAKE)) not found in PATH $(PATH))          $(error ERROR: MAKE command ($(MAKE)) not found in PATH $(PATH))
 endif endif
  
  
Line 352 
Line 386 
 # #
 exists_CVS: FORCE exists_CVS: FORCE
 ifeq ($(CVS_FULL_PATH),) ifeq ($(CVS_FULL_PATH),)
         $(error CVS command ($(CVS)) not found in PATH $(PATH))          $(error ERROR: CVS command ($(CVS)) not found in PATH $(PATH))
 endif endif
  
  
Line 361 
Line 395 
 # #
 exists_PATCH: FORCE exists_PATCH: FORCE
 ifeq ($(PATCH_FULL_PATH),) ifeq ($(PATCH_FULL_PATH),)
         $(error PATCH command ($(PATCH)) not found in PATH $(PATH))          $(error ERROR: PATCH command ($(PATCH)) not found in PATH $(PATH))
 endif endif
  
 # ====================== # ======================
Line 369 
Line 403 
 # #
 exists_GREP: FORCE exists_GREP: FORCE
 ifeq ($(GREP_FULL_PATH),) ifeq ($(GREP_FULL_PATH),)
         $(error GREP command ($(GREP)) not found in PATH $(PATH))          $(error ERROR: GREP command ($(GREP)) not found in PATH $(PATH))
 endif endif
  
 # ====================== # ======================
Line 377 
Line 411 
 # #
 exists_ECHO: FORCE exists_ECHO: FORCE
 ifeq ($(ECHO_FULL_PATH),) ifeq ($(ECHO_FULL_PATH),)
         $(error ECHO command ($(ECHO)) not found in PATH $(PATH))          $(error ERROR: ECHO command ($(ECHO)) not found in PATH $(PATH))
 endif endif
  
  
  
 # ====================== # ======================
 # assure that BNAME exists  # assure that BNAME exists (is not null)
 # #
 exists_BNAME: FORCE exists_BNAME: FORCE
 ifeq ($(BNAME),) ifeq ($(BNAME),)
         @ $(ECHO)          $(error ERROR: BNAME not set, set it on the command line )
         @ $(ECHO) "  BNAME not set, set is on the command line. "  
         @ $(ECHO) "  IE: $(MAKE) -f $(FILE_NAME) [command] BNAME=PEPX_Y "  
         @ $(ECHO)  
         @ $(MAKE) -f $(FILE) parm_error PARM_MSG="BNAME not set"  
 endif endif
  
 # ====================== # ======================
 # assure that NEW_BNAME exists  # assure that BNAME does not contain invalid characters
   #
   valid_BNAME: exists_BNAME
   ifneq ($(BNAME) ,$(subst $(DASH), X ,$(BNAME)))
           @ $(error ERROR: BNAME contains invalid ($(DASH)) characters)
   endif
   
   
   # ======================
   # assure that BNAME exist in cvs
   #
   exists_cvs_BNAME: exists_BNAME
   ifneq (TASK-$(BNAME)-branch, $(findstring TASK-$(BNAME)-branch, $(VALID_TAGS)))
           @ $(error ERROR:  BNAME, $(BNAME), does not exists in cvs module $(MODULE_NAME))
   endif
   
   
   # ======================
   # assure that BNAME does not exist in cvs.
   #
   not_exists_cvs_BNAME: exists_BNAME
   ifeq (TASK-$(BNAME)-branch, $(findstring TASK-$(BNAME)-branch, $(VALID_TAGS)))
           @ $(error ERROR: BNAME, $(BNAME), exists in cvs module $(MODULE_NAME))
   endif
   
   
   # ======================
   # assure that NEW_BNAME exists (is not null)
 # #
 exists_NEW_BNAME: FORCE exists_NEW_BNAME: FORCE
 ifeq ($(NEW_BNAME),) ifeq ($(NEW_BNAME),)
         @ $(ECHO)          @ $(error ERROR: NEW_BNAME not set, set is on the command line.)
         @ $(ECHO) "  NEW_BNAME not set, set is on the command line. "  
         @ $(ECHO) "  IE: $(MAKE) -f $(FILE_NAME) [command] NEW_BNAME=PEPX_Y "  
         @ $(ECHO)  
         @ $(MAKE) -f $(FILE) parm_error PARM_MSG="NEW_BNAME not set"  
 endif endif
  
 parm_error: FORCE  
         $(error $(PARM_MSG))  
  
   # ======================
   # 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
   #
   exists_cvs_NEW_BNAME: exists_NEW_BNAME
   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) )
   endif
   
   
   # ======================
   # assure that NEW_BNAME does not exist in cvs.
   #
   not_exists_cvs_NEW_BNAME: exists_NEW_BNAME
   ifeq (TASK-$(NEW_BNAME)-branch, $(findstring TASK-$(NEW_BNAME)-branch, $(VALID_TAGS)))
           @ $(error ERROR: NEW_BNAME, $(NEW_BNAME), exists in cvs module $(MODULE_NAME) )
   endif
  
  
 ## ===================== ## =====================
Line 417 
Line 493 
 ##  Usage:    usage ##  Usage:    usage
 ## ##
 usage: exists_GREP usage: exists_GREP
         @ $(GREP) "\#\#\#" $(FILE)          @ $(GREP) "$(USAGE_SRCH)" $(FILE)
  
 ## ===================== ## =====================
 ## ##
Line 425 
Line 501 
 ##  Usage:    usage_all ##  Usage:    usage_all
 ## ##
 usage_all: exists_GREP usage_all: exists_GREP
         @ $(GREP) "\#\#" $(FILE)          @ $(GREP) "$(USAGE_ALL_SRCH)" $(FILE)
  
 ## ===================== ## =====================
 ## ##
Line 469 
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=PEPX_Y MODULE=module"          @ $(ECHO) " $(MAKE) -f $(FILE_NAME) branch_checkout BNAME=PEPX_Func MODULE=module"
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) =======================================================================         @ $(ECHO) =======================================================================
  
Line 519 
Line 595 
 ##       Create a "merged_out_to_branch" tag for later use in the merge out. ##       Create a "merged_out_to_branch" tag for later use in the merge out.
 ## ##
 ## ##
 branch_create: exists_minimum exists_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)
Line 547 
Line 623 
 ##           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_BNAME exists_NEW_BNAME  branch_rename: exists_minimum exists_cvs_BNAME not_exists_cvs_NEW_BNAME valid_NEW_BNAME
   ifeq ($(BNAME),$(NEW_BNAME))
           $(error ERROR: BNAME=NEW_BNAME=($(BNAME)), They must be different.)
   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)
Line 575 
Line 654 
 ##       Delete the branch ##       Delete the branch
 ## ##
 ## ##
 branch_delete: exists_minimum exists_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)
Line 595 
Line 674 
 ##  Note:     Must be executed from the directory where the top pegasus ##  Note:     Must be executed from the directory where the top pegasus
 ##            directory shall be placed. ##            directory shall be placed.
 ## ##
 branch_co branch_checkout: exists_minimum  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 625 
Line 704 
 ### Function: branch_diff_to_root - diffs branch to its root ### Function: branch_diff_to_root - diffs branch to its root
 ##  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_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 633 
Line 712 
 ### Function: branch_diff_to_trunk - diffs branch head to the head of the trunk ### Function: branch_diff_to_trunk - diffs branch head to the head of the trunk
 ##  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_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 642 
Line 721 
 ###                                  branch since the last merge in. ###                                  branch since the last merge in.
 ##  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_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 652 
Line 731 
 ###                                  trunk since the last merge out ###                                  trunk since the last merge out
 ##  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_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 665 
Line 744 
 ##  Note:     Must be executed from the directory where the top pegasus ##  Note:     Must be executed from the directory where the top pegasus
 ##            directory shall be placed when the checkout is performed ##            directory shall be placed when the checkout is performed
 ##            to instantiate the working copy of the trunk within which ##            to instantiate the working copy of the trunk within which
 ##            the merge will be performed  ##            the merge will be performed.
   ##
   ##  Note:     You can start this process over prior to the commit by
   ##            removing the working copy of the tree and starting over with
   ##            the branch_merge_in command.
 ## ##
 ##  Process: ##  Process:
 ## ##
Line 684 
Line 767 
 ##     - Manually resolve any conflicts in the working copy of the trunk. ##     - Manually resolve any conflicts in the working copy of the trunk.
 ## ##
 ##   branch_merge_in_commit BNAME=(BRANCH NAME) ##   branch_merge_in_commit BNAME=(BRANCH NAME)
 ##     - Check in merged changes from the working copy of the trunk into the  ##     - Check in merged changes from the working copy of the trunk in.
 ##           main branch.  ##     - executes branch_merge_in_finish
   ##
   ##   If you chose to do a manual checkin then execute branch_merge_in_finish
 ## ##
 ##   branch_merge_in_finish BNAME=(BRANCH NAME) ##   branch_merge_in_finish BNAME=(BRANCH NAME)
 ##     - 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
Line 695 
Line 780 
 ##     - Delete the  TASK-$(BNAME)-merging_in_from_branch tag ##     - Delete the  TASK-$(BNAME)-merging_in_from_branch tag
 ## ##
 ## ##
 branch_merge_in: exists_minimum exists_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)
Line 708 
Line 793 
         @ $(ECHO) Now manually:         @ $(ECHO) Now manually:
         @ $(ECHO)   1. Resolve any merge conflicts.         @ $(ECHO)   1. Resolve any merge conflicts.
         @ $(ECHO)   2. Review differences to assure commit integrity.         @ $(ECHO)   2. Review differences to assure commit integrity.
         @ $(ECHO)      That is don't 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 723 
Line 810 
         @ $(ECHO) within the $(MODULE_NAME) directory to reset the appropriate         @ $(ECHO) within the $(MODULE_NAME) directory to reset the appropriate
         @ $(ECHO) branch management tags.         @ $(ECHO) branch management tags.
         @ $(ECHO)         @ $(ECHO)
           @ $(ECHO) You can start this process over prior to the commit by removing
           @ $(ECHO) the working copy of the tree and then start over with
           @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_merge_in BNAME=$(BNAME)"
           @ $(ECHO)
         @ $(ECHO)         @ $(ECHO)
  
  
 branch_merge_in_ci branch_merge_in_commit: exists_minimum exists_BNAME  branch_merge_in_ci branch_merge_in_commit: exists_minimum exists_cvs_BNAME
         $(CD) $(MODULE_NAME)         $(CD) $(MODULE_NAME)
         $(CVS) commit         $(CVS) commit
         @ $(ECHO)         @ $(ECHO)
Line 735 
Line 826 
         $(MAKE) -f $(FILE) branch_merge_in_finish BNAME=$(BNAME)         $(MAKE) -f $(FILE) branch_merge_in_finish BNAME=$(BNAME)
  
  
 branch_merge_in_finish: exists_minimum exists_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)
Line 757 
Line 848 
 ##            to instantiate the working copy of the trunk within which ##            to instantiate the working copy of the trunk within which
 ##            the merge will be performed ##            the merge will be performed
 ## ##
   ##  Note:     You can start this process over prior to the commit by
   ##            removing the working copy of the tree and starting over with
   ##            the branch_merge_out command.
   ##
 ##  Process: ##  Process:
 ## ##
 ##   branch_merge_out BNAME=(BRANCH NAME) ##   branch_merge_out BNAME=(BRANCH NAME)
Line 766 
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.
 ##     - Use update to merge in the trunk changes since last the merge_out. ##     - Use update to merge in the trunk changes since last the merge_out.
 ##     - Manually resolve any conflicts in the working copy of the trunk.  ##     - Manually resolve any conflicts in the working copy of the branch.
 ## ##
 ##   branch_merge_out_commit BNAME=(BRANCH NAME) ##   branch_merge_out_commit BNAME=(BRANCH NAME)
 ##     - Check in merged changes from the working copy of the trunk into the  ##     - Check in merged changes from the working copy of the branch in.
 ##           branch.  ##     - executes branch_merge_out_finish
   ##
   ##   If you chose to do a manual checkin then execute branch_merge_out_finish
 ## ##
 ##   branch_merge_out_finish BNAME=(BRANCH NAME) ##   branch_merge_out_finish BNAME=(BRANCH NAME)
 ##     - 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
Line 785 
Line 882 
 ##     - 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_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 801 
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 812 
Line 909 
         @ $(ECHO) within the $(MODULE_NAME) directory to reset the appropriate         @ $(ECHO) within the $(MODULE_NAME) directory to reset the appropriate
         @ $(ECHO) branch management tags.         @ $(ECHO) branch management tags.
         @ $(ECHO)         @ $(ECHO)
           @ $(ECHO) You can start this process over prior to the commit by removing
           @ $(ECHO) the working copy of the tree and then start over with
           @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_merge_out BNAME=$(BNAME)"
           @ $(ECHO)
         @ $(ECHO)         @ $(ECHO)
  
 branch_merge_out_ci branch_merge_out_commit: exists_minimum exists_BNAME  branch_merge_out_ci branch_merge_out_commit: exists_minimum exists_cvs_BNAME
         $(CD) $(MODULE_NAME)         $(CD) $(MODULE_NAME)
         $(CVS) commit         $(CVS) commit
         @ $(ECHO)         @ $(ECHO)
Line 822 
Line 923 
         @ $(ECHO)         @ $(ECHO)
         $(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_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)
Line 844 
Line 945 
 ##  Note:     Must be executed from the directory where the top pegasus ##  Note:     Must be executed from the directory where the top pegasus
 ##            directory shall be placed when the checkout is performed ##            directory shall be placed when the checkout is performed
 ##            to instantiate the working copy of the trunk within which ##            to instantiate the working copy of the trunk within which
 ##            the merge will be performed  ##            the merge will be performed.
   ##
   ##  Note:     You can start this process over prior to the commit by
   ##            removing the working copy of the tree and doing a
   ##            "branch_delete (BNAME)_new" and then starting over with
   ##            the branch_migrate command.
 ## ##
 ##  Process: ##  Process:
 ## ##
Line 867 
Line 973 
 ##   branch_rename BNAME=(BRANCH_NAME)_new  NEW_BNAME=(BRANCH NAME)_X ##   branch_rename BNAME=(BRANCH_NAME)_new  NEW_BNAME=(BRANCH NAME)_X
 ## ##
 ## ##
 branch_migrate: exists_minimum exists_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)
Line 888 
Line 994 
         @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_migrate_ci BNAME=$(BNAME)"         @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_migrate_ci BNAME=$(BNAME)"
         @ $(ECHO) within the $(MODULE_NAME) directory.         @ $(ECHO) within the $(MODULE_NAME) directory.
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) If you chose to do a manual commit then after the commit          @ $(ECHO) After the commit is complete do either one of the following
         @ $(ECHO) is complete then do a          @ $(ECHO) dependent on whether you want the previous branch deleted or saved.
           @ $(ECHO)
           @ $(ECHO) This will delete the previous branch and move the branch management.
           @ $(ECHO)
         @ $(ECHO)   "$(MAKE) -f $(FILE_NAME) branch_migrate_finish BNAME=$(BNAME)"         @ $(ECHO)   "$(MAKE) -f $(FILE_NAME) branch_migrate_finish BNAME=$(BNAME)"
         @ $(ECHO) within the $(MODULE_NAME) directory to reset the appropriate         @ $(ECHO) within the $(MODULE_NAME) directory to reset the appropriate
         @ $(ECHO) branch management tags.         @ $(ECHO) branch management tags.
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) If you wish to start this process over then do a          @ $(ECHO) This will rename the branch just migrated to keeping the old branch.
           @ $(ECHO)
           @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_rename BNAME=$(BNAME)_new NEW_BNAME=$(BNAME)_(VER)"
           @ $(ECHO)
           @ $(ECHO) You can start this process over prior to the commit by removing
           @ $(ECHO) the working copy of the tree and then deleting the new branch this
           @ $(ECHO) process created with
         @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_delete BNAME=$(BNAME)_new"         @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_delete BNAME=$(BNAME)_new"
         @ $(ECHO) to remove the new branch that was created as the migration          @ $(ECHO) and then start over with
         @ $(ECHO) target.          @ $(ECHO) "  $(MAKE) -f $(FILE_NAME) branch_migrate BNAME=$(BNAME)"
           @ $(ECHO)
         @ $(ECHO)         @ $(ECHO)
  
 branch_migrate_ci branch_migrate_commit: exists_minimum exists_BNAME  branch_migrate_ci branch_migrate_commit: exists_minimum exists_cvs_BNAME
         $(CD) $(MODULE_NAME)         $(CD) $(MODULE_NAME)
         $(CVS) commit         $(CVS) commit
         @ $(ECHO)         @ $(ECHO)
Line 923 
Line 1039 
         @ $(ECHO) where X is something you chose to identify the new branch.         @ $(ECHO) where X is something you chose to identify the new branch.
  
  
 branch_migrate_finish: exists_minimum exists_BNAME  branch_migrate_finish: exists_minimum exists_cvs_BNAME
         $(MAKE) -f $(FILE) branch_delete BNAME=$(BNAME)         $(MAKE) -f $(FILE) branch_delete BNAME=$(BNAME)
         $(MAKE) -f $(FILE) branch_rename BNAME=$(BNAME)_new NEW_BNAME=$(BNAME)         $(MAKE) -f $(FILE) branch_rename BNAME=$(BNAME)_new NEW_BNAME=$(BNAME)
         @ $(ECHO)         @ $(ECHO)

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