r450 - scripts/trunk

lizardo at linuxfromscratch.org lizardo at linuxfromscratch.org
Wed Jul 13 13:08:56 PDT 2005


Author: lizardo
Date: 2005-07-13 14:08:55 -0600 (Wed, 13 Jul 2005)
New Revision: 450

Modified:
   scripts/trunk/update-website.mk
Log:
update-website.mk: various fixes/cleanups; added template update-on-commit
support for swish-e.


Modified: scripts/trunk/update-website.mk
===================================================================
--- scripts/trunk/update-website.mk	2005-07-13 17:48:06 UTC (rev 449)
+++ scripts/trunk/update-website.mk	2005-07-13 20:08:55 UTC (rev 450)
@@ -22,9 +22,11 @@
 WWW_WC = $(PWD)
 
 # Website location (defined on the Subversion hook script)
-#TARGETDIR = /home/httpd/test.linuxfromscratch.org
+#TARGETDIR = /home/httpd/www.linuxfromscratch.org
 
 SCRIPTS = $(WWW_WC)/scripts
+TEMPLATES = $(WWW_WC)/templates
+
 SVN2HTML = $(SCRIPTS)/svn2html.pl
 SVN2HTML2 = $(SCRIPTS)/svn2html2.pl
 SVNLOG = svn log --verbose --xml
@@ -46,6 +48,8 @@
 	svn -q checkout $(SVN)/www2/html/trunk $(WWW_WC)
 	mkdir -p $(SCRIPTS)
 	svn -q checkout $(SVN)/www2/scripts/trunk $(SCRIPTS)
+	mkdir -p $(TEMPLATES)
+	svn -q checkout $(SVN)/www2/templates/trunk $(TEMPLATES)
 	mkdir -p $(WWW_WC)/patches/downloads
 	svn -q checkout $(SVN)/patches/trunk $(WWW_WC)/patches/downloads
 	mkdir -p $(WWW_WC)/hints/downloads/files
@@ -79,7 +83,8 @@
 
 update-blfs: svnlog-BLFS blfs/feed.rss
 
-update-hints: svnlog-hints fetch-hints hints-tarball hints-symlinks hints-list hints/feed.rss
+update-hints: svnlog-hints svn-hints hints-tarball hints-symlinks hints-list \
+	hints/feed.rss
 
 update-hlfs: svnlog-HLFS hlfs/feed.rss
 
@@ -90,13 +95,18 @@
 update-patches: svnlog-patches patches/feed.rss
 	svn -q update patches/downloads -r $(REV)
 
-update-www: svnlog-www2 .stamp.error-pages feed.rss
-	svn -q update . -r $(REV)
+update-www: svn-www svnlog-www2 feed.rss error-pages update-templates
 
 update-scripts:
 	svn -q update $(SCRIPTS) -r $(REV)
 
-fetch-hints:
+update-templates: /home/httpd/search.linuxfromscratch.org/swish.tmpl
+
+svn-www:
+	svn -q update . -r $(REV)
+	svn -q update $(TEMPLATES) -r $(REV)
+
+svn-hints:
 	find hints/downloads/files/ -type l -exec rm '{}' \;
 	svn -q update hints/downloads/files -r $(REV)
 
@@ -118,22 +128,24 @@
 hints-list:
 	cd hints && $(SCRIPTS)/genlist.sh
 
+# Copy error pages to Apache's error directory
+error-pages: /home/httpd/error/403.html /home/httpd/error/404.html
+
+/home/httpd/error/40%.html: 40%.html
+	cp -p $< $@
+
+# Copy Swish-e template
+/home/httpd/search.linuxfromscratch.org/swish.tmpl: $(TEMPLATES)/swish.tmpl
+	cp -p $< $@
+
 # Validate XHTML files
 # FIXME: better on a pre-commit script?
-# TODO: validation not possible with SSI? We should find a way to validate
-# the HTML code, though.
-validate:
-	true
+#validate:
 #	test -n "$(TARGETDIR)"
 #	cd $(TARGETDIR) && \
 #	find -name \*.html -maxdepth 3 | while read file; do \
 #	xmllint --valid --noout $$file || exit 1; done
 
-# Copy error pages to Apache's error directory
-.stamp.error-pages: 403.html 404.html
-	cp -p 403.html 404.html /home/httpd/error/
-	touch .stamp.error-pages
-
 # Copy website content to its final location
 run-rsync: update-timestamp
 	test -n "$(TARGETDIR)"




More information about the website mailing list