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

Diff for /pegasus/mak/TaskMakefile between version 1.4 and 1.6

version 1.4, 2006/03/09 20:03:32 version 1.6, 2006/03/13 16:59:10
Line 90 
Line 90 
 ###   come from the users's .cvsrc file. These rules set specific options that ###   come from the users'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 merge out - The act of merging changes from the trunk, that have occured
   ###                      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 occured
   ###                      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 129 
Line 140 
 ##   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 274 
Line 286 
 PATCH_FULL_PATH = $(call pathsearch,$(PATCH)) PATCH_FULL_PATH = $(call pathsearch,$(PATCH))
  
  
   
   
 # =============================================================================== # ===============================================================================
 # Shell internal commands # Shell internal commands
 # =============================================================================== # ===============================================================================
Line 296 
Line 306 
  
 FILE = $(FILE_PATH)/$(FILE_NAME) FILE = $(FILE_PATH)/$(FILE_NAME)
  
   ###################################
   # BNAME_INVAID_CHAR
   # BNAME and NEW_BNAME invalid charecters
   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 320 
Line 335 
  
 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 352 
 # 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
Line 383 
Line 399 
  
  
 # ====================== # ======================
 # 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. "  endif
         @ $(ECHO) "  IE: $(MAKE) -f $(FILE_NAME) [command] BNAME=PEPX_Y "  
         @ $(ECHO)  
         @ $(MAKE) -f $(FILE) parm_error PARM_MSG="BNAME not set"  valid_BNAME: exists_BNAME
   ifneq ($(BNAME) ,$(subst $(DASH), X ,$(BNAME)))
           @ $(error ERROR: BNAME contains invalid ($(DASH)) charecters)
   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
   
   
   # ======================
   # 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 endif
  
   
 # ====================== # ======================
 # assure that NEW_BNAME exists  # 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. "  endif
         @ $(ECHO) "  IE: $(MAKE) -f $(FILE_NAME) [command] NEW_BNAME=PEPX_Y "  
         @ $(ECHO)  
         @ $(MAKE) -f $(FILE) parm_error PARM_MSG="NEW_BNAME not set"  # ======================
   # 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 endif
  
 parm_error: FORCE  
         $(error ERROR: $(PARM_MSG))  
   
   # ======================
   # 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 469 
Line 534 
         @ $(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=PEPXFunc MODULE=module"
         @ $(ECHO)         @ $(ECHO)
         @ $(ECHO) =======================================================================         @ $(ECHO) =======================================================================
  
Line 519 
Line 584 
 ##       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 612 
 ##           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)) 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
Line 578 
Line 643 
 ##       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 598 
Line 663 
 ##  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 628 
Line 693 
 ### 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 636 
Line 701 
 ### 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 645 
Line 710 
 ###                                  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 655 
Line 720 
 ###                                  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 704 
Line 769 
 ##     - 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 739 
Line 804 
         @ $(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 748 
Line 813 
         $(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 804 
Line 869 
 ##     - Delete the  TASK_$(BNAME)-merging_out_to_branch tag ##     - Delete the  TASK_$(BNAME)-merging_out_to_branch tag
 ## ##
 ## ##
 branch_merge_out: exists_minimum exists_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)
Line 835 
Line 900 
         @ $(ECHO)         @ $(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 843 
Line 908 
         @ $(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 893 
Line 958 
 ##   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 936 
Line 1001 
         @ $(ECHO)         @ $(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 959 
Line 1024 
         @ $(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.4  
changed lines
  Added in v.1.6
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2