[Koha-cvs] CVS: koha buildrelease,1.1.2.13,1.1.2.14

[Steve Tonnesen]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv27614

Modified Files:
      Tag: rel-1-2
	buildrelease 
Log Message:
Fixed bug in incrementing from final release (eg from 1.2.1 to 1.2.2RC1)


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/buildrelease,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -C2 -r1.1.2.13 -r1.1.2.14
*** buildrelease	27 Jun 2002 22:29:03 -0000	1.1.2.13
--- buildrelease	3 Jul 2002 05:01:00 -0000	1.1.2.14
***************
*** 95,100 ****
  my $currentversion='';
  
  if ($released) {
!     $releaseversion=($highestversion+1)."RC1";
      $currentversion=$highestversion;
  } else {
--- 95,104 ----
  my $currentversion='';
  
+ 
  if ($released) {
!     my @components=split(/\./, $highestversion);
!     $components[$#components]++;
!     $nexthighestversion=join '.', @components;
!     $releaseversion=$nexthighestversion."RC1";
      $currentversion=$highestversion;
  } else {
***************
*** 104,108 ****
  
  print "Current release tag is $currentversion.\n";
! print "\nWould you like to bump that up to $releaseversion?  [Y]/N: ";
  chomp($input = <STDIN>);
  if ($input =~ /^n/i) {
--- 108,112 ----
  
  print "Current release tag is $currentversion.\n";
! print "\nWould you like to bump that up to $releaseversion (or manually enter version)?  [Y]/N: ";
  chomp($input = <STDIN>);
  if ($input =~ /^n/i) {
***************
*** 130,133 ****
--- 134,145 ----
  
  
+ print "\nWould you like to tag the CVS repository?\n(answer yes if releasing tarball)  [Y]/N: ";
+ chomp ($input=<STDIN>);
+ my $cvstag=1;
+ if ($input=~/^n/i) {
+     $cvstag=0;
+ }
+ 
+ 
  my $sfuserid='';
  if ($cvsroot=$ENV{'CVSROOT'}) {
***************
*** 155,159 ****
  Tagging koha with tag R_$tagname
  |;
! system("cvs tag -F R_$tagname");
  print qq|
  Updating the 'koha-html' CVS files.  You may need to enter your SourceForge password.
--- 167,171 ----
  Tagging koha with tag R_$tagname
  |;
! ($cvstag) && (system("cvs tag -F R_$tagname"));
  print qq|
  Updating the 'koha-html' CVS files.  You may need to enter your SourceForge password.
***************
*** 165,169 ****
  Tagging koha-html with tag R_$tagname
  |;
! system("cvs tag -F R_$tagname");
  
  
--- 177,181 ----
  Tagging koha-html with tag R_$tagname
  |;
! ($cvstag) && (system("cvs tag -F R_$tagname"));
  
  
***************
*** 204,208 ****
  system("mv $rootdir/intranet-cgi/README $rootdir");
  system("mv $rootdir/intranet-cgi/TODO $rootdir");
- system("mv $rootdir/intranet-cgi/databaseinstall.sh $rootdir");
  system("mv $rootdir/intranet-cgi/installer.pl $rootdir"); 
  system("mv $rootdir/intranet-cgi/koha.upgrade $rootdir"); 
--- 216,219 ----