--- a/Admin/makedist Wed Oct 19 14:51:12 2005 +0200
+++ b/Admin/makedist Wed Oct 19 16:32:09 2005 +0200
@@ -158,6 +158,7 @@
DISTNAME=$DISTNAME
DISTIDENT=$DISTIDENT
+DISTBASE=$DISTBASE
EOF
MOVE=$($FIND Doc \( -type f -a -not -type l -a -not -name pghead.pdf -a \( -name \*.dvi -o -name \*.eps -o -name \*.ps -o -name \*.pdf \) -a -print \) | grep -v 'gfx/.*pdf')
--- a/Admin/website/build/localconf.at.template.mak Wed Oct 19 14:51:12 2005 +0200
+++ b/Admin/website/build/localconf.at.template.mak Wed Oct 19 16:32:09 2005 +0200
@@ -6,10 +6,10 @@
#~ OUTPUTROOT=/home/proj/isabelle/website
# location of isabelle distribution packages
-ISABELLE_DIST=/home/proj/isabelle/dist/dist-Isabelle2005
+ISABELLE_DIST=$(DISTBASE)
# location of doc content file
-ISABELLE_DOC_CONTENT_FILE=$(ISABELLE_DIST)/Isabelle2005/doc/Contents
+ISABELLE_DOC_CONTENT_FILE=$(DISTBASE)/$(DISTIDENT)/doc/Contents
# dirs to copy to build target
STATICDIRS=css img media misc
@@ -34,6 +34,9 @@
# HTML tidy (needs not to be set if tidy usage is disabled, see below)
TIDY=tidy
+# rsync (if not set, use dumb cp instead)
+RSYNC=rsync
+
# set to a true value to use the "pypager iso-8859-1" hack
# (may be neccessary for older versions of HTML tidy)
FORCE_ISO_8859_1=
--- a/Admin/website/build/localconf.sun.template.mak Wed Oct 19 14:51:12 2005 +0200
+++ b/Admin/website/build/localconf.sun.template.mak Wed Oct 19 16:32:09 2005 +0200
@@ -6,10 +6,10 @@
#~ OUTPUTROOT=/home/proj/isabelle/website
# location of isabelle distribution packages
-ISABELLE_DIST=/home/proj/isabelle/dist/dist-Isabelle2005
+ISABELLE_DIST=$(DISTBASE)
# location of doc content file
-ISABELLE_DOC_CONTENT_FILE=$(ISABELLE_DIST)/Isabelle2005/doc/Contents
+ISABELLE_DOC_CONTENT_FILE=$(DISTBASE)/$(DISTIDENT)/doc/Contents
# dirs to copy to build target
STATICDIRS=css img media misc
@@ -34,6 +34,9 @@
# HTML tidy (needs not to be set if tidy usage is disabled, see below)
TIDY=tidy
+# rsync (if not set, use dumb cp instead)
+RSYNC=rsync
+
# set to a true value to use the "pypager iso-8859-1" hack
# (may be neccessary for older versions of HTML tidy)
FORCE_ISO_8859_1=
--- a/Admin/website/build/project.mak Wed Oct 19 14:51:12 2005 +0200
+++ b/Admin/website/build/project.mak Wed Oct 19 16:32:09 2005 +0200
@@ -8,10 +8,24 @@
rm -rf $(OUTPUTROOT)/dist
.PHONY: cleanproject
+ifeq ($(RSYNC),)
+
$(OUTPUTROOT)/dist: $(ISABELLE_DIST)
+ mkdir -p $@
$(COPY) -vRud $< $@
chmod -R g-w $@
+else
+
+$(OUTPUTROOT)/dist: $(ISABELLE_DIST) SYNC_ALWAYS
+ mkdir -p $@
+ $(RSYNC) -v -a --delete --delete-after $</ $@
+ chmod -R g-w $@
+
+SYNC_ALWAYS:
+
+endif
+
include/documentationdist.include.html: $(ISABELLE_DOC_CONTENT_FILE)
perl build/mkcontents.pl -p '//dist/Isabelle/doc/' $< $@