ein bisschen Dateien hin- und herverschoben

git-svn-id: svn://svn.c3d2.de/c3d2-web/branches/toidinamais_noch_coolere_scheisse@341 31f61c52-7bfb-0310-b897-fc00f8a278f0
ds2013
toidinamai 17 years ago
parent 3ae83ac976
commit 4076510712

@ -4,7 +4,7 @@ PROCESSOR=xsltproc
PFLAGS=
# XML-Validator
VALIDATOR=xmllint
VFLAGS=--noout #--valid
VFLAGS=--noout --valid
# Downloadmanager (Alternativ: curl, fetch):
WGET=wget --timestamping
# rsync
@ -15,53 +15,45 @@ EDITOR?=vim
# Browser
BROWSER?=links
# Verzeichnis, in das exportiert werden soll
DESTDIR?=www-export
### Ressourcen ###
# XSLT-Stylesheets:
STYLE=xsl/xhtml.xsl
DS_STYLE=xsl/datenspuren/xhtml.xsl
STYLE_RSS=xsl/rss.xsl
STYLE_ATOM=xsl/atom.xsl
# Document-Type-Definition:
DTD:=dtd/c3d2web.dtd
# Navigationsleiste:
NAVIGATION=content/navigation.xml
# XML-Skeletons
SKELETONS:=$(wildcard content/skel-*.xml)
SKEL=empty
# Zu verwendendes Skeleton
SKELFILE=content/skel-$(SKEL).xml
# Dateinamen der Inhalte:
CONTENT=$(PAGES) $(NEWS_PAGES) $(DS_PAGES) $(NEWSFILES)
# Chaosupdates
# Chaosupdates:
WWW_CCC_DE_UPDATES=chaosupdates.rdf
PAGES:=$(patsubst content/%.xml, www/%.html, $(filter-out $(NAVIGATION) $(SKELETONS), $(wildcard content/*.xml)))
NEWS_PAGES:=$(patsubst content/news/%.xml, www/news/%.html, $(wildcard content/news/*.xml))
DS_PAGES:=$(patsubst content/datenspuren/%.xml, www/datenspuren/%.html, $(wildcard content/datenspuren/*.xml)) www/datenspuren/schedule.html
NEWSINDEX:=content/news.xml
NEWSITEMS:=$(filter-out $(NEWSINDEX), $(wildcard content/news/*.xml))
NEWSFILES:=www/news.html www/news-rss.xml www/news-atom.xml
DTD:=dtd/c3d2web.dtd
CLEAN=$(CONTENT) $(NEWSFILES) $(WWW_CCC_DE_UPDATES)
### Ziele ###
# Dateinamen der zu erzeugenden html-Dateien:
CONTENT=$(PAGES) $(NEWS_PAGES) $(DS_PAGES) $(NEWSFILES)
### Defaults ###
.PHONY: export contents clean mrproper all install check mirrorcontent
.PRECIOUS: content/%.xml www/%.html content/datenspuren/%.xml www/datenspuren/%.html
.SILENT: check
# 'normale' Seiten:
PAGES:=$(patsubst content/pages/%.xml, build/%.html, $(wildcard content/pages/*.xml))
# 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
# Datenspuren-Seiten:
DS_PAGES:=$(patsubst content/datenspuren/%.xml, www/datenspuren/%.html, $(wildcard content/datenspuren/*.xml)) www/datenspuren/schedule.html
all: contents
# Quellen
install: export
NEWSITEMS:=$(wildcard content/news/*.xml))
CLEAN=$(CONTENT) $(NEWSFILES) $(WWW_CCC_DE_UPDATES)
contents: $(CONTENT) $(DTD)
export: contents
$(RSYNC) $(RSYNC_FLAGS) --exclude=".svn/" www/ $(WWW_CCC_DE_UPDATES) content dtd xsl $(DESTDIR)/
### Defaults ###
www: $(CONTENT) $(DTD)
$(RSYNC) $(RSYNC_FLAGS) content/static build/ $@
.SILENT: check
.PHONY: check
check: $(PAGES)
ln -sfn $(PWD)/dtd www/DTD
# XXX
for page in $^ ; do \
echo "Checking $${page}..." ; \
$(VALIDATOR) $(VFLAGS) $${page} ; \
@ -70,41 +62,29 @@ check: $(PAGES)
### Regeln für den XSLT-Prozess ###
www/news.html: $(STYLE)
www/news-rss.xml: $(STYLE_RSS)
www/news-atom.xml: $(STYLE_ATOM)
$(NEWSFILES): $(NAVIGATION) $(NEWSINDEX)
$(VALIDATOR) $(VFLAGS) $(NEWSINDEX)
$(PROCESSOR) $(PFLAGS) -o $@ $(filter-out $(NEWSITEMS) $(NAVIGATION) $(NEWSINDEX),$^) $(NEWSINDEX)
www/news-rss.xml: xsl/rss.xsl
www/news-atom.xml: xsl/atom.xsl
$(NEWSINDEX): $(NEWSITEMS) Makefile
www/news.html www/news-rss.xml www/news-atom.xml: $(NAVIGATION) $(NEWSITEMS)
for item in $(NEWSITEMS) ; do \
$(VALIDATOR) $(VFLAGS) $${item} || exit 1 ; \
done
{ echo '<?xml version="1.0" encoding="UTF-8"?>' ; \
echo '<!DOCTYPE page SYSTEM "../dtd/c3d2web.dtd">' ; \
echo '<?xml-stylesheet type="text/xsl" href="../xsl/html.xsl" ?>' ; \
echo "<page title=\"News\">"; \
echo " <news>"; \
for item in $(patsubst content/news/%,news/%,$(NEWSITEMS)) ; do \
echo " <newsfile>$${item}</newsfile>"; \
done; \
echo " </news>"; \
echo "</page>"; } > $@
sh scripts/gen_news.xml.sh $(NEWS_ITEMS) | $(PROCESSOR) $(PFLAGS) -o $@ -
content/datenspuren/schedule.xml: www/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)
# -- MNE-20060421: Lt. Astro geht Validierung noch nicht mit dem Fahrplan,
# daher fuer Datenspuren auskommentiert
$(VALIDATOR) $(VFLAGS) $<
$(PROCESSOR) $(PFLAGS) -o $@ $(DS_STYLE) $<
www/%.html: content/%.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) $<

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE page SYSTEM "../dtd/c3d2web.dtd">
<?xml-stylesheet type="text/xsl" href="../xsl/html.xsl" ?>
<page pagetitle="" title="">
<p>
</p>
</page>

Before

Width:  |  Height:  |  Size: 164 KiB

After

Width:  |  Height:  |  Size: 164 KiB

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Before

Width:  |  Height:  |  Size: 265 B

After

Width:  |  Height:  |  Size: 265 B

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before

Width:  |  Height:  |  Size: 1006 B

After

Width:  |  Height:  |  Size: 1006 B

Before

Width:  |  Height:  |  Size: 321 B

After

Width:  |  Height:  |  Size: 321 B

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save