[Koha-cvs] CVS: koha/misc buildrelease,1.15,1.16

[Paul POULAIN]

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

Modified Files:
        buildrelease 
Log Message:
* bugfix 161
* removing koha-html cvs module : it's now unneeded. Should be removable from 
cvs when confirmed nothing has been forgotten

Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/misc/buildrelease,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** buildrelease        4 Feb 2003 18:19:38 -0000       1.15
--- buildrelease        18 Mar 2003 08:54:55 -0000      1.16
***************
*** 1,5 ****
  #!/usr/bin/perl
  
! sub guess_kohahtmldir ($;$);
  #----------------------------------------------------------
  # DIRECTORIES where source code is located
--- 1,5 ----
  #!/usr/bin/perl
  
! #sub guess_kohahtmldir ($;$);
  #----------------------------------------------------------
  # DIRECTORIES where source code is located
***************
*** 7,11 ****
  my $kohadir=`pwd`;
  chomp $kohadir;
! my $kohahtmldir=guess_kohahtmldir($kohadir, "/koha/koha/koha-html/");
  my $roothomedir=(getpwuid(0))[7];     # ~root is traditionally just /
  $roothomedir='/root' unless defined $roothomedir;
--- 7,11 ----
  my $kohadir=`pwd`;
  chomp $kohadir;
! #my $kohahtmldir=guess_kohahtmldir($kohadir, "/koha/koha/koha-html/");
  my $roothomedir=(getpwuid(0))[7];     # ~root is traditionally just /
  $roothomedir='/root' unless defined $roothomedir;
***************
*** 20,26 ****
            $kohadir=$1;
        }
!       if (/kohahtmldir=(.*)/) {
!           $kohahtmldir=$1;
!       }
      }
      $has_kohaautobuild_conf = 1;
--- 20,26 ----
            $kohadir=$1;
        }
! #     if (/kohahtmldir=(.*)/) {
! #         $kohahtmldir=$1;
! #     }
      }
      $has_kohaautobuild_conf = 1;
***************
*** 45,64 ****
  if ($input) {
      $kohadir=$input;
!     unless ($has_kohaautobuild_conf) {
!       $kohahtmldir=guess_kohahtmldir($kohadir, $kohahtmldir);
!     }
  }
  
  
! print "\nWhere is the 'koha-html' cvs module located [$kohahtmldir]: ";
! chomp($input = <STDIN>);
! if ($input) {
!     $kohahtmldir=$input;
! }
  
  open (C, ">$roothomedir/.kohaautobuild.conf");
  print C qq|
  kohadir=$kohadir
! kohahtmldir=$kohahtmldir
  |;
  
--- 45,64 ----
  if ($input) {
      $kohadir=$input;
! #    unless ($has_kohaautobuild_conf) {
! #     $kohahtmldir=guess_kohahtmldir($kohadir, $kohahtmldir);
! #    }
  }
  
  
! #print "\nWhere is the 'koha-html' cvs module located [$kohahtmldir]: ";
! #chomp($input = <STDIN>);
! #if ($input) {
! #    $kohahtmldir=$input;
! #}
  
  open (C, ">$roothomedir/.kohaautobuild.conf");
  print C qq|
  kohadir=$kohadir
! #kohahtmldir=$kohahtmldir
  |;
  
***************
*** 227,244 ****
      system("cvs tag -F R_$tagname");
  }
! print qq|
! Updating your checked-out copy of the 'koha-html' CVS files.
! You may need to enter your SourceForge password.
! Using $kohahtmldir.
! |;
! chdir($kohahtmldir) || die "$kohahtmldir: $!\n";
! system("cvs update");
! 
! if ($cvstag) {
!     print qq|
! Tagging koha-html with tag R_$tagname
! |;
!     system("cvs tag -F R_$tagname");
! }
  
  #----------------------------------------------------------
--- 227,244 ----
      system("cvs tag -F R_$tagname");
  }
! #print qq|
! #Updating your checked-out copy of the 'koha-html' CVS files.
! #You may need to enter your SourceForge password.
! #Using $kohahtmldir.
! #|;
! #chdir($kohahtmldir) || die "$kohahtmldir: $!\n";
! #system("cvs update");
! 
! #if ($cvstag) {
! #    print qq|
! #Tagging koha-html with tag R_$tagname
! #|;
! #    system("cvs tag -F R_$tagname");
! #}
  
  #----------------------------------------------------------
***************
*** 305,309 ****
  system("mv $rootdir/intranet-cgi/misc $rootdir/scripts");
  system("mv $rootdir/intranet-cgi/marc $rootdir/scripts");
! system("mv $rootdir/intranet-cgi/misc/bulkmarcimport.pl 
$rootdir/scripts/z3950daemon/");
  system("mv $rootdir/intranet-cgi/z3950/* $rootdir/scripts/z3950daemon/");
  
--- 305,309 ----
  system("mv $rootdir/intranet-cgi/misc $rootdir/scripts");
  system("mv $rootdir/intranet-cgi/marc $rootdir/scripts");
! #system("mv $rootdir/intranet-cgi/misc/bulkmarcimport.pl 
$rootdir/scripts/z3950daemon/");
  system("mv $rootdir/intranet-cgi/z3950/* $rootdir/scripts/z3950daemon/");
  
***************
*** 313,323 ****
  system("rm -f $rootdir/intranet-cgi/SendMessages");
  system("rm -f $rootdir/intranet-cgi/buildrelease");
- #system("rm -f $rootdir/intranet-cgi/database.mysql");
- #system("rm -f $rootdir/intranet-cgi/installer-lite.pl");
- # FIXME: The following two lines look suspicious
- #system("rm -f $rootdir/intranet-cgi/koha-1.2.0.tar.gz");
- #system("rm -f $rootdir/intranet-cgi/rel-1-2");
- #system("rm -f $rootdir/intranet-cgi/testKoha.pl");
- #system("rm -rf $rootdir/intranet-cgi/html-template");
  system("rm -rf $rootdir/intranet-cgi/t");
  
--- 313,316 ----
***************
*** 326,331 ****
  # Copy all CVS files to intranet-html and opac-html
  # FIXME: "cp -a" is GNU-ism. It is not portable.
! system("cp -a $kohahtmldir/intranet-html/* $rootdir/intranet-html");
! system("cp -a $kohahtmldir/opac-html/* $rootdir/opac-html");
  
  # Copy koha-tmpl files
--- 319,324 ----
  # Copy all CVS files to intranet-html and opac-html
  # FIXME: "cp -a" is GNU-ism. It is not portable.
! #system("cp -a $kohahtmldir/intranet-html/* $rootdir/intranet-html");
! #system("cp -a $kohahtmldir/opac-html/* $rootdir/opac-html");
  
  # Copy koha-tmpl files
***************
*** 336,347 ****
  
  # Remove extraneous files from opac-html
! system("rm -f $rootdir/opac-html/koha.mo");
! system("rm -f $rootdir/opac-html/koha.pot");
! system("rm -f $rootdir/opac-html/test");
  
  # Remove extraneous files from intranet-html
! system("rm -f $rootdir/intranet-html/koha.pot");
! system("rm -f $rootdir/intranet-html/results.html");
! system("rm -f $rootdir/intranet-html/test");
  
  # Remove junk from directory
--- 329,340 ----
  
  # Remove extraneous files from opac-html
! #system("rm -f $rootdir/opac-html/koha.mo");
! #system("rm -f $rootdir/opac-html/koha.pot");
! #system("rm -f $rootdir/opac-html/test");
  
  # Remove extraneous files from intranet-html
! #system("rm -f $rootdir/intranet-html/koha.pot");
! #system("rm -f $rootdir/intranet-html/results.html");
! #system("rm -f $rootdir/intranet-html/test");
  
  # Remove junk from directory
***************
*** 350,364 ****
  system("find $rootdir -name .#* -exec rm -rf \\{\\} \\; 2>/dev/null");
  
- 
- # FIXME: Why do we copy from $roothomedir? What is supposed to be there?
- if (-e "$roothomedir/docs") {
-     print "Copying docs folder from $roothomedir/docs...";
-     system("cp -r $roothomedir/docs/* $rootdir/docs/");
- } else {
-     print "I would have copied the docs from from $roothomedir/docs, but I 
couldn't find it.\n";
-     print "Press <ENTER> to continue...\n";
-     <STDIN>;
- }
- 
  chdir("/tmp");
  system("tar czf /tmp/koha-$releaseversion.tar.gz koha-".$releaseversion);
--- 343,346 ----
***************
*** 390,404 ****
  }
  
! sub guess_kohahtmldir ($;$) {
!     my($kohadir, $default) = @_;
!     my $kohahtmldir;
      # It probably makes sense to assume that the 'koha' and 'koha-html'
      # modules are checked out within the same parent directory
!     if (-d $kohadir && $kohadir =~ /^(.*)\/[^\/]+$/) {
!       $kohahtmldir = "$1/koha-html"
!     } else {
!       $kohahtmldir = $default;
!     }
!     return $kohahtmldir;
! }
  
--- 372,386 ----
  }
  
! #sub guess_kohahtmldir ($;$) {
! #    my($kohadir, $default) = @_;
! #    my $kohahtmldir;
      # It probably makes sense to assume that the 'koha' and 'koha-html'
      # modules are checked out within the same parent directory
! #    if (-d $kohadir && $kohadir =~ /^(.*)\/[^\/]+$/) {
! #     $kohahtmldir = "$1/koha-html"
! #    } else {
! #     $kohahtmldir = $default;
! #    }
! #    return $kohahtmldir;
! #}