[Koha-cvs] CVS: koha buildrelease,1.1.2.28,1.1.2.29

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
        buildrelease 
Log Message:
Removed dependency on koha-tmpl module being checked out (the files are also in
the koha module).


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/Attic/buildrelease,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -C2 -r1.1.2.28 -r1.1.2.29
*** buildrelease        15 Jan 2003 21:36:40 -0000      1.1.2.28
--- buildrelease        4 Feb 2003 19:20:43 -0000       1.1.2.29
***************
*** 6,10 ****
  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;
--- 6,9 ----
***************
*** 22,28 ****
            $kohahtmldir=$1;
        }
-       if (/kohatmpldir=(.*)/) {
-           $kohatmpldir=$1;
-       }
      }
      $has_kohaautobuild_conf = 1;
--- 21,24 ----
***************
*** 57,74 ****
  }
  
- 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
  |;
  
  print "\n\nGuessing at next release version.  You may need to enter your 
SourceForge password...\n";
  open (CVSLOG, "cvs log buildrelease|");
  my $symbolicnamessection=0;
--- 53,64 ----
  }
  
  open (C, ">$roothomedir/.kohaautobuild.conf");
  print C qq|
  kohadir=$kohadir
  kohahtmldir=$kohahtmldir
  |;
  
  print "\n\nGuessing at next release version.  You may need to enter your 
SourceForge password...\n";
+ chdir $kohadir;
  open (CVSLOG, "cvs log buildrelease|");
  my $symbolicnamessection=0;
***************
*** 246,264 ****
  
  
- 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");
- }
- 
  
  
--- 236,239 ----
***************
*** 351,356 ****
  
  # Copy koha-tmpl files
! 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");
  
--- 326,331 ----
  
  # Copy koha-tmpl files
! 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");
  
***************
*** 422,435 ****
  }
  
- sub guess_kohatmpldir ($;$) {
-     my($kohadir, $default) = @_;
-     my $kohatmpldir;
-     # It probably makes sense to assume that the 'koha' and 'koha-tmpl'
-     # modules are checked out within the same parent directory
-     if (-d $kohadir && $kohadir =~ /^(.*)\/[^\/]+$/) {
-       $kohatmpldir = "$1/koha-tmpl"
-     } else {
-       $kohatmpldir = $default;
-     }
-     return $kohatmpldir;
- }
--- 397,398 ----