[Koha-cvs] CVS: koha/misc buildrelease,1.1,1.2 installer.pl,1.1,1.2

[Paul POULAIN]

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

Modified Files:
	buildrelease installer.pl 
Log Message:
changes to use new dir structure (many scripts moved to misc/)
installer now ask for marc parameters : either MARC21 in english or UNIMARC in french

Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/misc/buildrelease,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** buildrelease	22 Nov 2002 09:05:18 -0000	1.1
--- buildrelease	25 Nov 2002 18:33:17 -0000	1.2
***************
*** 268,287 ****
  
  # Move files from intranet-cgi to root of tarball
! system("mv $rootdir/intranet-cgi/INSTALL $rootdir");
! system("mv $rootdir/intranet-cgi/ChangeLog* $rootdir");
! system("mv $rootdir/intranet-cgi/Hints $rootdir");
! system("mv $rootdir/intranet-cgi/LICENSE $rootdir");
! system("mv $rootdir/intranet-cgi/News $rootdir");
! system("mv $rootdir/intranet-cgi/README $rootdir");
! system("mv $rootdir/intranet-cgi/TODO $rootdir");
! system("mv $rootdir/intranet-cgi/installer.pl $rootdir");
! system("mv $rootdir/intranet-cgi/koha.upgrade $rootdir");
! system("mv $rootdir/intranet-cgi/Install.pm $rootdir");
! system("mv $rootdir/intranet-cgi/kohareporter $rootdir");
  chmod 0770, "$rootdir/installer.pl";
  chmod 0770, "$rootdir/koha.upgrade";
! system("mv $rootdir/intranet-cgi/koha.conf $rootdir");
! system("mv $rootdir/intranet-cgi/koha.mysql $rootdir");
! system("mv $rootdir/intranet-cgi/sampledata-1.2 $rootdir");
  system("gzip -9 $rootdir/sampledata-1.2");
  
--- 268,281 ----
  
  # Move files from intranet-cgi to root of tarball
! system("mv $rootdir/intranet-cgi/misc/info/* $rootdir");
! system("mv $rootdir/intranet-cgi/misc/installer.pl $rootdir");
! system("mv $rootdir/intranet-cgi/misc/koha.upgrade $rootdir");
! #system("mv $rootdir/intranet-cgi/Install.pm $rootdir"); #does not exist ??
! #system("mv $rootdir/intranet-cgi/kohareporter $rootdir"); # does not exist ??
  chmod 0770, "$rootdir/installer.pl";
  chmod 0770, "$rootdir/koha.upgrade";
! system("mv $rootdir/intranet-cgi/misc/koha.conf $rootdir");
! system("mv $rootdir/intranet-cgi/misc/koha.mysql $rootdir");
! system("mv $rootdir/intranet-cgi/misc/sampledata-1.2 $rootdir");
  system("gzip -9 $rootdir/sampledata-1.2");
  
***************
*** 303,310 ****
  system("mv $rootdir/intranet-cgi/misc $rootdir/scripts");
  system("mv $rootdir/intranet-cgi/marc $rootdir/scripts");
! system("mv $rootdir/intranet-cgi/acqui.simple/bulkmarcimport.pl $rootdir/scripts/z3950daemon/");
! system("mv $rootdir/intranet-cgi/acqui.simple/processz3950queue $rootdir/scripts/z3950daemon/");
! system("mv $rootdir/intranet-cgi/acqui.simple/z3950-daemon-launch.sh $rootdir/scripts/z3950daemon/");
! system("mv $rootdir/intranet-cgi/acqui.simple/z3950-daemon-shell.sh $rootdir/scripts/z3950daemon/");
  
  
--- 297,302 ----
  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");
  
--- 305,315 ----
  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");
  
***************
*** 360,364 ****
  chdir("/tmp");
  system("tar czf /tmp/koha-$releaseversion.tar.gz koha-".$releaseversion);
! system("rm -rf $rootdir");
  
  print qq|
--- 352,356 ----
  chdir("/tmp");
  system("tar czf /tmp/koha-$releaseversion.tar.gz koha-".$releaseversion);
! #system("rm -rf $rootdir");
  
  print qq|

Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/installer.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** installer.pl	22 Nov 2002 09:05:18 -0000	1.1
--- installer.pl	25 Nov 2002 18:33:17 -0000	1.2
***************
*** 928,934 ****
  ===============================
  |;
  system ("perl -I $kohadir/modules scripts/marc/fill_usmarc.pl");
  system ("perl -I $kohadir/modules scripts/marc/updatedb2marc.pl");
- 
  
  chmod 0770, $kohalogdir;
--- 928,954 ----
  ===============================
  |;
+ 
+ $answer="";
+ while ($answer ne "1" && $answer ne "2" && $answer ne "3") {
+ 	print qq|
+ You can import marc parameters for :
+ 1- english marc21 or for
+ 2- french unimarc.
+ 3- none.
+ Please choose which parameter you want to install. Note if you choose 3, nothing will be added, and it can be a BIG job to manually create those tables
+ |;
+ 	$answer = <STDIN>;
+ 	chomp $answer;
+ }
+ if ($answer eq "1") {
+ system("cat misc/marc_datas/marc21_en/structure_def.sql | $mysqldir/bin/mysql -u$mysqluser -p$mysqlpass $dbname");
+ }
+ if ($answer eq "2") {
+ system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$mysqluser -p$mysqlpass $dbname");
+ system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$mysqluser -p$mysqlpass $dbname");
+ }
+ 
  system ("perl -I $kohadir/modules scripts/marc/fill_usmarc.pl");
  system ("perl -I $kohadir/modules scripts/marc/updatedb2marc.pl");
  
  chmod 0770, $kohalogdir;