From a88b8beaf3111b3336ec27b9729128ed8d6571f0 Mon Sep 17 00:00:00 2001
From: tonnesen <tonnesen>
Date: Tue, 4 Feb 2003 18:17:43 +0000
Subject: [PATCH] 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.

---
 misc/buildrelease | 48 +++--------------------------------------------
 1 file changed, 3 insertions(+), 45 deletions(-)

diff --git a/misc/buildrelease b/misc/buildrelease
index 255cd4b93d..7cc925cd0c 100644
--- a/misc/buildrelease
+++ b/misc/buildrelease
@@ -7,7 +7,6 @@ sub guess_kohahtmldir ($;$);
 my $kohadir=`pwd`;
 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;
 
@@ -23,9 +22,6 @@ if (-e "$roothomedir/.kohaautobuild.conf") {
 	if (/kohahtmldir=(.*)/) {
 	    $kohahtmldir=$1;
 	}
-	if (/kohatmpldir=(.*)/) {
-	    $kohatmpldir=$1;
-	}
     }
     $has_kohaautobuild_conf = 1;
 }
@@ -50,7 +46,6 @@ if ($input) {
     $kohadir=$input;
     unless ($has_kohaautobuild_conf) {
 	$kohahtmldir=guess_kohahtmldir($kohadir, $kohahtmldir);
-	$kohatmpldir=guess_kohatmpldir($kohadir, $kohatmpldir);
     }
 }
 
@@ -61,24 +56,17 @@ if ($input) {
     $kohahtmldir=$input;
 }
 
-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
 |;
 
 #----------------------------------------------------------
 # which VERSION are we building ?
 #----------------------------------------------------------
 print "\n\nGuessing at next release version.  You may need to enter your SourceForge password...\n";
-open (CVSLOG, "cvs log buildrelease|");
+open (CVSLOG, "cvs log $kohadir/misc/buildrelease|");
 my $symbolicnamessection=0;
 my $symbolicnames;
 my $highestversion;
@@ -256,21 +244,6 @@ Tagging koha-html with tag R_$tagname
 # MOVE files to /tmp and build tar.gz
 #----------------------------------------------------------
 
-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");
-}
-
 
 
 
@@ -356,8 +329,8 @@ system("cp -a $kohahtmldir/opac-html/* $rootdir/opac-html");
 
 # 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('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");
 
 # Remove extraneous files from opac-html
@@ -428,18 +401,3 @@ sub guess_kohahtmldir ($;$) {
     return $kohahtmldir;
 }
 
-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;
-}
-- 
2.39.5