--- loncom/build/install_web_site_cronjob	2004/07/06 18:09:41	1.9
+++ loncom/build/install_web_site_cronjob	2012/01/28 23:16:27	1.11
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+# $Id: install_web_site_cronjob,v 1.11 2012/01/28 23:16:27 raeburn Exp $
+
 =pod
 
 =head1 NAME
@@ -50,10 +52,10 @@ with perl.
 # the "make tardist" command.  But instead, unstable is now defined as
 # "all the gunk we have been working on", whereas the 
 # "make tardist" command means a "carefully inventoried selection of gunk".
-#`cd /home/loninst/auto; export CVS_PASSFILE=/home/loninst/.cvspass; export CVSROOT=:pserver:scott\@localhost:/home/cvs; rm -Rf loncapa/[C][^V]*; rm -Rf loncapa/[^C]*; cvs -Q co loncapa; cd loncapa/loncom/build; make build 2>/dev/null; make tardist;`;
+#`cd /home/loninst/auto; export CVS_RSH=ssh; export CVSROOT=:ext:loninst\@source.lon-capa.org:/home/cvs; rm -Rf loncapa/[C][^V]*; rm -Rf loncapa/[^C]*; cvs -Q co loncapa; cd loncapa/loncom/build; make build 2>/dev/null; make tardist;`;
 
 # The real world.  Just give them all the gunk for the unstable distribution.
-`cd /home/loninst/auto; export CVS_PASSFILE=/home/loninst/.cvspass; export CVSROOT=:pserver:scott\@localhost:/home/cvs; rm -Rf loncapa-unstable; rm -Rf loncapa; cvs -Q export -r HEAD loncapa;`;
+`cd /home/loninst/auto; export CVS_RSH=ssh; export CVSROOT=:ext:loninst\@source.lon-capa.org:/home/cvs; rm -Rf loncapa-unstable; rm -Rf loncapa; cvs -Q co -r HEAD loncapa; cd /home/loninst/auto/loncapa; cvs -Q co -r HEAD modules/TexConvert/tthperl/compiles; cvs -Q co -r HEAD modules/TexConvert/tthperl/commands; cp -p loncom/xml/tth.pm modules/TexConvert/tthperl/tth.pm; `;
 
 # Generate a README file that advises them about dealing with the gunk.
 open(OUT,'>/home/loninst/auto/loncapa/README');
@@ -66,6 +68,7 @@ print(OUT <<END);
 To generate an installable tarball distribution from this file, you can
 execute the following commands:
 cd loncom/build
+make build
 make tardist
 
 Note that the installable tarball distribution (the 'tardist' target)
@@ -80,6 +83,18 @@ cd loncom/build
 make build
 make install
 
+In this case you will be need to create symbolic links for the following
+in loncom (unless you have done this previously):
+
+hosts.tab
+domain.tab
+dns_hosts.tab
+dns_domain.tab
+
+which will point at development_hosts.tab, development_domain.tab, 
+development_dns_hosts.tab, and development_dns_domain.tab respectively
+in loncom.
+
 For more information on Makefile targets, you can just enter the following
 commands:
 cd loncom/build
@@ -107,6 +122,7 @@ system("rm /home/loninst/public_html/*ht
 #`cd /home/loninst/public_html/docs; tar xzf docs.tar.gz`;
 
 `cd /home/loninst/auto/loncapa/loncom/build; make buildwebsite`;
+system("cp /home/loninst/auto/loncapa/doc/build/*.html /home/loninst/public_html/");
 
 # ------------------------------------ Copying over the latest unstable tarball
 #my $filename=`cd /home/loninst/auto; find loncapa -type f -name *.tar.gz -maxdepth 1`;
@@ -126,7 +142,7 @@ my $releasedate = <IN>;
 close(IN);
 
 # ------------------ Updating the download page with the date of the last build
-open(IN,"</home/loninst/public_html/docs/downloads/index.html");
+open(IN,"</home/loninst/public_html/index.html");
 my @lines = <IN>;
 close(IN);
 my $date = `date -I`; chomp($date);
@@ -134,7 +150,7 @@ my $text = join('',@lines);
 $text =~ s/loncapa-unstable\.tar\.gz\<\/a\>.*?\./loncapa-unstable\.tar\.gz\<\/a\> (generated $date)\./;
 $text =~ s/LATESTVERSION/$version/g;
 $text =~ s/LATESTDATE/$releasedate/g;
-open(OUT,">/home/loninst/public_html/docs/downloads/index.html");
+open(OUT,">/home/loninst/public_html/index.html");
 print(OUT $text);
 close(OUT);
 
@@ -148,7 +164,7 @@ open(IN,"</home/loninst/public_html/vers
 my $releasedate = <IN>;
 close(IN);
 # -------------- Updating the download page with the date of the last build
-open(IN,"</home/loninst/public_html/docs/downloads/index.html");
+open(IN,"</home/loninst/public_html/index.html");
 my @lines = <IN>;
 close(IN);
 my $text = join('',@lines);
@@ -158,10 +174,9 @@ if ($version) {
     $text =~ s/TESTINGRELEASE_START//g;
     $text =~ s/TESTINGRELEASE_END//g;
 } else {
-    $text =~ s/TESTINGRELEASE_START.*TESTINGRELEASE_END//g;
+    $text =~ s/TESTINGRELEASE_START.*TESTINGRELEASE_END//gs;
 }
-open(OUT,">/home/loninst/public_html/docs/downloads/index.html");
+open(OUT,">/home/loninst/public_html/index.html");
 print(OUT $text);
 close(OUT);
 
-system("cp /home/loninst/auto/loncapa/doc/build/*.html /home/loninst/public_html/");