--- loncom/build/install_web_site_cronjob	2003/01/26 23:13:46	1.4
+++ loncom/build/install_web_site_cronjob	2004/07/06 18:09:41	1.9
@@ -29,22 +29,33 @@ A secondary yet important function of B<
 also refreshes the documentation present on the install.lon-capa.org
 web site.
 
-It does depend on a file name LATEST-IS-something, where something is
-the latest release of loncapa, that file should also contain a string
-that will be used to date the release.
+This documentation is refreshed based on a file located inside
+F</home/loninst/public_html/versions>.  This file is named
+F<LATEST-IS-VERSIONNUMBER>, where
+I<VERSIONNUMBER> is the latest stable release of loncapa (e.g. 0.4 or 0.6.1).
+The F<LATEST-IS-VERSIONNUMBER> file contains a string
+that is used to date the release of the current stable version.
 
 The coding of this script is a strange brew of shell commands
 with perl.
 
 =head1 AUTHOR
 
-Scott Harrison 2002-07-19
 
 =cut
 
 # --------------------------------------------- Making the tarball distribution
+
+# In an ideal world, this tarball distribution would be always generated with
+# 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;`;
+
+# 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;`;
+
+# Generate a README file that advises them about dealing with the gunk.
 open(OUT,'>/home/loninst/auto/loncapa/README');
 print(OUT <<END);
 This is a CVS export of LON-CAPA generated on:
@@ -80,12 +91,22 @@ discuss them on one of the mailing lists
 http://mail.lon-capa.org/.
 END
 close(OUT);
+
+#'
+# Roll the directory together into the unstable tarball.
 `cd /home/loninst/auto; ln -s loncapa loncapa-unstable; tar cvvf loncapa-unstable.tar loncapa-unstable/* ;gzip -9 -f loncapa-unstable.tar`;
+
 # ---------------------------------------- Dynamically generating documentation
-`cd /home/loninst/auto/loncapa/loncom/build; make pdfdoc`;
-`cd /home/loninst/auto/loncapa/loncom/build; make doc`;
-`cd /home/loninst/auto/loncapa/loncom/build; cp docs.tar.gz /home/loninst/public_html/docs/.`;
-`cd /home/loninst/public_html/docs; tar xzf docs.tar.gz`;
+
+system("rm /home/loninst/public_html/*html");
+
+# pdf and doc targets are borken right now
+#`cd /home/loninst/auto/loncapa/loncom/build; make pdfdoc`;
+#`cd /home/loninst/auto/loncapa/loncom/build; make doc`;
+#`cd /home/loninst/auto/loncapa/loncom/build; cp docs.tar.gz /home/loninst/public_html/docs/.`;
+#`cd /home/loninst/public_html/docs; tar xzf docs.tar.gz`;
+
+`cd /home/loninst/auto/loncapa/loncom/build; make buildwebsite`;
 
 # ------------------------------------ Copying over the latest unstable tarball
 #my $filename=`cd /home/loninst/auto; find loncapa -type f -name *.tar.gz -maxdepth 1`;
@@ -95,23 +116,52 @@ close(OUT);
 `cd /home/loninst/auto; cp -f loncapa-unstable.tar.gz ../public_html/versions/loncapa-unstable.tar.gz`;
 #`cd /home/loninst/public_html/versions; rm -f loncapa-unstable.tar.gz; ln -s loncapa-$version-unstable.tar.gz loncapa-unstable.tar.gz`;
 
-#get latest version
+# ------------------------------------------------ Determine the latest version
 my $filename=`cd /home/loninst/public_html/versions; find . -type f -name LATEST-IS-* -maxdepth 1`;
 chomp($filename);
-$filename=~/LATEST-IS-(.*)/;
-my $version=$1;
+$filename =~ /LATEST-IS-(.*)/;
+my $version = $1;
 open(IN,"</home/loninst/public_html/versions/$filename");
-my $releasedate=<IN>;
+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");
-my @lines=<IN>;
+my @lines = <IN>;
 close(IN);
-my $date=`date -I`; chomp($date);
-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;
+my $date = `date -I`; chomp($date);
+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");
 print(OUT $text);
 close(OUT);
+
+#'
+# ---------------------------------------- Determine the latest testing version
+my $filename=`cd /home/loninst/public_html/versions; find . -type f -name LATEST-TESTING-IS-* -maxdepth 1`;
+chomp($filename);
+$filename =~ /LATEST-TESTING-IS-(.*)/;
+my $version = $1;
+open(IN,"</home/loninst/public_html/versions/$filename");
+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");
+my @lines = <IN>;
+close(IN);
+my $text = join('',@lines);
+if ($version) {
+    $text =~ s/LATESTTESTINGVERSION/$version/g;
+    $text =~ s/LATESTTESTINGDATE/$releasedate/g;
+    $text =~ s/TESTINGRELEASE_START//g;
+    $text =~ s/TESTINGRELEASE_END//g;
+} else {
+    $text =~ s/TESTINGRELEASE_START.*TESTINGRELEASE_END//g;
+}
+open(OUT,">/home/loninst/public_html/docs/downloads/index.html");
+print(OUT $text);
+close(OUT);
+
+system("cp /home/loninst/auto/loncapa/doc/build/*.html /home/loninst/public_html/");