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
This commit is contained in:
parent
83ee79d374
commit
3eb940bd0f
52
Makefile
52
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
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE page SYSTEM "../../dtd/c3d2web.dtd">
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
|
||||
<page title="Call for Papers">
|
||||
<p class="title">Call for Papers</p>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE page SYSTEM "../../dtd/c3d2web.dtd">
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
|
||||
<page title="Home">
|
||||
<dl>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
<!DOCTYPE page SYSTEM "../../dtd/c3d2web.dtd">
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
|
||||
<page title="Info">
|
||||
<p class="title">Datenspuren - Privatsphäre war gestern</p>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE page SYSTEM "../../dtd/c3d2web.dtd">
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
|
||||
<page title="Mitschnitte">
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE page SYSTEM "../../dtd/c3d2web.dtd">
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
|
||||
<page title="Netzwerk">
|
||||
<p>Cover, Concealment, Camouflage, Denial and Deception</p>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
<!DOCTYPE page SYSTEM "../../dtd/c3d2web.dtd">
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
|
||||
<page title="Creative Commons - Party">
|
||||
<p class="title">Privacy meets free music</p>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
<!DOCTYPE page SYSTEM "../../dtd/c3d2web.dtd">
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
|
||||
<page title="Presseinformationen">
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE page SYSTEM "../../dtd/c3d2web.dtd">
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
|
||||
<page title="Ort">
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE page SYSTEM "../../dtd/c3d2web.dtd">
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
|
||||
<page title="Vorträge">
|
||||
<p>
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<navigation>
|
||||
<file>kontakt</file>
|
||||
<file>mailingliste</file>
|
||||
<file>wiki</file>
|
||||
<file>silc</file>
|
||||
<file>impressum</file>
|
||||
<file>pages/kontakt</file>
|
||||
<file>pages/mailingliste</file>
|
||||
<file>pages/wiki</file>
|
||||
<file>pages/silc</file>
|
||||
<file>pages/impressum</file>
|
||||
</navigation>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE item SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
|
||||
<item title="22C3: Private Investigation is around the corner" date="2005-11-05T23:05:50" author="Fnordic walker" category="Allgemein">
|
||||
<image title="22C3">http://www.c3d2.de/typo3temp/pics/8de5efab18.png</image>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE item SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
|
||||
<item title="C3D2-Web ist für Matthias einfach genug" date="2005-12-20T23:05:50" author="BSD-Crew" category="Allgemein">
|
||||
<image title="NetBSD rulez! But FreeBSD is simply better!!!111oneoneoneeleventhousandeleven">http://matthias.bsd-crew.de/pix/1.jpg</image>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE item SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
|
||||
<item title="Datenspuren Audio-Tracks 05" date="2006-05-18T10:00:00" author="toidinamai" category="Allgemein">
|
||||
<image title="Bild einer Datenspur">http://www.c3d2.de/typo3temp/pics/294776b4ed.gif</image>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE item SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
|
||||
<item title="Datenspuren Audio-Tracks 05" date="2005-05-30T23:05:50" author="Fnordic walker" category="Allgemein">
|
||||
<image title="Bild einer Datenspur">http://www.c3d2.de/typo3temp/pics/294776b4ed.gif</image>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE item SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
|
||||
<item title="Datenspuren 2006" date="2005-11-13T23:05:50" author="c3d2 himself!!!" category="Allgemein">
|
||||
<image title="Eine Datenspur">http://www.c3d2.de/typo3temp/pics/6def158186.gif</image>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE item SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
|
||||
<item title="TA: Hacktivismus" date="2005-07-30T23:05:50" author="Fnordic walker" category="Themenabend">
|
||||
<p>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE item SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
|
||||
<item title="Linux-Info-Tag" date="2005-10-07T00:05:50" author="Fnordic walker" category="Allgemein">
|
||||
<image title="Dicker Pinguin">http://www.c3d2.de/uploads/pics/tux_01.png</image>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE item SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
|
||||
<item title="Mailingliste" date="2005-08-24T00:05:50" author="Fnordic walker" category="Allgemein">
|
||||
<image title="Delivered by mailman">http://www.c3d2.de/typo3temp/pics/9cc3346202.jpg</image>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE item SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
|
||||
<item title="Pentabarf 0.2.3 released" date="2006-05-23T00:23:05" author="Sven" category="Projekte">
|
||||
<image title="Pentabarf Logo">http://pentabarf.org/erisdiscordia-128x128.png</image>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE item SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
|
||||
<item title="Silc.dresden.ccc.de" date="2005-04-13T05:23:05" author="Fnordic walker" category="Allgemein">
|
||||
<image title="Secure Internet Live Conferencing">http://www.c3d2.de/typo3temp/pics/aa268d9e62.gif</image>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE item SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
|
||||
<item title="TA: Ruby & Ruby on Rails" date="2006-03-19T19:00:00" author="Astro" category="Themenabend">
|
||||
<image title="Ruby">http://www.rubygarden.com/ruby.jpg</image>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE item SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
|
||||
<item title="XML ist cool" date="2006-01-12T11:53:27" author="toidinamai" category="Allgemein">
|
||||
<p>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE page SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../xsl/html.xsl" ?>
|
||||
|
||||
<page title="Impressum">
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE page SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../xsl/html.xsl" ?>
|
||||
|
||||
<page title="Kontakt" pagetitle="E-Mail">
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE page SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../xsl/html.xsl" ?>
|
||||
|
||||
<page title="Mailingliste">
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE page SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../xsl/html.xsl" ?>
|
||||
|
||||
<page pagetitle="Secure Internet Live Conferencing" title="SILC">
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE page SYSTEM "c3d2web.dtd">
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
<?xml-stylesheet type="text/xsl" href="../xsl/html.xsl" ?>
|
||||
|
||||
<page title="Wiki" pagetitle="WikiWikiWeb">
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
<!ELEMENT news (newsfile)+>
|
||||
<!ELEMENT newsfile (#PCDATA)>
|
||||
|
||||
<!ELEMENT item ((image)?, (p|pre|dl)+)>
|
||||
<!ELEMENT item ((image)?, (p|pre|dl|addendum)+)>
|
||||
<!ATTLIST item
|
||||
title CDATA #REQUIRED
|
||||
date CDATA #REQUIRED
|
||||
|
@ -20,6 +20,8 @@
|
|||
category CDATA #REQUIRED
|
||||
>
|
||||
|
||||
<!ELEMENT addendum (p|pre|dl|ul|ol)*>
|
||||
|
||||
<!ELEMENT p %Inline;>
|
||||
<!ATTLIST p
|
||||
class CDATA #IMPLIED
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
#!/bin/sh
|
||||
cat <<EOF
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE catalog
|
||||
PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
|
||||
"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
|
||||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
||||
<group xml:base="file://${PWD}/">
|
||||
<system systemId="http://www.c3d2.de/dtd/c3d2web.dtd" uri="dtd/c3d2web.dtd"/>
|
||||
<public publicId="-//W3C//DTD XHTML 1.0 Strict//EN" uri="dtd/xhtml1-strict.dtd"/>
|
||||
</group>
|
||||
</catalog>
|
||||
EOF
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
cat <<EOF
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<page title="News">"
|
||||
<page title="News">
|
||||
<news>
|
||||
EOF
|
||||
|
||||
|
|
Loading…
Reference in New Issue