towards an improved website/makedist integration
authorhaftmann
Fri, 21 Oct 2005 09:18:27 +0200
changeset 17944 f5ff234ce6b3
parent 17943 48ec47217fe2
child 17945 2146e292f62f
towards an improved website/makedist integration
Admin/website/README
Admin/website/build/make_dep.bash
Admin/website/build/project.mak
--- a/Admin/website/README	Fri Oct 21 09:08:42 2005 +0200
+++ b/Admin/website/README	Fri Oct 21 09:18:27 2005 +0200
@@ -101,8 +101,9 @@
 (4) project-specific remarks
 ============================
 
-* the site is not monolithic
-* it must fit neatlessly into the Isabelle distribution and regression framework
+The whole thing should fit neatlessly into the Isabelle distribution and
+regression framework; this may explain some "features" which seem to be
+enigmatic.
 
 
 (5) the website build bed on sunbroy2
--- a/Admin/website/build/make_dep.bash	Fri Oct 21 09:08:42 2005 +0200
+++ b/Admin/website/build/make_dep.bash	Fri Oct 21 09:18:27 2005 +0200
@@ -25,7 +25,7 @@
         echo '	-chgrp $(TARGET_GROUP) $(dir $@)' >> "$DEP_FILE"
         echo '	-[ -e $@ ] && rm $@' >> "$DEP_FILE"
         echo '	cp $< $@' >> "$DEP_FILE"
-        echo '	chmod $(TARGET_UMASK_DIR) $@' >> "$DEP_FILE"
+        echo '	chmod $(TARGET_UMASK_FILE) $@' >> "$DEP_FILE"
         echo '	chgrp $(TARGET_GROUP) $@' >> "$DEP_FILE"
         allstatic="$allstatic$outputfile "
         echo >> "$DEP_FILE"
@@ -46,7 +46,7 @@
     echo '	-[ -e $@ ] && rm $@' >> "$DEP_FILE"
     echo '	$(PYTHON) build/pypager.py --dtd="dtd/" $(FORCE_ENC_CMD) --srcroot="." --dstroot="$(OUTPUTROOT)" distname="$(DISTNAME)" $< $@' >> "$DEP_FILE"
     echo '	-$(TIDYCMD) $@' >> "$DEP_FILE"
-    echo '	chmod $(TARGET_UMASK_DIR) $@' >> "$DEP_FILE"
+    echo '	chmod $(TARGET_UMASK_FILE) $@' >> "$DEP_FILE"
     echo '	chgrp $(TARGET_GROUP) $@' >> "$DEP_FILE"
     allhtml="$allhtml$outputfile "; \
     echo >> "$DEP_FILE"
--- a/Admin/website/build/project.mak	Fri Oct 21 09:08:42 2005 +0200
+++ b/Admin/website/build/project.mak	Fri Oct 21 09:18:27 2005 +0200
@@ -19,14 +19,18 @@
 $(OUTPUTROOT)/dist: $(ISABELLE_DIST)
 	mkdir -p $@
 	$(COPY) -vRud $</[^w]* $@
-	chmod -R g-w $@
+	chgrp -R $(TARGET_GROUP) $@
+	chmod -R u-w,g-w,o-w $@
+	ln -s $(ISABELLE_DIST)/$(DISTIDENT) Isabelle
 
 else
 
 $(OUTPUTROOT)/dist: $(ISABELLE_DIST) SYNC_ALWAYS
 	mkdir -p $@
 	$(RSYNC) -v --exclude='/website/' -a --delete --delete-after $</ $@
-	chmod -R g-w $@
+	chgrp -R $(TARGET_GROUP) $@
+	chmod -R u-w,g-w,o-w $@
+	ln -s $(ISABELLE_DIST)/$(DISTIDENT) Isabelle
 
 SYNC_ALWAYS: