Adapt build and configuration to ptlink

this disables Atom, FoaF, OPML
Signed-off-by: Mattia Rizzolo <mapreri@ubuntu.com>

.gitignore

-*.py[co]
-*.tmplc
-*.pluginc
-
 # Dynamically generated stuff
 /build
 /cache
 /membri
-/venus/config.ini
+/full-config.ini

Makefile

@@ -3,26 +3,28 @@ REPO_URL = "lp:~ubuntu-it-members/planet-ubuntu-it/membri"
 
 .PHONY: build clean update
 
-
-build: membri
-	@rm -rf build
-	@cat membri/config.ini config.ini > venus/config.ini
-	@cd venus && ./planet.py
-	@cp -r theme/libs build
-	@cp -r membri/images build
-	@cp -r banners build
+build: full-config.ini
+	ptlink-planet full-config.ini
+	cp -rv themes/ubuntuit/libs build
+	cp -rv membri/images build
+	cp -rv banners build
 
 
 update: membri
-	@cd membri && bzr pull -q
+	cd membri && bzr pull
 
 
 clean:
-	@rm -rf build
-	@rm -rf cache
-	@rm -rf membri
-	@rm -f venus/config.ini
+	rm -rf build
+	rm -rf cache
+	rm -rf membri
+	rm -f full-config.ini
 
 
 membri:
-	@bzr branch $(REPO_URL) membri
+	bzr branch $(REPO_URL) membri
+
+membri/config.ini: membri
+
+full-config.ini: config.ini membri/config.ini
+	cat config.ini membri/config.ini > full-config.ini

config.ini

@@ -14,12 +14,15 @@ owner_email = planet@ubuntu-it.org
 # cache_directory: Where cached feeds are stored
 # new_feed_items: Number of items to take from new feeds
 # log_level: One of DEBUG, INFO, WARNING, ERROR or CRITICAL
-cache_directory = ../cache
+cache_directory = cache
 new_feed_items = 10
 log_level = DEBUG
 
 # template_files: Space-separated list of output template files
-template_files = themes/ubuntuit/index.html.tmpl themes/common/atom.xml.xslt themes/common/foafroll.xml.xslt themes/common/opml.xml.xslt themes/ubuntuit/rss20.xml.tmpl
+template_files = themes/ubuntuit/index.html.tmpl themes/ubuntuit/rss20.xml.tmpl
+# ptlink doesn't support template in XSLT, so the followings are not produced anymore.
+# the old templates are kept "because you never know"
+# themes/common/atom.xml.xslt themes/common/foafroll.xml.xslt themes/common/opml.xml.xslt
 
 # The following provide defaults for each template:
 # output_dir: Directory to place output files
@@ -32,13 +35,12 @@ template_files = themes/ubuntuit/index.html.tmpl themes/common/atom.xml.xslt the
 #           special "xml" value to output ASCII with XML character references
 # locale: locale to use for (e.g.) strings in dates, default is taken from your
 #         system
-output_dir = ../build
+output_dir = build
 items_per_page = 60
 days_per_page = 0
 date_format = %d %B %Y %H.%M
 new_date_format = %d %B %Y
-#encoding = UTF-8
-encoding = xml
+encoding = UTF-8
 locale = it_IT.utf8