slight improvements for website
authorhaftmann
Wed Oct 19 16:32:09 2005 +0200 (2005-10-19)
changeset 179102b435795c9e9
parent 17909 7540483e9228
child 17911 fbe857bedcd7
slight improvements for website
Admin/makedist
Admin/website/build/localconf.at.template.mak
Admin/website/build/localconf.sun.template.mak
Admin/website/build/project.mak
     1.1 --- a/Admin/makedist	Wed Oct 19 14:51:12 2005 +0200
     1.2 +++ b/Admin/makedist	Wed Oct 19 16:32:09 2005 +0200
     1.3 @@ -158,6 +158,7 @@
     1.4  
     1.5  DISTNAME=$DISTNAME
     1.6  DISTIDENT=$DISTIDENT
     1.7 +DISTBASE=$DISTBASE
     1.8  EOF
     1.9  
    1.10  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')
     2.1 --- a/Admin/website/build/localconf.at.template.mak	Wed Oct 19 14:51:12 2005 +0200
     2.2 +++ b/Admin/website/build/localconf.at.template.mak	Wed Oct 19 16:32:09 2005 +0200
     2.3 @@ -6,10 +6,10 @@
     2.4  #~ OUTPUTROOT=/home/proj/isabelle/website
     2.5  
     2.6  # location of isabelle distribution packages
     2.7 -ISABELLE_DIST=/home/proj/isabelle/dist/dist-Isabelle2005
     2.8 +ISABELLE_DIST=$(DISTBASE)
     2.9  
    2.10  # location of doc content file
    2.11 -ISABELLE_DOC_CONTENT_FILE=$(ISABELLE_DIST)/Isabelle2005/doc/Contents
    2.12 +ISABELLE_DOC_CONTENT_FILE=$(DISTBASE)/$(DISTIDENT)/doc/Contents
    2.13  
    2.14  # dirs to copy to build target
    2.15  STATICDIRS=css img media misc
    2.16 @@ -34,6 +34,9 @@
    2.17  # HTML tidy (needs not to be set if tidy usage is disabled, see below)
    2.18  TIDY=tidy
    2.19  
    2.20 +# rsync (if not set, use dumb cp instead)
    2.21 +RSYNC=rsync
    2.22 +
    2.23  # set to a true value to use the "pypager iso-8859-1" hack
    2.24  # (may be neccessary for older versions of HTML tidy)
    2.25  FORCE_ISO_8859_1=
     3.1 --- a/Admin/website/build/localconf.sun.template.mak	Wed Oct 19 14:51:12 2005 +0200
     3.2 +++ b/Admin/website/build/localconf.sun.template.mak	Wed Oct 19 16:32:09 2005 +0200
     3.3 @@ -6,10 +6,10 @@
     3.4  #~ OUTPUTROOT=/home/proj/isabelle/website
     3.5  
     3.6  # location of isabelle distribution packages
     3.7 -ISABELLE_DIST=/home/proj/isabelle/dist/dist-Isabelle2005
     3.8 +ISABELLE_DIST=$(DISTBASE)
     3.9  
    3.10  # location of doc content file
    3.11 -ISABELLE_DOC_CONTENT_FILE=$(ISABELLE_DIST)/Isabelle2005/doc/Contents
    3.12 +ISABELLE_DOC_CONTENT_FILE=$(DISTBASE)/$(DISTIDENT)/doc/Contents
    3.13  
    3.14  # dirs to copy to build target
    3.15  STATICDIRS=css img media misc
    3.16 @@ -34,6 +34,9 @@
    3.17  # HTML tidy (needs not to be set if tidy usage is disabled, see below)
    3.18  TIDY=tidy
    3.19  
    3.20 +# rsync (if not set, use dumb cp instead)
    3.21 +RSYNC=rsync
    3.22 +
    3.23  # set to a true value to use the "pypager iso-8859-1" hack
    3.24  # (may be neccessary for older versions of HTML tidy)
    3.25  FORCE_ISO_8859_1=
     4.1 --- a/Admin/website/build/project.mak	Wed Oct 19 14:51:12 2005 +0200
     4.2 +++ b/Admin/website/build/project.mak	Wed Oct 19 16:32:09 2005 +0200
     4.3 @@ -8,10 +8,24 @@
     4.4  	rm -rf $(OUTPUTROOT)/dist
     4.5  .PHONY: cleanproject
     4.6  
     4.7 +ifeq ($(RSYNC),)
     4.8 +
     4.9  $(OUTPUTROOT)/dist: $(ISABELLE_DIST)
    4.10 +	mkdir -p $@
    4.11  	$(COPY) -vRud $< $@
    4.12  	chmod -R g-w $@
    4.13  
    4.14 +else
    4.15 +
    4.16 +$(OUTPUTROOT)/dist: $(ISABELLE_DIST) SYNC_ALWAYS
    4.17 +	mkdir -p $@
    4.18 +	$(RSYNC) -v -a --delete --delete-after $</ $@
    4.19 +	chmod -R g-w $@
    4.20 +
    4.21 +SYNC_ALWAYS:
    4.22 +
    4.23 +endif
    4.24 +
    4.25  include/documentationdist.include.html: $(ISABELLE_DOC_CONTENT_FILE)
    4.26  	perl build/mkcontents.pl -p '//dist/Isabelle/doc/' $< $@
    4.27