--- a/Admin/website/TODO Mon Mar 27 18:10:02 2006 +0200
+++ b/Admin/website/TODO Tue Mar 28 10:13:51 2006 +0200
@@ -1,4 +1,3 @@
-In the mid-time:
- a gentle intro enumeration on Home - "Why Isabelle?"
* stably running, mature system
* (something to say about Isar?)
--- a/Admin/website/build/localconf.at.template.mak Mon Mar 27 18:10:02 2006 +0200
+++ b/Admin/website/build/localconf.at.template.mak Tue Mar 28 10:13:51 2006 +0200
@@ -11,9 +11,6 @@
# location of doc content file
ISABELLE_DOC_CONTENT_FILE=$(DISTBASE)/$(DISTNAME)/doc/Contents
-# dirs to copy to build target
-STATICDIRS=css img media misc
-
# umask/group for target files
TARGET_UMASK_FILE=u=rw,g=rw,o=r
TARGET_UMASK_DIR=u=rwx,g=rwx,o=rx,g+s
--- a/Admin/website/build/localconf.sun.template.mak Mon Mar 27 18:10:02 2006 +0200
+++ b/Admin/website/build/localconf.sun.template.mak Tue Mar 28 10:13:51 2006 +0200
@@ -11,9 +11,6 @@
# location of doc content file
ISABELLE_DOC_CONTENT_FILE=$(DISTBASE)/$(DISTNAME)/doc/Contents
-# dirs to copy to build target
-STATICDIRS=css img media misc
-
# umask/group for target files
TARGET_UMASK_FILE=u=rw,g=rw,o=r
TARGET_UMASK_DIR=u=rwx,g=rwx,o=rx,g+s
--- a/Admin/website/build/main.mak Mon Mar 27 18:10:02 2006 +0200
+++ b/Admin/website/build/main.mak Tue Mar 28 10:13:51 2006 +0200
@@ -74,7 +74,7 @@
# build dependencies
$(DEP_FILE): $(CONF)
- build/make_dep.bash "$(FIND)" "$(OUTPUTROOT)" "$(DEP_FILE)" "$(STATICDIRS)"
+ build/make_dep.bash "$(FIND)" "$(OUTPUTROOT)" "$(DEP_FILE)" "$(STATICDIRS)" "$(STATICFILES)"
# build dependencies explicitly
depends:
--- a/Admin/website/build/make_dep.bash Mon Mar 27 18:10:02 2006 +0200
+++ b/Admin/website/build/make_dep.bash Tue Mar 28 10:13:51 2006 +0200
@@ -8,6 +8,7 @@
OUTPUTROOT="$2"
DEP_FILE="$3"
STATICDIRS="$4"
+STATICFILES="$5"
rm -f "$DEP_FILE"
touch "$DEP_FILE"
@@ -33,7 +34,7 @@
done
echo "DEP_ALLSTATIC=$allstatic" >> "$DEP_FILE"
echo >> "$DEP_FILE"
-echo 'DEP_HTML=$(DEP_ALLSTATIC) include/documentationdist.include.html $(DEP_FILE) $(CONF)' >> "$DEP_FILE"
+echo 'DEP_HTML=$(DEP_ALLSTATIC) $(STATICFILES) $(DEP_FILE) $(CONF)' >> "$DEP_FILE"
echo >> "$DEP_FILE"
allhtml=''
for html in $("$FIND" . -name "*.html" -a ! -name "*.include.html")
--- a/Admin/website/build/project.mak Mon Mar 27 18:10:02 2006 +0200
+++ b/Admin/website/build/project.mak Tue Mar 28 10:13:51 2006 +0200
@@ -7,16 +7,20 @@
@echo 'If you have no makedist at hand, check out default $@ from CVS'; \
@false; \
-project: $(OUTPUTROOT)/dist site
+STATICDIRS=css img media misc
+STATICFILES=include/documentationdist.include.html
+OUTPUTDIST=$(OUTPUTROOT)/dist-$(DISTNAME)
+
+project: $(OUTPUTDIST) site
.PHONY: project
cleanproject:
- rm -rf $(OUTPUTROOT)/dist
+ rm -rf $(OUTPUTDIST)
.PHONY: cleanproject
ifeq ($(RSYNC),)
-$(OUTPUTROOT)/dist: $(ISABELLE_DIST)
+$(OUTPUTDIST): $(ISABELLE_DIST)
mkdir -p $@
$(COPY) -vRud $</[^w]* $@
-chgrp -hR $(TARGET_GROUP) $@
@@ -24,10 +28,11 @@
-[ ! -e $@/Isabelle ] && ln -s $(ISABELLE_DIST)/$(DISTNAME) $@/Isabelle
-chgrp -h $(TARGET_GROUP) $@/Isabelle
-chmod u+w,g-w,o-w $@/Isabelle
+ ln -s $(OUTPUTDIST) $(OUTPUTROOT)/dist
else
-$(OUTPUTROOT)/dist: $(ISABELLE_DIST) SYNC_ALWAYS
+$(OUTPUTDIST): $(ISABELLE_DIST) SYNC_ALWAYS
mkdir -p $@
$(RSYNC) -v --exclude='/website/' -rlt --delete --delete-after $</ $@
-chgrp -hR $(TARGET_GROUP) $@
@@ -35,6 +40,7 @@
-[ ! -e $@/Isabelle ] && ln -s $(ISABELLE_DIST)/$(DISTNAME) $@/Isabelle
-chgrp -h $(TARGET_GROUP) $@/Isabelle
-chmod u+w,g-w,o-w $@/Isabelle
+ ln -s $(OUTPUTDIST) $(OUTPUTROOT)/dist
SYNC_ALWAYS: