r435 - scripts/trunk

lizardo at linuxfromscratch.org lizardo at linuxfromscratch.org
Tue Jul 12 17:40:36 PDT 2005


Author: lizardo
Date: 2005-07-12 18:40:35 -0600 (Tue, 12 Jul 2005)
New Revision: 435

Modified:
   scripts/trunk/update-website.mk
Log:
update-website.mk: Various fixes and cleanups; also enabled on-commit update for
40{3,4}.html (so they should not be modified directly on /home/httpd/error
anymore.)


Modified: scripts/trunk/update-website.mk
===================================================================
--- scripts/trunk/update-website.mk	2005-07-12 22:23:14 UTC (rev 434)
+++ scripts/trunk/update-website.mk	2005-07-13 00:40:35 UTC (rev 435)
@@ -67,43 +67,17 @@
 # TODO: These rules should be run by each project's post-commit script or by
 # cron jobs
 
-LFS_WWW = /home/httpd/www.linuxfromscratch.org
-
 update-alfs: svnlog2-ALFS
-	#test -n "$(TARGETDIR)"
-	#for i in view downloads; do \
-	#mkdir -p $(TARGETDIR)/alfs/$$i/; \
-	#rsync -av --delete $(LFS_WWW)/alfs/$$i/ $(TARGETDIR)/alfs/$$i/; \
-	#done
 # Temporary sync of alfs-srs until a more permanent location/rendering is set up.
 	rsync -av --delete /home/matthew/public_html/alfs-srs $(TARGETDIR)/alfs/view/
 
 update-blfs: svnlog-BLFS
-	#test -n "$(TARGETDIR)"
-	#for i in view downloads; do \
-	#mkdir -p $(TARGETDIR)/blfs/$$i/; \
-	#rsync -av --delete $(LFS_WWW)/blfs/$$i/ $(TARGETDIR)/blfs/$$i/; \
-	#done
-	#mkdir -p $(TARGETDIR)/patches/blfs/ && \
-	#rsync -av --delete $(LFS_WWW)/patches/blfs/ $(TARGETDIR)/patches/blfs/
 
 update-hints: svnlog-hints fetch-hints hints-tarball hints-symlinks hints-list
 
 update-hlfs: svnlog-HLFS
-	#test -n "$(TARGETDIR)"
-	#for i in view downloads; do \
-	#mkdir -p $(TARGETDIR)/hlfs/$$i/; \
-	#rsync -av --delete $(LFS_WWW)/hlfs/$$i/ $(TARGETDIR)/hlfs/$$i/; \
-	#done
 
 update-lfs: svnlog-LFS
-	#test -n "$(TARGETDIR)"
-	#for i in view downloads; do \
-	#mkdir -p $(TARGETDIR)/lfs/$$i/; \
-	#rsync -av --delete $(LFS_WWW)/lfs/$$i/ $(TARGETDIR)/lfs/$$i/; \
-	#done
-	#mkdir -p $(TARGETDIR)/patches/lfs/ && \
-	#rsync -av --delete $(LFS_WWW)/patches/lfs/ $(TARGETDIR)/patches/lfs/
 
 update-livecd: svnlog-livecd
 
@@ -147,18 +121,23 @@
 #	find -name \*.html -maxdepth 3 | while read file; do \
 #	xmllint --valid --noout $$file || exit 1; done
 
-# Copy these files to Apache's error directory
-#error-pages: 403.html 404.html
-#	cp 40{3,4}.html /home/httpd/error
+# Copy error pages to Apache's error directory
+.error-pages: 403.html 404.html
+	rsync -lptg --verbose 403.html 404.html /home/httpd/error/ || true
+	touch .error-pages
 
 # Copy website content to its final location
-run-rsync:
+run-rsync: update-timestamp
 	test -n "$(TARGETDIR)"
 	@echo
 	@echo "*** The following rsync command may fail to setup permissions if the"
 	@echo "*** caller is not owner of the file(s). This error can be ignored."
 	@echo
 	rsync -rlptg --verbose --delete --exclude-from=$(SCRIPTS)/rsync-excludes . $(TARGETDIR)/ || true
+
 # Temporary addition of timestamp until mirrors no longer require it
-	if [ ! -d $(TARGETDIR)/timestamp ]; then mkdir -p $(TARGETDIR)/timestamp; fi
-	date +%s > $(TARGETDIR)/timestamp/timestamp
+# NOTE: Remove update-timestamp dependency from the run-rsync target above
+# when not needed anymore.
+update-timestamp:
+	mkdir -p timestamp
+	date +%s > timestamp/timestamp




More information about the website mailing list