[Checkins] SVN: z3c.recipe.staticlxml/trunk/ Consult buildout's [version] section for the libxml2/libxslt-URLs

[Wolfgang Schnerring]

Log message for revision 99877:
  Consult buildout's [version] section for the libxml2/libxslt-URLs
  

Changed:
  U   z3c.recipe.staticlxml/trunk/CHANGES.txt
  U   z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/README.txt
  U   z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/__init__.py

-=-
Modified: z3c.recipe.staticlxml/trunk/CHANGES.txt
===================================================================
--- z3c.recipe.staticlxml/trunk/CHANGES.txt	2009-05-12 15:18:32 UTC (rev 99876)
+++ z3c.recipe.staticlxml/trunk/CHANGES.txt	2009-05-12 15:21:51 UTC (rev 99877)
@@ -3,6 +3,7 @@
 
 - Passing include-dirs, library-dirs and rpath newline separated as required
   by zc.recipe.egg. This fixes non static build on linux.  [zagy]
+- Consult buildout's [version] section for the libxml2/libxslt-URLs [wosc]
 
 0.6 (2009-03-19)
 ================

Modified: z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/README.txt
===================================================================
--- z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/README.txt	2009-05-12 15:18:32 UTC (rev 99876)
+++ z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/README.txt	2009-05-12 15:21:51 UTC (rev 99877)
@@ -7,8 +7,9 @@
     Set to the desired lxml egg, e.g. ``lxml`` or ``lxml==2.1.2``
 
 **libxslt-url, libxml2-url**
-    The URL to download the source tarball of these libraries from.  Currently
-    defaults to::
+    The URL to download the source tarball of these libraries from.
+    If unset, the [versions] section of the buildout is searched,
+    if nothing is found there, either, these default values are used::
 
       http://dist.repoze.org/lemonade/dev/cmmi/libxslt-1.1.24.tar.gz
       http://dist.repoze.org/lemonade/dev/cmmi/libxml2-2.6.32.tar.gz

Modified: z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/__init__.py
===================================================================
--- z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/__init__.py	2009-05-12 15:18:32 UTC (rev 99876)
+++ z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/__init__.py	2009-05-12 15:21:51 UTC (rev 99877)
@@ -89,8 +89,9 @@
 
     def build_libxslt(self):
         self.logger.info("CMMI libxslt ...")
+        versions = self.buildout.get(self.buildout['buildout'].get('versions', '__invalid__'), {})
         self.options["libxslt-url"] = self.xslt_url = self.options.get("libxslt-url",
-                "http://dist.repoze.org/lemonade/dev/cmmi/libxslt-1.1.24.tar.gz")
+                versions.get("libxslt-url", "http://dist.repoze.org/lemonade/dev/cmmi/libxslt-1.1.24.tar.gz"))
         self.logger.info("Using libxslt download url %s" % self.xslt_url)
         self.xslt_cmmi.options["url"] = self.xslt_url
         self.xslt_cmmi.options["extra_options"] = "--with-libxml-prefix=%s --without-python --without-crypto" % self.xml2_location
@@ -106,8 +107,10 @@
 
     def build_libxml2(self):
         self.logger.info("CMMI libxml2 ...")
+        import pdb; pdb.set_trace();
+        versions = self.buildout.get(self.buildout['buildout'].get('versions', '__invalid__'), {})
         self.options["libxml2-url"] = self.xml2_url = self.options.get("libxml2-url",
-                "http://dist.repoze.org/lemonade/dev/cmmi/libxml2-2.6.32.tar.gz")
+                versions.get("libxml2-url", "http://dist.repoze.org/lemonade/dev/cmmi/libxml2-2.6.32.tar.gz"))
         self.logger.info("Using libxml2 download url %s" % self.xml2_url)
 
         self.xml2_cmmi.options["url"] = self.xml2_url