[Koha-cvs] CVS: koha/misc buildrelease,1.8,1.9

[Steve Tonnesen]

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

Modified Files:
	buildrelease 
Log Message:
Trunk 'buildrelease' script now gets the template files out of the koha-tmpl repository.


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/misc/buildrelease,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** buildrelease	6 Jan 2003 11:11:56 -0000	1.8
--- buildrelease	16 Jan 2003 20:57:29 -0000	1.9
***************
*** 8,11 ****
--- 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;
***************
*** 23,26 ****
--- 24,30 ----
  	    $kohahtmldir=$1;
  	}
+ 	if (/kohatmpldir=(.*)/) {
+ 	    $kohatmpldir=$1;
+ 	}
      }
      $has_kohaautobuild_conf = 1;
***************
*** 55,62 ****
--- 59,73 ----
  }
  
+ 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
  |;
  
***************
*** 242,245 ****
--- 253,275 ----
  # 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");
+ }
+ 
+ 
+ 
+ 
  my $rootdir="/tmp/koha-".$releaseversion;
  system("rm -rf $rootdir");
***************
*** 320,326 ****
  system("cp -a $kohahtmldir/opac-html/* $rootdir/opac-html");
  
! # Move koha-tmpl files
! system("mv $rootdir/intranet-cgi/koha-tmpl/opac-tmpl $rootdir/opac-html");
! system("mv $rootdir/intranet-cgi/koha-tmpl/intranet-tmpl $rootdir/intranet-html");
  system("rm -rf $rootdir/intranet-cgi/koha-tmpl");
  
--- 350,356 ----
  system("cp -a $kohahtmldir/opac-html/* $rootdir/opac-html");
  
! # 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");
  
***************
*** 390,392 ****
--- 420,435 ----
      }
      return $kohahtmldir;
+ }
+ 
+ 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;
  }