# HG changeset patch
# User haftmann
# Date 1193742863 -3600
# Node ID 5dbb6d583adc118848bf8183fa7ea779454ad115
# Parent  54b390300227fc92f7fc3df9ec20447806872592
improved website integration

diff -r 54b390300227 -r 5dbb6d583adc Admin/makedist
--- a/Admin/makedist	Tue Oct 30 12:14:22 2007 +0100
+++ b/Admin/makedist	Tue Oct 30 12:14:23 2007 +0100
@@ -44,14 +44,17 @@
 
   Checklist for official releases (before running this script):
 
-    * Symlink website to Admin/website
-    * Check Admin/website contents.
     * Check ANNOUNCE, README, INSTALL, NEWS, COPYRIGHT, CONTRIBUTORS.
     * Try "isatool makeall all" with Poly/ML, SML/NJ, etc.
     * Tag the current repository version, e.g.:
         cvs -d /usr/proj/isabelle-repository/archive rtag IsabelleXXXX isabelle
       PLEASE DO NOT DO THIS UNLESS YOU KNOW WHAT YOU ARE DOING!
 
+   After running this script:
+
+    * Symlink generated files in website/ directory to their appropriate
+      places in the isabelle website sources.
+
 EOF
   exit 1
 }
@@ -153,9 +156,8 @@
 
 cd "$DISTBASE/$DISTNAME" || fail "No dist directory: $DISTBASE/$DISTNAME"
 
-cp -R Admin/website ..
-mkdir -p ../website/conf
-cat > ../website/conf/distinfo.mak <<EOF
+mkdir -p ../website
+cat > ../website/distinfo.mak <<EOF
 # this is a generated file - do not edit unless you know what you are doing!
 
 DISTNAME=$DISTNAME
@@ -163,6 +165,8 @@
 DISTBASE=$DISTBASE
 EOF
 
+cp Distribution/lib/html/library_index_content.template ../website/
+
 MOVE=$($FIND Doc \( -type f -a -not -type l -a -not -name isabelle_isar.pdf -a -not -name pghead.pdf -a \( -name \*.dvi -o -name \*.eps -o -name \*.ps -o -name \*.pdf \) -a -print \) | grep -v 'gfx/.*pdf')
 mv -f $MOVE Distribution/doc
 rm Distribution/doc/Isa-logics.eps
@@ -190,7 +194,7 @@
   } >ANNOUNCE
 fi
 
-perl -pi -e "s/{ISABELLE}/$DISTNAME/g;" lib/html/library_index_header.html
+perl -pi -e "s/{ISABELLE}/$DISTNAME/g;" lib/html/library_index_header.template
 perl -pi -e "s/Isabelle repository version/$DISTVERSION/" src/Pure/ROOT.ML lib/Tools/version
 perl -pi -e "s/the internal repository version of Isabelle/$DISTVERSION/" README