[Koha-cvs] CVS: koha buildrelease,1.1.2.24,1.1.2.25 koha.upgrade,1.1.2.22,1.1.2.23 moredetail.pl,1.4.2.5,1.4.2.6

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
        buildrelease koha.upgrade moredetail.pl 
Log Message:
buildrelease now supports 1.2 and 1.3 branches automatically


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/buildrelease,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -C2 -r1.1.2.24 -r1.1.2.25
*** buildrelease        25 Oct 2002 18:52:46 -0000      1.1.2.24
--- buildrelease        28 Oct 2002 22:59:46 -0000      1.1.2.25
***************
*** 60,64 ****
  
  print "\n\nGuessing at next release version.  You may need to enter your 
SourceForge password...\n";
- chdir $kohadir || die "$kohadir: $!\n";
  open (CVSLOG, "cvs log buildrelease|");
  my $symbolicnamessection=0;
--- 60,63 ----
***************
*** 67,70 ****
--- 66,71 ----
  my $highestrc;
  my $released;
+ my $majorversion;
+ my $majorversionrc;
  while (<CVSLOG>) {
      if (/^symbolic names:/) {
***************
*** 81,84 ****
--- 82,90 ----
                $version=$1;
                $rc=$2;
+               $version=~m#(\d+\.\d+)\.#;
+               if (versioncompare($version, $majorversion->{$1})) {
+                   $majorversion->{$1}=$version;
+                   $majorversionrc->{$1}=$rc;
+               }
                if (versioncompare($version, $highestversion)) {
                    $highestversion=$version;
***************
*** 88,91 ****
--- 94,102 ----
            } else {
                $version=$id;
+               $version=~m#(\d+\.\d+)\.#;
+               if (versioncompare($version, $majorversion->{$1})) {
+                   $majorversion->{$1}=$version;
+                   $majorversionrc->{$1}=0;
+               }
                if (versioncompare($version, $highestversion)) {
                    $highestversion=$version;
***************
*** 103,106 ****
--- 114,126 ----
  my $currentversion='';
  
+ my $branchdata=`grep buildrelease CVS/Entries`;
+ chomp $branchdata;
+ my $branch=(split(m#/#, $branchdata))[5];
+ 
+ if ($branch eq 'Trel-1-2') {
+     $highestversion=$majorversion->{'1.2'};
+     $highestrc=$majorversionrc->{'1.2'};
+     ($highestrc) ? ($released=0) : ($released=1);
+ }
  
  if ($released) {
***************
*** 108,112 ****
      $components[$#components]++;
      $nexthighestversion=join '.', @components;
!     $releaseversion=$nexthighestversion."RC1";
      $currentversion=$highestversion;
  } else {
--- 128,137 ----
      $components[$#components]++;
      $nexthighestversion=join '.', @components;
!     my $minornumber=(split(/\./, $highestversion))[1];
!     if ($minornumber/2 == int($minornumber/2)) {
!       $releaseversion=$nexthighestversion."RC1";
!     } else {
!       $releaseversion=$nexthighestversion;
!     }
      $currentversion=$highestversion;
  } else {
***************
*** 115,118 ****
--- 140,144 ----
  }
  
+ 
  print "Current release tag is $currentversion.\n";
  print "\nWould you like to bump that up to $releaseversion (or manually enter 
version)?  [Y]/N: ";
***************
*** 272,275 ****
--- 298,302 ----
  system("mv $rootdir/intranet-cgi/updater $rootdir/scripts");
  system("mv $rootdir/intranet-cgi/misc $rootdir/scripts");
+ system("mv $rootdir/intranet-cgi/marc $rootdir/scripts");
  system("mv $rootdir/intranet-cgi/acqui.simple/bulkmarcimport.pl 
$rootdir/scripts/z3950daemon/");
  system("mv $rootdir/intranet-cgi/acqui.simple/processz3950queue 
$rootdir/scripts/z3950daemon/");

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/koha.upgrade,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -C2 -r1.1.2.22 -r1.1.2.23
*** koha.upgrade        23 Oct 2002 16:30:15 -0000      1.1.2.22
--- koha.upgrade        28 Oct 2002 22:59:46 -0000      1.1.2.23
***************
*** 141,145 ****
--- 141,148 ----
  %6d borrowers
  
+ File Listing
+ ---------------------------------------------------------------------
  $filels
+ ---------------------------------------------------------------------
  
  Does this look right? ([Y]/N):

Index: moredetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/moredetail.pl,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -C2 -r1.4.2.5 -r1.4.2.6
*** moredetail.pl       28 Oct 2002 17:45:14 -0000      1.4.2.5
--- moredetail.pl       28 Oct 2002 22:59:46 -0000      1.4.2.6
***************
*** 91,95 ****
  }
  
! $template->param(includesdir => $includes);
  $template->param(BIBITEM_DATA => address@hidden);
  $template->param(ITEM_DATA => address@hidden);
--- 91,95 ----
  }
  
! #$template->param(includesdir => $includes);
  $template->param(BIBITEM_DATA => address@hidden);
  $template->param(ITEM_DATA => address@hidden);