From 3eb940bd0f611db002890a7ee8792c2e5e1bd666 Mon Sep 17 00:00:00 2001 From: toidinamai Date: Wed, 31 May 2006 17:45:49 +0000 Subject: [PATCH] checking against c3d2web.dtd works again git-svn-id: svn://svn.c3d2.de/c3d2-web/branches/toidinamais_noch_coolere_scheisse@344 31f61c52-7bfb-0310-b897-fc00f8a278f0 --- Makefile | 52 ++++++++++--------- content/datenspuren/cfp.xml | 2 +- content/datenspuren/index.xml | 2 +- content/datenspuren/info.xml | 2 +- content/datenspuren/mitschnitte.xml | 2 +- content/datenspuren/netzwerk.xml | 2 +- content/datenspuren/party.xml | 2 +- content/datenspuren/presse.xml | 2 +- content/datenspuren/veranstaltungsort.xml | 2 +- content/datenspuren/vortraege.xml | 2 +- content/navigation.xml | 10 ++-- content/news/22c3.xml | 2 +- content/news/c3d2-web.xml | 2 +- .../news/datenspuren2005-audio-reloaded.xml | 2 +- content/news/datenspuren2005-audio.xml | 2 +- content/news/datenspuren2006.xml | 2 +- content/news/hacktivismus.xml | 2 +- content/news/linux-info-tag-2005.xml | 2 +- content/news/mailingliste.xml | 2 +- content/news/pentabarf-0.2.3.xml | 2 +- content/news/silc.xml | 2 +- content/news/ta-ruby.xml | 2 +- content/news/xml-ist-cool.xml | 2 +- content/pages/impressum.xml | 2 +- content/pages/kontakt.xml | 2 +- content/pages/mailingliste.xml | 2 +- content/pages/silc.xml | 2 +- content/pages/wiki.xml | 2 +- dtd/c3d2web.dtd | 4 +- scripts/gen_catalog.xml.sh | 13 +++++ scripts/gen_news.xml.sh | 2 +- 31 files changed, 75 insertions(+), 58 deletions(-) create mode 100644 scripts/gen_catalog.xml.sh diff --git a/Makefile b/Makefile index d38c37c18..33952d983 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,12 @@ ### Programme ### # XSLT-Prozessor: PROCESSOR=xsltproc -PFLAGS= +PFLAGS=--catalogs # XML-Validator VALIDATOR=xmllint -VFLAGS=--noout --valid +VFLAGS=--noout --valid --catalogs +SGML_CATALOG_FILES=$(XML_CATALOG) +export SGML_CATALOG_FILES # Downloadmanager (Alternativ: curl, fetch): WGET=wget --timestamping # rsync @@ -21,6 +23,8 @@ STYLE=xsl/xhtml.xsl DS_STYLE=xsl/datenspuren/xhtml.xsl # Document-Type-Definition: DTD:=dtd/c3d2web.dtd +# XML-Katalog (Pfad zu den DTDs) - wird benötigt vom Validator +XML_CATALOG:=dtd/catalog.xml # Navigationsleiste: NAVIGATION=content/navigation.xml # Chaosupdates: @@ -35,20 +39,19 @@ PAGES:=$(patsubst content/pages/%.xml, build/%.html, $(wildcard content/pages/*. # Seiten zu einzelnen News-Items: NEWS_PAGES:=$(patsubst content/news/%.xml, build/news/%.html, $(wildcard content/news/*.xml)) # News-Index und Feeds: -NEWSFILES:=www/news.html www/news-rss.xml www/news-atom.xml +NEWSFILES:=build/news.html build/news-rss.xml build/news-atom.xml # Datenspuren-Seiten: -DS_PAGES:=$(patsubst content/datenspuren/%.xml, www/datenspuren/%.html, $(wildcard content/datenspuren/*.xml)) www/datenspuren/schedule.html +DS_PAGES:=$(patsubst content/datenspuren/%.xml, build/datenspuren/%.html, $(wildcard content/datenspuren/*.xml)) build/datenspuren/schedule.html # Quellen - -NEWSITEMS:=$(wildcard content/news/*.xml)) -CLEAN=$(CONTENT) $(NEWSFILES) $(WWW_CCC_DE_UPDATES) +NEWSITEMS:=$(wildcard content/news/*.xml) +CLEAN=$(CONTENT) $(NEWSFILES) $(WWW_CCC_DE_UPDATES) $(DS_PAGES) ### Defaults ### -www: $(CONTENT) $(DTD) - $(RSYNC) $(RSYNC_FLAGS) content/static build/ $@ +www: $(XML_CATALOG) $(CONTENT) + $(RSYNC) $(RSYNC_FLAGS) content/static/ build/ $@ .SILENT: check .PHONY: check @@ -58,37 +61,40 @@ check: $(PAGES) echo "Checking $${page}..." ; \ $(VALIDATOR) $(VFLAGS) $${page} ; \ done - rm -f www/DTD ### Regeln für den XSLT-Prozess ### -www/news.html: $(STYLE) -www/news-rss.xml: xsl/rss.xsl -www/news-atom.xml: xsl/atom.xsl -www/news.html www/news-rss.xml www/news-atom.xml: $(NAVIGATION) $(NEWSITEMS) +build/news.html: $(STYLE) +build/news-rss.xml: xsl/rss.xsl +build/news-atom.xml: xsl/atom.xsl + +$(NEWSFILES) : STYLE=$(filter-out $(NEWSITEMS) $(NAVIGATION),$^) +$(NEWSFILES): $(NAVIGATION) $(NEWSITEMS) for item in $(NEWSITEMS) ; do \ $(VALIDATOR) $(VFLAGS) $${item} || exit 1 ; \ done - sh scripts/gen_news.xml.sh $(NEWS_ITEMS) | $(PROCESSOR) $(PFLAGS) -o $@ - + sh scripts/gen_news.xml.sh $(NEWSITEMS) | $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) - -content/datenspuren/schedule.xml: www/datenspuren/fahrplan/days.de.html +content/datenspuren/schedule.xml: content/static/datenspuren/fahrplan/days.de.html cp $< $@ build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) $(VALIDATOR) $(VFLAGS) $< $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $< -www/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE) +build/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE) # -- MNE-20060421: Lt. Astro geht Validierung noch nicht mit dem Fahrplan, # daher fuer Datenspuren auskommentiert $(VALIDATOR) $(VFLAGS) $< $(PROCESSOR) $(PFLAGS) -o $@ $(DS_STYLE) $< +build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) + $(VALIDATOR) $(VFLAGS) $< + $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $< -#www/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) -# $(VALIDATOR) $(VFLAGS) $< -# $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $< +dtd/catalog.xml: + sh scripts/gen_catalog.xml.sh > $@ ### Die neuesten Chaosupdates holen ### $(WWW_CCC_DE_UPDATES): @@ -96,10 +102,6 @@ $(WWW_CCC_DE_UPDATES): cp chaosupdates-2006-01-02.rdf $@ ### Mr. Propper ### +.PHONY: clean clean: rm -f $(CLEAN) - -mrproper: clean - rm -f $(WWW_CCC_DE_UPDATES) - rm -f $(XHTML_DTD_FILES) - rm -rf www-export diff --git a/content/datenspuren/cfp.xml b/content/datenspuren/cfp.xml index 7db671cd4..4680ecc0b 100644 --- a/content/datenspuren/cfp.xml +++ b/content/datenspuren/cfp.xml @@ -1,5 +1,5 @@ - +

Call for Papers

diff --git a/content/datenspuren/index.xml b/content/datenspuren/index.xml index c86e539f2..16c3be310 100644 --- a/content/datenspuren/index.xml +++ b/content/datenspuren/index.xml @@ -1,5 +1,5 @@ - +
diff --git a/content/datenspuren/info.xml b/content/datenspuren/info.xml index ed36a89ea..49ff16c51 100644 --- a/content/datenspuren/info.xml +++ b/content/datenspuren/info.xml @@ -1,5 +1,5 @@ - +

Datenspuren - Privatsphäre war gestern

diff --git a/content/datenspuren/mitschnitte.xml b/content/datenspuren/mitschnitte.xml index c547b3ec9..7ef4d6f26 100644 --- a/content/datenspuren/mitschnitte.xml +++ b/content/datenspuren/mitschnitte.xml @@ -1,5 +1,5 @@ - + diff --git a/content/datenspuren/netzwerk.xml b/content/datenspuren/netzwerk.xml index 4df956fe8..61838131f 100644 --- a/content/datenspuren/netzwerk.xml +++ b/content/datenspuren/netzwerk.xml @@ -1,5 +1,5 @@ - +

Cover, Concealment, Camouflage, Denial and Deception

diff --git a/content/datenspuren/party.xml b/content/datenspuren/party.xml index 0cc5e6658..8015853e5 100644 --- a/content/datenspuren/party.xml +++ b/content/datenspuren/party.xml @@ -1,5 +1,5 @@ - +

Privacy meets free music

diff --git a/content/datenspuren/presse.xml b/content/datenspuren/presse.xml index 97020f16f..5070d6247 100644 --- a/content/datenspuren/presse.xml +++ b/content/datenspuren/presse.xml @@ -1,5 +1,5 @@ - + diff --git a/content/datenspuren/veranstaltungsort.xml b/content/datenspuren/veranstaltungsort.xml index 0444f94e8..508668d4e 100644 --- a/content/datenspuren/veranstaltungsort.xml +++ b/content/datenspuren/veranstaltungsort.xml @@ -1,5 +1,5 @@ - + diff --git a/content/datenspuren/vortraege.xml b/content/datenspuren/vortraege.xml index d4715f73d..d1e852648 100644 --- a/content/datenspuren/vortraege.xml +++ b/content/datenspuren/vortraege.xml @@ -1,5 +1,5 @@ - +

diff --git a/content/navigation.xml b/content/navigation.xml index 378c5ce20..8e1f95e8c 100644 --- a/content/navigation.xml +++ b/content/navigation.xml @@ -1,9 +1,9 @@ - kontakt - mailingliste - wiki - silc - impressum + pages/kontakt + pages/mailingliste + pages/wiki + pages/silc + pages/impressum diff --git a/content/news/22c3.xml b/content/news/22c3.xml index fa4a27033..2e66e68d3 100644 --- a/content/news/22c3.xml +++ b/content/news/22c3.xml @@ -1,5 +1,5 @@ - + http://www.c3d2.de/typo3temp/pics/8de5efab18.png diff --git a/content/news/c3d2-web.xml b/content/news/c3d2-web.xml index cea1f11a9..d4d529c4f 100644 --- a/content/news/c3d2-web.xml +++ b/content/news/c3d2-web.xml @@ -1,5 +1,5 @@ - + http://matthias.bsd-crew.de/pix/1.jpg diff --git a/content/news/datenspuren2005-audio-reloaded.xml b/content/news/datenspuren2005-audio-reloaded.xml index 48c5e8dd0..7499d0d60 100644 --- a/content/news/datenspuren2005-audio-reloaded.xml +++ b/content/news/datenspuren2005-audio-reloaded.xml @@ -1,5 +1,5 @@ - + http://www.c3d2.de/typo3temp/pics/294776b4ed.gif diff --git a/content/news/datenspuren2005-audio.xml b/content/news/datenspuren2005-audio.xml index efc9966e1..53e33b20d 100644 --- a/content/news/datenspuren2005-audio.xml +++ b/content/news/datenspuren2005-audio.xml @@ -1,5 +1,5 @@ - + http://www.c3d2.de/typo3temp/pics/294776b4ed.gif diff --git a/content/news/datenspuren2006.xml b/content/news/datenspuren2006.xml index cb613d35c..ce335c0f4 100644 --- a/content/news/datenspuren2006.xml +++ b/content/news/datenspuren2006.xml @@ -1,5 +1,5 @@ - + http://www.c3d2.de/typo3temp/pics/6def158186.gif diff --git a/content/news/hacktivismus.xml b/content/news/hacktivismus.xml index 929b4594e..5405901af 100644 --- a/content/news/hacktivismus.xml +++ b/content/news/hacktivismus.xml @@ -1,5 +1,5 @@ - +

diff --git a/content/news/linux-info-tag-2005.xml b/content/news/linux-info-tag-2005.xml index f0f47efac..bade546d6 100644 --- a/content/news/linux-info-tag-2005.xml +++ b/content/news/linux-info-tag-2005.xml @@ -1,5 +1,5 @@ - + http://www.c3d2.de/uploads/pics/tux_01.png diff --git a/content/news/mailingliste.xml b/content/news/mailingliste.xml index 4d05309de..7d4fc3343 100644 --- a/content/news/mailingliste.xml +++ b/content/news/mailingliste.xml @@ -1,5 +1,5 @@ - + http://www.c3d2.de/typo3temp/pics/9cc3346202.jpg diff --git a/content/news/pentabarf-0.2.3.xml b/content/news/pentabarf-0.2.3.xml index 35a8c6002..007ba6488 100644 --- a/content/news/pentabarf-0.2.3.xml +++ b/content/news/pentabarf-0.2.3.xml @@ -1,5 +1,5 @@ - + http://pentabarf.org/erisdiscordia-128x128.png diff --git a/content/news/silc.xml b/content/news/silc.xml index 5c75faf82..8f3ccbd08 100644 --- a/content/news/silc.xml +++ b/content/news/silc.xml @@ -1,5 +1,5 @@ - + http://www.c3d2.de/typo3temp/pics/aa268d9e62.gif diff --git a/content/news/ta-ruby.xml b/content/news/ta-ruby.xml index 949e3fcd1..bd9a323f9 100644 --- a/content/news/ta-ruby.xml +++ b/content/news/ta-ruby.xml @@ -1,5 +1,5 @@ - + http://www.rubygarden.com/ruby.jpg diff --git a/content/news/xml-ist-cool.xml b/content/news/xml-ist-cool.xml index 674864089..21925e167 100644 --- a/content/news/xml-ist-cool.xml +++ b/content/news/xml-ist-cool.xml @@ -1,5 +1,5 @@ - +

diff --git a/content/pages/impressum.xml b/content/pages/impressum.xml index 8d271d930..da6ff9d3d 100644 --- a/content/pages/impressum.xml +++ b/content/pages/impressum.xml @@ -1,5 +1,5 @@ - + diff --git a/content/pages/kontakt.xml b/content/pages/kontakt.xml index 609137aaf..5c4890fe1 100644 --- a/content/pages/kontakt.xml +++ b/content/pages/kontakt.xml @@ -1,5 +1,5 @@ - + diff --git a/content/pages/mailingliste.xml b/content/pages/mailingliste.xml index 8ed23cb07..667383999 100644 --- a/content/pages/mailingliste.xml +++ b/content/pages/mailingliste.xml @@ -1,5 +1,5 @@ - + diff --git a/content/pages/silc.xml b/content/pages/silc.xml index 56fd9cbc6..400a22e29 100644 --- a/content/pages/silc.xml +++ b/content/pages/silc.xml @@ -1,5 +1,5 @@ - + diff --git a/content/pages/wiki.xml b/content/pages/wiki.xml index c1b30292b..57e561b69 100644 --- a/content/pages/wiki.xml +++ b/content/pages/wiki.xml @@ -1,5 +1,5 @@ - + diff --git a/dtd/c3d2web.dtd b/dtd/c3d2web.dtd index 353f7f424..65ea411fe 100644 --- a/dtd/c3d2web.dtd +++ b/dtd/c3d2web.dtd @@ -12,7 +12,7 @@ - + + + + + + + + + + +EOF diff --git a/scripts/gen_news.xml.sh b/scripts/gen_news.xml.sh index 4d461e489..f9a4c896e 100644 --- a/scripts/gen_news.xml.sh +++ b/scripts/gen_news.xml.sh @@ -2,7 +2,7 @@ cat < -" + EOF