CVS: devtools/bin release,1.16,1.17

Update of /cvsroot/mhonarc/devtools/bin
In directory subversions:/tmp/cvs-serv3915/bin

Modified Files:
	release 
Log Message:
release:
  + Added -force-tag option to force rtag, regardless.
  * Some more code mucking to work-around problems with CVS's export
    command in client/server mode.


Index: release
===================================================================
RCS file: /cvsroot/mhonarc/devtools/bin/release,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** release	15 May 2002 06:33:08 -0000	1.16
--- release	15 May 2002 06:49:24 -0000	1.17
***************
*** 70,73 ****
--- 70,74 ----
      'create',		# Tag project in CVS before releasing
      'cvsroot=s',	# CVS root (def: $CVSROOT envariable)
+     'force-tag',	# Force tagging, regardless
      'test-only',	# Just do a test build and exit
      'mailprg=s',	# Mail program (def: /usr/lib/sendmail -t)
***************
*** 143,146 ****
--- 144,148 ----
    my $arch	= $opt{'arch'};
    my $create	= $opt{'create'};
+   my $force_tag	= $opt{'force-tag'};
    my $makefile	= $opt{'makefile'};
    my $mailto	= $opt{'mailto'};
***************
*** 161,168 ****
--- 163,175 ----
    my $platform	= "generic";
    my $buildir	= $reldir . "/$version";
+   my $buildir_parent = $reldir;
+   my $buildir_basename = $version;
+ 
    if ($arch) {
      $platform	= lc `uname -s -p`;
      $platform	=~ s/\s+$//g;
      $platform	=~ s/\s/-/g;
+     $buildir_parent = $buildir;
+     $buildir_basename = $platform;
      $buildir	= $buildir . "/$platform";
    }
***************
*** 253,257 ****
    if ($create) {
      my   @args = ('rtag');
!     push(@args, '-F')  if ($override);
      push(@args, $cvstag, $project);
      run_prg(@cvs, @args);
--- 260,264 ----
    if ($create) {
      my   @args = ('rtag');
!     push(@args, '-F')  if ($override || $force_tag);
      push(@args, $cvstag, $project);
      run_prg(@cvs, @args);
***************
*** 259,266 ****
  
    ## Export project and make release
-   #run_prg('/bin/mv', $testdir, $buildir);
- 
    run_prg('/bin/mkdir', '-p', $buildir);
!   run_prg('cvs', 'export', '-r', $cvstag, '-d', $buildir, $project);
    if (@rhosts) {
      foreach (@rhosts) {
--- 266,272 ----
  
    ## Export project and make release
    run_prg('/bin/mkdir', '-p', $buildir);
!   ch_dir($buildir_parent);
!   run_prg('cvs', 'export', '-r', $cvstag, '-d', $buildir_basename, $project);
    if (@rhosts) {
      foreach (@rhosts) {
***************
*** 673,676 ****
--- 679,687 ----
  in the site-wide configuration file.  If no cvs root is specified,
  then the program terminates with an error.
+ 
+ =item C<-force-tag>
+ 
+ Force tagging of repository, regardless.  Forcing is automatic
+ when an overriding release is detected.
  
  =item C<-help>

---------------------------------------------------------------------
To sign-off this list, send email to majordomo(_at_)mhonarc(_dot_)org with the
message text UNSUBSCRIBE MHONARC-DEV