diff --git a/Makefile b/Makefile index 6f29502082..09852688c2 100644 --- a/Makefile +++ b/Makefile @@ -9,23 +9,17 @@ # libxslt + libxml2 (xsltproc) # http://www.xmlsoft.org/ # -# XML validator -# ------------- -# apt-get install rxp -# or -# ftp://ftp.cogsci.ed.ac.uk/pub/richard/rxp-1.2.3.tar.gz -# -XSLTPROC = sabcmd +XSLTPROC = xsltproc FSFFRANCE = http://france.fsfeurope.org -FSFEUROPE = http://www.fsfeurope.org +FSFEUROPE = . # http://www.fsfeurope.org FSF = http://www.fsf.org GNU = http://www.gnu.org XSLTOPTS = \ - '$$fsffrance=$(FSFFRANCE)' \ - '$$fsf=$(FSF)' \ - '$$gnu=$(GNU)' + --param fsffrance $(FSFFRANCE) \ + --param fsf $(FSF) \ + --param gnu $(GNU) ENPAGES = $(shell find * -path 'fr' -prune -o -regex '[^\.]*\.xhtml' -print | sed "s/xhtml$$/html/") @@ -42,7 +36,7 @@ $(ENPAGES): %.html: %.xhtml fsfe.xsl navigation.en.xsl filebase=`basename $$base` ; \ dir=`dirname $$path` ; \ root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \ - $(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \ + $(XSLTPROC) $(XSLTOPTS) '--param fsfeurope '$$root '--param filebase '$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \ rm -f $$base.html-temp $(FRPAGES): %.html: %.xhtml fsfe.xsl navigation.fr.xsl @@ -52,7 +46,7 @@ $(FRPAGES): %.html: %.xhtml fsfe.xsl navigation.fr.xsl filebase=`basename $$base` ; \ dir=`dirname $$path` ; \ root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \ - $(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \ + $(XSLTPROC) $(XSLTOPTS) '--param fsfeurope '$$root '--param filebase '$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \ rm -f $$base.html-temp $(DEPAGES): %.html: %.xhtml fsfe.xsl navigation.de.xsl @@ -62,7 +56,7 @@ $(DEPAGES): %.html: %.xhtml fsfe.xsl navigation.de.xsl filebase=`basename $$base` ; \ dir=`dirname $$path` ; \ root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \ - $(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase '$$path='$$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \ + $(XSLTPROC) $(XSLTOPTS) '--param fsfeurope='$$root '--param filebase='$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \ rm -f $$base.html-temp # remove html files for which an xhtml version exists (exclude fr/) diff --git a/Makefile.xsltproc b/Makefile.xsltproc new file mode 100644 index 0000000000..09852688c2 --- /dev/null +++ b/Makefile.xsltproc @@ -0,0 +1,66 @@ +# Authors: Loic Dachary and Jaime Villate +# +# XML/XSLT processor (validator) +# ------------------------- +# +# sablotron (sabcmd) +# apt-get install sablotron +# +# libxslt + libxml2 (xsltproc) +# http://www.xmlsoft.org/ +# +XSLTPROC = xsltproc + +FSFFRANCE = http://france.fsfeurope.org +FSFEUROPE = . # http://www.fsfeurope.org +FSF = http://www.fsf.org +GNU = http://www.gnu.org + +XSLTOPTS = \ + --param fsffrance $(FSFFRANCE) \ + --param fsf $(FSF) \ + --param gnu $(GNU) + +ENPAGES = $(shell find * -path 'fr' -prune -o -regex '[^\.]*\.xhtml' -print | sed "s/xhtml$$/html/") + +FRPAGES = $(shell find * -path 'fr' -prune -o -regex '.*\.fr\.xhtml' -print | sed "s/xhtml$$/html/") + +DEPAGES = $(shell find * -path 'fr' -prune -o -regex '.*\.de\.xhtml' -print | sed "s/xhtml$$/html/") + +all: $(ENPAGES) $(FRPAGES) $(DEPAGES) + +$(ENPAGES): %.html: %.xhtml fsfe.xsl navigation.en.xsl + @echo "Building $@ ..."; \ + path=$< ; \ + base=`expr $$path : '\(.*\).xhtml'` ; \ + filebase=`basename $$base` ; \ + dir=`dirname $$path` ; \ + root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \ + $(XSLTPROC) $(XSLTOPTS) '--param fsfeurope '$$root '--param filebase '$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \ + rm -f $$base.html-temp + +$(FRPAGES): %.html: %.xhtml fsfe.xsl navigation.fr.xsl + @echo "Building $@ ..."; \ + path=$< ; \ + base=`expr $$path : '\(.*\).xhtml'` ; \ + filebase=`basename $$base` ; \ + dir=`dirname $$path` ; \ + root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \ + $(XSLTPROC) $(XSLTOPTS) '--param fsfeurope '$$root '--param filebase '$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \ + rm -f $$base.html-temp + +$(DEPAGES): %.html: %.xhtml fsfe.xsl navigation.de.xsl + @echo "Building $@ ..."; \ + path=$< ; \ + base=`expr $$path : '\(.*\).xhtml'` ; \ + filebase=`basename $$base` ; \ + dir=`dirname $$path` ; \ + root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \ + $(XSLTPROC) $(XSLTOPTS) '--param fsfeurope='$$root '--param filebase='$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \ + rm -f $$base.html-temp + +# remove html files for which an xhtml version exists (exclude fr/) +clean: + rm -f $(ENPAGES) $(FRPAGES) $(DEPAGES) + + diff --git a/background.fr.xhtml b/background.fr.xhtml new file mode 100644 index 0000000000..5bbb690287 --- /dev/null +++ b/background.fr.xhtml @@ -0,0 +1,59 @@ + + + + + FSF Europe - Background + + + +
+
+ [ + + English | + Français + ] +
+ + +

Fond

+ +

Vous trouverez dans cette section des informations + sur le Logiciel Libre, le Projet GNU, la Free Software Foundation + et la FSF Europe +

+ + + +
+ + Last update: + + $Date$ $Author$ + + + + + diff --git a/background.xhtml b/background.xhtml index 335da3cd26..53b2342722 100644 --- a/background.xhtml +++ b/background.xhtml @@ -12,7 +12,8 @@
[ - English + English | + Français ]
diff --git a/index.fr.xhtml b/index.fr.xhtml index fde14aab45..082d058b8f 100644 --- a/index.fr.xhtml +++ b/index.fr.xhtml @@ -29,6 +29,13 @@ centrée sur le Projet GNU, sans y être toutefois limitée.

+ +

Les activités de la FSF Europe ont débuté le + 10 mars 2001. Vous trouverez des informations générales + sur le logiciel libre, la "Free Software Fundation" et la + FSF Europe dans section background +

+ diff --git a/navigation.fr.xsl b/navigation.fr.xsl index de1d7f7165..fd6e37b931 100644 --- a/navigation.fr.xsl +++ b/navigation.fr.xsl @@ -51,8 +51,8 @@ Free Software - l'entreprise et l'individu sur un pied d'égalité - What's Free Software?
- What's the GNU Project?
+ Qu'est-ce que le Logiciel Libre?
+ Qu'est-ce que le Projet GNU?
@@ -74,16 +74,16 @@
- Home
- Home
+ Contact
- Background
- Mailing Lists
Press section
- GNU Business Network