From 27d872e551a21ba8584af518c4fab31487d647fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reinhard=20M=C3=BCller?= Date: Sun, 10 Mar 2019 01:12:46 +0100 Subject: [PATCH] Change the directory for generated news xml files With this change, generated xml files for news articles are now built in the same direcotry as the xhtml file lies in; this will enable us to select news by year in .source files. --- .gitignore | 2 +- Makefile | 2 +- activities/education/education.sources | 2 +- activities/ftf/avm-gpl-violation.sources | 4 +- activities/ftf/news-20111220-01.en.xhtml | 63 ------------------- activities/os/os.sources | 7 ++- activities/procurement/procurement.sources | 7 ++- .../radiodirective/radiodirective.sources | 7 ++- activities/routers/routers.sources | 7 ++- at/at.sources | 3 +- build/make_tagmaps.sh | 5 +- .../askyourcandidates.sources | 3 +- campaigns/ilovefs/2012/ilovefs.sources | 3 +- campaigns/ilovefs/2012/unperfekthaus.sources | 3 +- campaigns/ilovefs/2013/ilovefs.sources | 3 +- campaigns/ilovefs/2014/ilovefs.sources | 3 +- campaigns/ilovefs/2015/ilovefs.sources | 3 +- campaigns/ilovefs/2016/index.sources | 3 +- campaigns/ilovefs/2017/index.sources | 3 +- campaigns/ilovefs/2018/index.sources | 3 +- campaigns/ilovefs/2019/index.sources | 3 +- campaigns/nledu/nledu.sources | 3 +- campaigns/publiccode/bea.sources | 3 +- campaigns/publiccode/publiccode.sources | 3 +- campaigns/swpat/document-epo.de.xml | 2 +- campaigns/swpat/document-epo.el.xml | 2 +- campaigns/swpat/document-epo.en.xml | 2 +- de/de.sources | 3 +- ee/ee.sources | 3 +- fi/fi.sources | 3 +- fr/fr.sources | 3 +- index.sources | 6 +- it/it.sources | 3 +- .../2009/news-20090430-01.el.xhtml | 0 .../2009/news-20090430-01.en.xhtml | 0 .../2011/news-20111208-02.en.xhtml | 2 +- news/2011/news-20111220-01.en.xhtml | 2 +- news/Makefile | 46 ++++++++------ news/generated_xml/README | 7 --- news/legal-news.sources | 4 +- news/news.sources | 3 +- news/newsletter.sources | 2 +- news/nl/nl-200904.el.xhtml | 2 +- news/nl/nl-200904.en.xhtml | 2 +- news/nl/nl-200904.fr.xhtml | 2 +- news/nl/nl-200904.it.xhtml | 2 +- news/nl/nl-200904.nl.xhtml | 2 +- news/xhtml2xml.xsl | 13 ++-- press/press.sources | 3 +- tags/tags.sources | 3 +- tools/translation-ignore.txt | 4 -- uk/uk.sources | 3 +- 52 files changed, 119 insertions(+), 158 deletions(-) delete mode 100644 activities/ftf/news-20111220-01.en.xhtml rename campaigns/swpat/epo-response-042009.el.xhtml => news/2009/news-20090430-01.el.xhtml (100%) rename campaigns/swpat/epo-response-042009.en.xhtml => news/2009/news-20090430-01.en.xhtml (100%) rename activities/ftf/news-20111208-01.en.xhtml => news/2011/news-20111208-02.en.xhtml (99%) delete mode 100644 news/generated_xml/README diff --git a/.gitignore b/.gitignore index de0f67b4d4..ae3718ed58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ tools/tagmaps/*.map tags/tagged-*.sources tags/tagged-*.en.xhtml -generated_xml/ d_day.en.xml d_month.en.xml d_year.en.xml localmenuinfo.en.xml +news/*/.*.??.xml about/printable/archive/printable.en.xml diff --git a/Makefile b/Makefile index 54ad66cdb9..98242f1404 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ all: d_year.en.xml d_month.en.xml d_day.en.xml # tools/tagmaps/*.map, tags/tagged-*.en.xhtml, and tags/tagged-*.sources. The # tag map files cannot be targets in this Makefile, because the list of map # files is not known when the Makefile starts - some new tags might be created -# when generating the .xml files in the news/generated_xml directory. +# when generating the .xml files in the news/* subdirectories. tagmaps: $(SUBDIRS) @build/make_tagmaps.sh diff --git a/activities/education/education.sources b/activities/education/education.sources index df5274e3af..6c5b250b8a 100644 --- a/activities/education/education.sources +++ b/activities/education/education.sources @@ -10,6 +10,6 @@ campaigns/*/project:[] contact/local:[] news/*/news:[education] -news/generated_xml/:[education] +news/*/.news:[education] events/*/event:[education] d_day:[] diff --git a/activities/ftf/avm-gpl-violation.sources b/activities/ftf/avm-gpl-violation.sources index 2b1030f6d8..5aec6d6407 100644 --- a/activities/ftf/avm-gpl-violation.sources +++ b/activities/ftf/avm-gpl-violation.sources @@ -1,2 +1,2 @@ -news/*/news:[AVM] -news/generated_xml/:[AVM] +news/*/news:[avm] +news/*/.news:[avm] diff --git a/activities/ftf/news-20111220-01.en.xhtml b/activities/ftf/news-20111220-01.en.xhtml deleted file mode 100644 index fdb627df47..0000000000 --- a/activities/ftf/news-20111220-01.en.xhtml +++ /dev/null @@ -1,63 +0,0 @@ - - - - -Free Software legal news - - - -

Free Software legal news

- -

Read about ground-breaking decision of the Court of Justice of EU, abuse of copyright against an Android developer, AG's opinion in awaited European interoperability ruling and much more.

- -

Apple using patents to undermine open standards

-

Apply uses three registered patents and one patent application to threaten to block the W3C Standard.See article by MyOpera;

- -

Microsoft welcomes OSI open source to Win8 store

-

Applications released under a license from the Open Source Initiative (e.g. GPL, Apache) are being now welcomed by Microsoft into the Windows 8 Windows Store. See article by ExtremeTech and by The Register;

- -

Motorola Mobility wins German patent suit against Apple

-

The Mannheim Regional Court rendered its ruling on one of the patent infringement lawsuits Motorola Mobility brought against Apple in Germany. The ruling includes an injunction that is preliminarily enforceable in exchange for a €100 million ($134 million) bond. Concerned patent relates to "method for performing a countdown function during a mobile-originated transfer for a packet radio system". See article by FOSS Patents blog and by Heise Online;

- -

Koha creators asking for help in trademark dispute

-

Koha is a free library management system. This software has been the subject of an ongoing fight with a US company called LibLime; it seems that LibLime now thinks it is entitled to a trademark on the Koha name in New Zealand. See article by LWN.net;

- -

Mobile "rootkit" maker tries to silence critical Android developer

-

A data-logging software company is seeking to squash an Android developer’s critical research into its software that is secretly installed on millions of phones, but Trevor Eckhart is refusing to publicly apologize for his research and remove the company’s training manuals from his website.See article by ArsTechnica;

- -

Censorship in Name of Copyright Violates Fundamental Rights

-

The Court ruled that forcing Internet service providers to monitor and censor their users' communications violated EU law, and in particular the right to freedom of communication. See article by La Quadrature du Net;

- -

Liberation by software

-

Power has long been able to control the media. But the free software movement enables a radically democratic future. Which way the network behaves is determined solely by the software that comprises it. Freedom of the press, freedom of information, freedom of thought itself are now "implemented" rather than "declared", "protected" or "guaranteed".See article by Eben Moglen in the Guardian;

- -

Creating New Property Rights on the Basis of General Legal Concepts

-

In two cases recently decided by two different senates of the German Federal Supreme Court (Bundesgerichtshof, BGH), the following issue was raised: To what extent can the filming of sports events organized by someone else, on the one hand, and the photographing of someone else’s physical property, on the other hand, be legally controlled by the organizer of the sports event and the owner of the property respectively? See article by Prof. Dr. Thomas Dreier in the JIPITEC;

- -

Advocate General favours interoperability in Europe

-

The Opinion of Advocate General Bot in SAS v World Programming, the case before the Court of Justice of European Union, has now been published. It seems to favour World Programming and interoperability.See article by Technollama;

- -

US Supreme Court Case Could Affect Developers' Secondary Patent Liability

-

The United States Supreme Court will decide a case this term that could determine whether free software developers are liable for patent infringement by users of their softwareSee article by Software Freedom Law Center;

- -

Pirate Party MEP: eVoting is a bad idea

-

E-voting may sound modern and well when you first hear the idea, but unfortunately there are fundamental problems with electronic voting that does not dissolve. [..] However, there are other ways to take advantage of modern technology to improve voting in general elections. See article by Christian Engström;

- -

- -

-For previous Free Software legal news please consult blog of Matija Šuklje and blog of Hugo Roy. -

- - - - front-page - legal-news - Free Software - - - diff --git a/activities/os/os.sources b/activities/os/os.sources index b2df327dd0..78f244925d 100644 --- a/activities/os/os.sources +++ b/activities/os/os.sources @@ -1,3 +1,4 @@ -news/*/news:[OpenStandards] -news/generated_xml/:[OpenStandards] -news/nl/nl:[OpenStandards] +news/*/news:[openstandards] +news/*/.news:[openstandards] +news/nl/nl:[openstandards] +news/nl/.nl:[openstandards] diff --git a/activities/procurement/procurement.sources b/activities/procurement/procurement.sources index 74fe269c2e..9a98fbb257 100644 --- a/activities/procurement/procurement.sources +++ b/activities/procurement/procurement.sources @@ -1,3 +1,4 @@ -news/*/news:[Procurement] -news/generated_xml/:[Procurement] -news/nl/nl:[Procurement] +news/*/news:[procurement] +news/*/.news:[procurement] +news/nl/nl:[procurement] +news/nl/.nl:[procurement] diff --git a/activities/radiodirective/radiodirective.sources b/activities/radiodirective/radiodirective.sources index 1cd1a19c79..f5961ac77b 100644 --- a/activities/radiodirective/radiodirective.sources +++ b/activities/radiodirective/radiodirective.sources @@ -1,3 +1,4 @@ -news/*/news:[RadioDirective] -news/generated_xml/:[RadioDirective] -news/nl/nl:[RadioDirective] +news/*/news:[radiodirective] +news/*/.news:[radiodirective] +news/nl/nl:[radiodirective] +news/nl/.nl:[radiodirective] diff --git a/activities/routers/routers.sources b/activities/routers/routers.sources index da10754e9f..5fc9af8aaf 100644 --- a/activities/routers/routers.sources +++ b/activities/routers/routers.sources @@ -1,3 +1,4 @@ -news/*/news:[Routers] -news/generated_xml/:[Routers] -news/nl/nl:[Routers] +news/*/news:[routers] +news/*/.news:[routers] +news/nl/nl:[routers] +news/nl/.nl:[routers] diff --git a/at/at.sources b/at/at.sources index a1ede7559b..88df3045b2 100644 --- a/at/at.sources +++ b/at/at.sources @@ -8,7 +8,8 @@ about/people/volunteers:[] activities/*/project:[] campaigns/*/project:[] news/*/news:[at] -news/generated_xml/:[at] +news/*/.news:[at] news/nl/nl:[at] +news/nl/.nl:[at] events/*/event:[at] d_day:[] diff --git a/build/make_tagmaps.sh b/build/make_tagmaps.sh index 6e9646706a..443734d1d9 100755 --- a/build/make_tagmaps.sh +++ b/build/make_tagmaps.sh @@ -65,10 +65,11 @@ for map_file in `ls /tmp/tagmaps`; do echo "* Tag ${tag} has been updated." cp "/tmp/tagmaps/${map_file}" "tools/tagmaps/${map_file}" cp "tags/tagged.en.xhtml" "tags/tagged-${tag}.en.xhtml" - echo "events/*/events:[${tag}]" > "tags/tagged-${tag}.sources" echo "news/*/news:[${tag}]" >> "tags/tagged-${tag}.sources" - echo "news/generated_xml/:[${tag}]" >> "tags/tagged-${tag}.sources" + echo "news/*/.news:[${tag}]" >> "tags/tagged-${tag}.sources" echo "news/nl/nl:[${tag}]" >> "tags/tagged-${tag}.sources" + echo "news/nl/.nl:[${tag}]" >> "tags/tagged-${tag}.sources" + echo "events/*/events:[${tag}]" > "tags/tagged-${tag}.sources" echo "d_day:[]" >> "tags/tagged-${tag}.sources" fi done diff --git a/campaigns/askyourcandidates/askyourcandidates.sources b/campaigns/askyourcandidates/askyourcandidates.sources index 5865b8d307..e3b1cc1765 100755 --- a/campaigns/askyourcandidates/askyourcandidates.sources +++ b/campaigns/askyourcandidates/askyourcandidates.sources @@ -1,3 +1,4 @@ news/*/news:[ayc] -news/generated_xml/:[ayc] +news/*/.news:[ayc] news/nl/nl:[ayc] +news/nl/.nl:[ayc] diff --git a/campaigns/ilovefs/2012/ilovefs.sources b/campaigns/ilovefs/2012/ilovefs.sources index f06d79d48c..f6f9b1a348 100755 --- a/campaigns/ilovefs/2012/ilovefs.sources +++ b/campaigns/ilovefs/2012/ilovefs.sources @@ -1,3 +1,4 @@ news/*/news:[ilovefs] -news/generated_xml/:[ilovefs] +news/*/.news:[ilovefs] news/nl/nl:[ilovefs] +news/nl/.nl:[ilovefs] diff --git a/campaigns/ilovefs/2012/unperfekthaus.sources b/campaigns/ilovefs/2012/unperfekthaus.sources index f06d79d48c..f6f9b1a348 100755 --- a/campaigns/ilovefs/2012/unperfekthaus.sources +++ b/campaigns/ilovefs/2012/unperfekthaus.sources @@ -1,3 +1,4 @@ news/*/news:[ilovefs] -news/generated_xml/:[ilovefs] +news/*/.news:[ilovefs] news/nl/nl:[ilovefs] +news/nl/.nl:[ilovefs] diff --git a/campaigns/ilovefs/2013/ilovefs.sources b/campaigns/ilovefs/2013/ilovefs.sources index f06d79d48c..f6f9b1a348 100755 --- a/campaigns/ilovefs/2013/ilovefs.sources +++ b/campaigns/ilovefs/2013/ilovefs.sources @@ -1,3 +1,4 @@ news/*/news:[ilovefs] -news/generated_xml/:[ilovefs] +news/*/.news:[ilovefs] news/nl/nl:[ilovefs] +news/nl/.nl:[ilovefs] diff --git a/campaigns/ilovefs/2014/ilovefs.sources b/campaigns/ilovefs/2014/ilovefs.sources index f06d79d48c..f6f9b1a348 100755 --- a/campaigns/ilovefs/2014/ilovefs.sources +++ b/campaigns/ilovefs/2014/ilovefs.sources @@ -1,3 +1,4 @@ news/*/news:[ilovefs] -news/generated_xml/:[ilovefs] +news/*/.news:[ilovefs] news/nl/nl:[ilovefs] +news/nl/.nl:[ilovefs] diff --git a/campaigns/ilovefs/2015/ilovefs.sources b/campaigns/ilovefs/2015/ilovefs.sources index f06d79d48c..f6f9b1a348 100755 --- a/campaigns/ilovefs/2015/ilovefs.sources +++ b/campaigns/ilovefs/2015/ilovefs.sources @@ -1,3 +1,4 @@ news/*/news:[ilovefs] -news/generated_xml/:[ilovefs] +news/*/.news:[ilovefs] news/nl/nl:[ilovefs] +news/nl/.nl:[ilovefs] diff --git a/campaigns/ilovefs/2016/index.sources b/campaigns/ilovefs/2016/index.sources index f06d79d48c..f6f9b1a348 100755 --- a/campaigns/ilovefs/2016/index.sources +++ b/campaigns/ilovefs/2016/index.sources @@ -1,3 +1,4 @@ news/*/news:[ilovefs] -news/generated_xml/:[ilovefs] +news/*/.news:[ilovefs] news/nl/nl:[ilovefs] +news/nl/.nl:[ilovefs] diff --git a/campaigns/ilovefs/2017/index.sources b/campaigns/ilovefs/2017/index.sources index f06d79d48c..f6f9b1a348 100755 --- a/campaigns/ilovefs/2017/index.sources +++ b/campaigns/ilovefs/2017/index.sources @@ -1,3 +1,4 @@ news/*/news:[ilovefs] -news/generated_xml/:[ilovefs] +news/*/.news:[ilovefs] news/nl/nl:[ilovefs] +news/nl/.nl:[ilovefs] diff --git a/campaigns/ilovefs/2018/index.sources b/campaigns/ilovefs/2018/index.sources index f06d79d48c..f6f9b1a348 100755 --- a/campaigns/ilovefs/2018/index.sources +++ b/campaigns/ilovefs/2018/index.sources @@ -1,3 +1,4 @@ news/*/news:[ilovefs] -news/generated_xml/:[ilovefs] +news/*/.news:[ilovefs] news/nl/nl:[ilovefs] +news/nl/.nl:[ilovefs] diff --git a/campaigns/ilovefs/2019/index.sources b/campaigns/ilovefs/2019/index.sources index f06d79d48c..f6f9b1a348 100755 --- a/campaigns/ilovefs/2019/index.sources +++ b/campaigns/ilovefs/2019/index.sources @@ -1,3 +1,4 @@ news/*/news:[ilovefs] -news/generated_xml/:[ilovefs] +news/*/.news:[ilovefs] news/nl/nl:[ilovefs] +news/nl/.nl:[ilovefs] diff --git a/campaigns/nledu/nledu.sources b/campaigns/nledu/nledu.sources index 2add4a5bd5..cf085f5e2b 100755 --- a/campaigns/nledu/nledu.sources +++ b/campaigns/nledu/nledu.sources @@ -1,3 +1,4 @@ news/*/news:[nledu] -news/generated_xml/:[nledu] +news/*/.news:[nledu] news/nl/nl:[nledu] +news/nl/.nl:[nledu] diff --git a/campaigns/publiccode/bea.sources b/campaigns/publiccode/bea.sources index 14660c8c30..739f35f1f7 100644 --- a/campaigns/publiccode/bea.sources +++ b/campaigns/publiccode/bea.sources @@ -1,3 +1,4 @@ news/*/news:[bea] -news/generated_xml/:[bea] +news/*/.news:[bea] news/nl/nl:[bea] +news/nl/.nl:[bea] diff --git a/campaigns/publiccode/publiccode.sources b/campaigns/publiccode/publiccode.sources index b41ef835bf..0d4602ec30 100644 --- a/campaigns/publiccode/publiccode.sources +++ b/campaigns/publiccode/publiccode.sources @@ -1,3 +1,4 @@ news/*/news:[pmpc] -news/generated_xml/:[pmpc] +news/*/.news:[pmpc] news/nl/nl:[pmpc] +news/nl/.nl:[pmpc] diff --git a/campaigns/swpat/document-epo.de.xml b/campaigns/swpat/document-epo.de.xml index e4da2fad0a..5b65142335 100644 --- a/campaigns/swpat/document-epo.de.xml +++ b/campaigns/swpat/document-epo.de.xml @@ -3,6 +3,6 @@ Eingabe an das Europäische Patentamt (European Patent Office, EPO) zum Thema Softwarepatente - /campaigns/swpat/epo-response-042009.html + /news/2009/news-20090430-01.html diff --git a/campaigns/swpat/document-epo.el.xml b/campaigns/swpat/document-epo.el.xml index 4ca8932d21..6ef8b1c79b 100644 --- a/campaigns/swpat/document-epo.el.xml +++ b/campaigns/swpat/document-epo.el.xml @@ -4,6 +4,6 @@ Η θέση προς το Ευρωπαϊκό Γραφείο Πατεντών (EPO) σχετικά με τα Διπλώματα Ευρεσιτεχνίας Λογισμικού - /campaigns/swpat/epo-response-042009.html + /news/2009/news-20090430-01.html diff --git a/campaigns/swpat/document-epo.en.xml b/campaigns/swpat/document-epo.en.xml index 68505baa92..4bab482157 100644 --- a/campaigns/swpat/document-epo.en.xml +++ b/campaigns/swpat/document-epo.en.xml @@ -3,6 +3,6 @@ Submission to European Patent Office (EPO) on Software Patents - /campaigns/swpat/epo-response-042009.html + /news/2009/news-20090430-01.html diff --git a/de/de.sources b/de/de.sources index df8324c305..4e28f0a5e9 100644 --- a/de/de.sources +++ b/de/de.sources @@ -8,7 +8,8 @@ about/people/volunteers:[] activities/*/project:[] campaigns/*/project:[] news/*/news:[de] -news/generated_xml/:[de] +news/*/.news:[de] news/nl/nl:[de] +news/nl/.nl:[de] events/*/event:[de] d_day:[] diff --git a/ee/ee.sources b/ee/ee.sources index 6381a26abb..8d048f86eb 100644 --- a/ee/ee.sources +++ b/ee/ee.sources @@ -8,7 +8,8 @@ about/people/volunteers:[] activities/*/project:[] campaigns/*/project:[] news/*/news:[ee] -news/generated_xml/:[ee] +news/*/.news:[ee] news/nl/nl:[ee] +news/nl/.nl:[ee] events/*/event:[ee] d_day:[] diff --git a/fi/fi.sources b/fi/fi.sources index e8a7034db9..663cf73847 100644 --- a/fi/fi.sources +++ b/fi/fi.sources @@ -8,7 +8,8 @@ about/people/volunteers:[] activities/*/project:[] campaigns/*/project:[] news/*/news:[fi] -news/generated_xml/:[fi] +news/*/.news:[fi] news/nl/nl:[fi] +news/nl/.nl:[fi] events/*/event:[fi] d_day:[] diff --git a/fr/fr.sources b/fr/fr.sources index d3c2532ff5..7d8995aabb 100644 --- a/fr/fr.sources +++ b/fr/fr.sources @@ -10,7 +10,8 @@ activities/*/project:[] campaigns/*/project:[] contact/local:[] news/*/news:[fr] -news/generated_xml/:[fr] +news/*/.news:[fr] news/nl/nl:[fr] +news/nl/.nl:[fr] events/*/event:[fr] d_day:[] diff --git a/index.sources b/index.sources index b31595dbf9..bfb5b0deb1 100644 --- a/index.sources +++ b/index.sources @@ -1,6 +1,6 @@ -news/*/news:[front-page] -news/generated_xml/:[front-page] -events/*/event:[front-page] +news/*/news:[frontpage] +news/*/.news:[frontpage] +events/*/event:[frontpage] tools/frontpage/:[] d_day:[] diff --git a/it/it.sources b/it/it.sources index 94c6816710..2ba4c38dce 100644 --- a/it/it.sources +++ b/it/it.sources @@ -9,6 +9,7 @@ activities/*/project:[] campaigns/*/project:[] contact/local:[] news/*/news:[it] -news/generated_xml/:[it] +news/*/.news:[it] news/nl/nl:[it] +news/nl/.nl:[it] events/*/event:[it] diff --git a/campaigns/swpat/epo-response-042009.el.xhtml b/news/2009/news-20090430-01.el.xhtml similarity index 100% rename from campaigns/swpat/epo-response-042009.el.xhtml rename to news/2009/news-20090430-01.el.xhtml diff --git a/campaigns/swpat/epo-response-042009.en.xhtml b/news/2009/news-20090430-01.en.xhtml similarity index 100% rename from campaigns/swpat/epo-response-042009.en.xhtml rename to news/2009/news-20090430-01.en.xhtml diff --git a/activities/ftf/news-20111208-01.en.xhtml b/news/2011/news-20111208-02.en.xhtml similarity index 99% rename from activities/ftf/news-20111208-01.en.xhtml rename to news/2011/news-20111208-02.en.xhtml index f327ffceb2..5cf4e0d10d 100644 --- a/activities/ftf/news-20111208-01.en.xhtml +++ b/news/2011/news-20111208-02.en.xhtml @@ -43,7 +43,7 @@ For previous Free Software legal news please consult - legal + Legal News Free Software diff --git a/news/Makefile b/news/Makefile index 7dcf60dabf..1b072d394f 100644 --- a/news/Makefile +++ b/news/Makefile @@ -1,34 +1,42 @@ -.PHONY: all .FORCE -.FORCE: -all: +# ----------------------------------------------------------------------------- +# Makefile to generate includeable .xml files from .xhtml news pages +# ----------------------------------------------------------------------------- + +.PHONY: all # ----------------------------------------------------------------------------- -# remove xml files where original xhtml does not exist anymore +# Remove .xml files where original .xhtml file does not exist anymore # ----------------------------------------------------------------------------- # note the reversal of target <-> prerequisite relationship # make will execute thew command for all xhtml files (targets) that # do not exist, in doing so it will not make the target, but rather # remove the xml file that generated it -REMOVALS := $(subst ___,/,$(patsubst ./generated_xml/%.xml,../%.xhtml,$(wildcard ./generated_xml/*.xml))) -../%.xhtml: - rm generated_xml/$(subst /,___,$*).xml +# All currently existing generated .xml files +GENERATED_XML := $(wildcard */.*.xml) -all: $(REMOVALS) +# List of corresponding source files (foo/.bar.xx.xml -> foo/bar.xx.xhtml) +GENERATED_XML_SOURCES := $(patsubst %.xml,%.xhtml,$(subst /.,/,$(GENERATED_XML))) + +all: $(GENERATED_XML_SOURCES) +%.xhtml: + @echo '* Removing $(subst /,/.,$*).xml' + @rm '$(subst /,/.,$*).xml' # ----------------------------------------------------------------------------- -# build includable xml files from all xhtml files that contain news +# Generate .xml files from .xhtml files # ----------------------------------------------------------------------------- -XMLNAMES := $(shell find ../ -name '*.xhtml' \ - | xargs grep -l " $@ +# All existing .xhtml files +XHTML := $(shell ls */*.??.xhtml | xargs grep -l ' '$@' diff --git a/news/generated_xml/README b/news/generated_xml/README deleted file mode 100644 index 1bddb10b6e..0000000000 --- a/news/generated_xml/README +++ /dev/null @@ -1,7 +0,0 @@ -Please don't put Files in this directory, it's used for -auto-generated xml news files. - -If you want to add news use xml or xhtml files in the /news/20??/ -directory's or put an appropriate xhtml file in the /projects/*/ -directory's. See the README in the news directory for more -information. diff --git a/news/legal-news.sources b/news/legal-news.sources index cfdd4d028f..4369e1b0f3 100644 --- a/news/legal-news.sources +++ b/news/legal-news.sources @@ -1,2 +1,2 @@ -news/*/news:[legal-news] -news/generated_xml/:[legal-news] +news/*/news:[legalnews] +news/*/.news:[legalnews] diff --git a/news/news.sources b/news/news.sources index 1b464a8249..84db75120a 100644 --- a/news/news.sources +++ b/news/news.sources @@ -1,4 +1,5 @@ news/*/news:[] -news/generated_xml/:[] +news/*/.news:[] news/nl/nl:[] +news/nl/.nl:[] tools/static-elements/element-:[] diff --git a/news/newsletter.sources b/news/newsletter.sources index 2cbd7554c3..ae362cd8cc 100644 --- a/news/newsletter.sources +++ b/news/newsletter.sources @@ -1,2 +1,2 @@ news/nl/nl:[] -news/generated_xml/news___nl___:[] +news/nl/.nl:[] diff --git a/news/nl/nl-200904.el.xhtml b/news/nl/nl-200904.el.xhtml index 55d9e6fcbf..c17c8b495e 100644 --- a/news/nl/nl-200904.el.xhtml +++ b/news/nl/nl-200904.el.xhtml @@ -118,7 +118,7 @@ Bender von Haller Dragsted, Blackduck, Canonical, HP και Mozilla. Ο Harald W του WIPO τον Μάρτιο.

 diff --git a/news/nl/nl-200904.en.xhtml b/news/nl/nl-200904.en.xhtml index ce48f4ed02..2a2bced33c 100644 --- a/news/nl/nl-200904.en.xhtml +++ b/news/nl/nl-200904.en.xhtml @@ -105,7 +105,7 @@ the work done at WIPO's Standing Committee on the Law of Patents (SCP) in March.

diff --git a/news/nl/nl-200904.fr.xhtml b/news/nl/nl-200904.fr.xhtml index 64287e2240..136582eb09 100644 --- a/news/nl/nl-200904.fr.xhtml +++ b/news/nl/nl-200904.fr.xhtml @@ -122,7 +122,7 @@ l'économie, et se base également sur l'argumentaire du travail fait lors du Comité permanent sur le droit des brevets à l'OMPI en Mars.

diff --git a/news/nl/nl-200904.it.xhtml b/news/nl/nl-200904.it.xhtml index 78114ca2c4..6ec6eebacc 100644 --- a/news/nl/nl-200904.it.xhtml +++ b/news/nl/nl-200904.it.xhtml @@ -115,7 +115,7 @@ competizione e l'economia, basandosi anche sulle argomentazioni esposte presso la Commissione sulla Legge dei Brevetti di WIPO, durante lo scorso Marzo.

diff --git a/news/nl/nl-200904.nl.xhtml b/news/nl/nl-200904.nl.xhtml index 6424ca0576..a3c3ccc58e 100644 --- a/news/nl/nl-200904.nl.xhtml +++ b/news/nl/nl-200904.nl.xhtml @@ -157,7 +157,7 @@ diff --git a/news/xhtml2xml.xsl b/news/xhtml2xml.xsl index 45f5949c50..9165a343b2 100644 --- a/news/xhtml2xml.xsl +++ b/news/xhtml2xml.xsl @@ -7,6 +7,12 @@ + + ***************************************************** + This file has been automatically generated. + Please do not modify it, and do not commit it to git. + ***************************************************** + @@ -21,13 +27,6 @@ - - - - - - - diff --git a/press/press.sources b/press/press.sources index 1331145d5a..2d8269b397 100644 --- a/press/press.sources +++ b/press/press.sources @@ -1,3 +1,4 @@ news/*/news:[] -news/generated_xml/:[] +news/*/.news:[] news/nl/nl:[] +news/nl/.nl:[] diff --git a/tags/tags.sources b/tags/tags.sources index 7c87392044..ec6859686d 100755 --- a/tags/tags.sources +++ b/tags/tags.sources @@ -1,4 +1,5 @@ news/*/news:[] -news/generated_xml/:[] +news/*/.news:[] news/nl/nl:[] +news/nl/.nl:[] events/*/event:[] diff --git a/tools/translation-ignore.txt b/tools/translation-ignore.txt index 8e574d5e18..2797f6f7b7 100644 --- a/tools/translation-ignore.txt +++ b/tools/translation-ignore.txt @@ -22,10 +22,6 @@ about/printable/printable.en.xml localmenuinfo.xml # -# Generated directories -# - news/generated_xml/ -# # Name lists (not translated at all) # contact/local.en.xml diff --git a/uk/uk.sources b/uk/uk.sources index 7f849ea50c..dfb3b01155 100644 --- a/uk/uk.sources +++ b/uk/uk.sources @@ -9,7 +9,8 @@ activities/*/project:[] campaigns/*/project:[] contact/local:[] news/*/news:[gb] -news/generated_xml/:[gb] +news/*/.news:[gb] news/nl/nl:[gb] +news/nl/.nl:[gb] events/*/event:[gb] d_day:[]