r307 - scripts/trunk

lizardo at linuxfromscratch.org lizardo at linuxfromscratch.org
Thu Jun 16 18:36:12 PDT 2005


Author: lizardo
Date: 2005-06-16 19:36:11 -0600 (Thu, 16 Jun 2005)
New Revision: 307

Modified:
   scripts/trunk/update-website.mk
Log:
[www2] update-website.mk: fixes and cleanup.


Modified: scripts/trunk/update-website.mk
===================================================================
--- scripts/trunk/update-website.mk	2005-06-16 16:05:13 UTC (rev 306)
+++ scripts/trunk/update-website.mk	2005-06-17 01:36:11 UTC (rev 307)
@@ -6,12 +6,11 @@
 #	update-website.mk WWW_WC="<target_dir>" svn-checkout
 #
 # to create an initial repository on WWW_WC, if it does not exist yet. To
-# update the website manually (usually this will be done by a post-commit hook
-# script) run
+# update the entire website manually run
 #
 #	cd "<target_dir>" &&
 #	umask 002 &&
-#	./scripts/update-website.mk svn-update update-website
+#	./scripts/update-website.mk update-website
 #
 
 SVN = svn://svn.linuxfromscratch.org
@@ -30,9 +29,14 @@
 SVN2HTML2 = $(SCRIPTS)/svn2html2.pl
 SVNLOG = svn log --verbose --xml
 
+# Updates the entire website, including all subprojects
 update-website: update-alfs update-blfs update-hints update-hlfs \
-	update-lfs update-patches update-www update-timestamp
+	update-lfs update-livecd update-patches update-www
 
+# Update the backend scripts
+update-scripts:
+	svn -q update $(SCRIPTS)
+
 backup:
 	test -n "$(TARGETDIR)" && test -d "$(TARGETDIR)"
 	tar -cPf /var/tmp/website-backup-$(shell date +%Y%m%d.%s).tar $(TARGETDIR)
@@ -43,18 +47,14 @@
 # WWW_WC
 	install -g lfswww -m 2775 -d $(WWW_WC)
 	svn -q checkout $(SVN)/www2/html/trunk $(WWW_WC)
-	mkdir -p $(WWW_WC)/scripts
-	svn -q checkout $(SVN)/www2/scripts/trunk $(WWW_WC)/scripts
+	mkdir -p $(SCRIPTS)
+	svn -q checkout $(SVN)/www2/scripts/trunk $(SCRIPTS)
 	mkdir -p $(WWW_WC)/patches/downloads
 	svn -q checkout $(SVN)/patches/trunk $(WWW_WC)/patches/downloads
 	mkdir -p $(WWW_WC)/hints/downloads/files
 	svn -q checkout $(SVN)/hints/trunk $(WWW_WC)/hints/downloads/files
 	ln -s files/ATTACHMENTS $(WWW_WC)/hints/downloads/attachments
 
-svn-update:
-	svn -q update $(WWW_WC) -r $(REV)
-	svn -q update $(WWW_WC)/scripts -r $(REV)
-
 svnlog-%:
 	mkdir -p logs
 	$(SVNLOG) $(SVN)/$* 2>/dev/null | $(SVN2HTML) --with-branchname > logs/$*.html.tmp
@@ -108,20 +108,14 @@
 update-livecd: svnlog-livecd
 
 update-patches: svnlog-patches
-	svn -q update patches/downloads
+	svn -q update patches/downloads -r $(REV)
 
 update-www: svnlog-www2 #error-pages
+	svn -q update . -r $(REV)
 
-# Add the timestamp for mirrors
-# FIXME: this is done for backward compatibility, but I don't think it's
-# necessary.
-update-timestamp:
-	mkdir -p timestamp
-	date +%s > timestamp/timestamp
-
 fetch-hints:
 	find hints/downloads/files/ -type l -exec rm '{}' \;
-	svn -q update hints/downloads/files
+	svn -q update hints/downloads/files -r $(REV)
 
 hints-tarball:
 	ln -s files hints/downloads/hints




More information about the website mailing list