[Koha-cvs] CVS: koha/misc buildrelease,1.13,1.14

[Steve Tonnesen]

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv533

Modified Files:
        buildrelease 
Log Message:
Removed dependence on the koha-tmpl cvs module which is just a link to
koha-tmpl directory in the koha module.
buildrelease also now uses an absolute path to find the buildrelease script for
guessing the current version number.


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/misc/buildrelease,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** buildrelease        4 Feb 2003 16:43:07 -0000       1.13
--- buildrelease        4 Feb 2003 18:17:43 -0000       1.14
***************
*** 8,12 ****
  chomp $kohadir;
  my $kohahtmldir=guess_kohahtmldir($kohadir, "/koha/koha/koha-html/");
- my $kohatmpldir=guess_kohatmpldir($kohadir, "/koha/koha/koha-tmpl/");
  my $roothomedir=(getpwuid(0))[7];     # ~root is traditionally just /
  $roothomedir='/root' unless defined $roothomedir;
--- 8,11 ----
***************
*** 24,30 ****
            $kohahtmldir=$1;
        }
-       if (/kohatmpldir=(.*)/) {
-           $kohatmpldir=$1;
-       }
      }
      $has_kohaautobuild_conf = 1;
--- 23,26 ----
***************
*** 51,55 ****
      unless ($has_kohaautobuild_conf) {
        $kohahtmldir=guess_kohahtmldir($kohadir, $kohahtmldir);
-       $kohatmpldir=guess_kohatmpldir($kohadir, $kohatmpldir);
      }
  }
--- 47,50 ----
***************
*** 62,76 ****
  }
  
- print "\nWhere is the 'koha-tmpl' cvs module located [$kohatmpldir]: ";
- chomp($input = <STDIN>);
- if ($input) {
-     $kohatmpldir=$input;
- }
- 
  open (C, ">$roothomedir/.kohaautobuild.conf");
  print C qq|
  kohadir=$kohadir
  kohahtmldir=$kohahtmldir
- kohatmpldir=$kohatmpldir
  |;
  
--- 57,64 ----
***************
*** 79,83 ****
  #----------------------------------------------------------
  print "\n\nGuessing at next release version.  You may need to enter your 
SourceForge password...\n";
! open (CVSLOG, "cvs log buildrelease|");
  my $symbolicnamessection=0;
  my $symbolicnames;
--- 67,71 ----
  #----------------------------------------------------------
  print "\n\nGuessing at next release version.  You may need to enter your 
SourceForge password...\n";
! open (CVSLOG, "cvs log $kohadir/misc/buildrelease|");
  my $symbolicnamessection=0;
  my $symbolicnames;
***************
*** 257,275 ****
  #----------------------------------------------------------
  
- print qq|
- Updating your checked-out copy of the 'koha-tmpl' CVS files.
- You may need to enter your SourceForge password.
- Using $kohatmpldir.
- |;
- chdir($kohatmpldir) || die "$kohatmpldir: $!\n";
- system("cvs update");
- 
- if ($cvstag) {
-     print qq|
- Tagging koha-tmpl with tag R_$tagname
- |;
-     system("cvs tag -F R_$tagname");
- }
- 
  
  
--- 245,248 ----
***************
*** 357,362 ****
  # Copy koha-tmpl files
  # FIXME: "cp -a" is GNU-ism. It is not portable.
! system('cp', '-a', "$kohatmpldir/opac-tmpl", "$rootdir/opac-html");
! system('cp', '-a', "$kohatmpldir/intranet-tmpl", "$rootdir/intranet-html");
  system('rm', '-rf', "$rootdir/intranet-cgi/koha-tmpl");
  
--- 330,335 ----
  # Copy koha-tmpl files
  # FIXME: "cp -a" is GNU-ism. It is not portable.
! system('cp', '-a', "$rootdir/intranet-cgi/koha-tmpl/opac-tmpl", 
"$rootdir/opac-html");
! system('cp', '-a', "$rootdir/intranet-cgi/koha-tmpl/intranet-tmpl", 
"$rootdir/intranet-html");
  system('rm', '-rf', "$rootdir/intranet-cgi/koha-tmpl");
  
***************
*** 429,445 ****
  }
  
- sub guess_kohatmpldir ($;$) {
-     my($kohadir, $default) = @_;
-     my $kohatmpldir;
-     # "koha-tmpl" is now just a subdirectory within the "koha" module.
-     # Otherwise, it probably makes sense to assume that the "koha" and
-     # "koha-tmpl" modules are checked out within the same parent directory
-     if (-d $kohadir && -d "$kohadir/koha-tmpl") {
-       $kohatmpldir = "$kohadir/koha-tmpl";
-     } elsif (-d $kohadir && $kohadir =~ /^(.*)\/[^\/]+$/) {
-       $kohatmpldir = "$1/koha-tmpl"
-     } else {
-       $kohatmpldir = $default;
-     }
-     return $kohatmpldir;
- }
--- 402,403 ----