[Checkins] SVN: z3c.recipe.staticlxml/trunk/ Sanitize option defaults.

[Stefan Eletzhofer]

Log message for revision 93420:
  Sanitize option defaults.

Changed:
  U   z3c.recipe.staticlxml/trunk/CHANGES.txt
  U   z3c.recipe.staticlxml/trunk/example.cfg
  U   z3c.recipe.staticlxml/trunk/setup.py
  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	2008-11-28 11:16:21 UTC (rev 93419)
+++ z3c.recipe.staticlxml/trunk/CHANGES.txt	2008-11-28 12:58:35 UTC (rev 93420)
@@ -1,6 +1,13 @@
 trunk
 =====
 
+- Made ``static-build`` default to ``true`` on OS X [seletz]
+- Made ``build-libxslt` and ``build-libxml2`` default to ``true`` [seletz]
+- Document default options [seletz]
+
+0.2 (2008-11-27)
+================
+
 - Fix Documentation REsT [seletz]
 - Rerelease due to setup.cfg messup [seletz]
 

Modified: z3c.recipe.staticlxml/trunk/example.cfg
===================================================================
--- z3c.recipe.staticlxml/trunk/example.cfg	2008-11-28 11:16:21 UTC (rev 93419)
+++ z3c.recipe.staticlxml/trunk/example.cfg	2008-11-28 12:58:35 UTC (rev 93420)
@@ -24,7 +24,3 @@
 [lxml]
 recipe = z3c.recipe.staticlxml
 egg = lxml
-force = false
-build-libxml2 = true
-build-libxslt = true
-static-build = true

Modified: z3c.recipe.staticlxml/trunk/setup.py
===================================================================
--- z3c.recipe.staticlxml/trunk/setup.py	2008-11-28 11:16:21 UTC (rev 93419)
+++ z3c.recipe.staticlxml/trunk/setup.py	2008-11-28 12:58:35 UTC (rev 93420)
@@ -8,7 +8,7 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-version = '0.2'
+version = '0.2.1'
 
 long_description = (
     read('README.txt')

Modified: z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/README.txt
===================================================================
--- z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/README.txt	2008-11-28 11:16:21 UTC (rev 93419)
+++ z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/README.txt	2008-11-28 12:58:35 UTC (rev 93420)
@@ -14,10 +14,11 @@
       http://dist.repoze.org/lemonade/dev/cmmi/libxml2-2.6.32.tar.gz
 
 **build-libxslt, build-libxml2**
-    Set to ``true`` if these should be build.  Needed for a static build.
+    Set to ``true`` (default) if these should be build, ``false`` otherwise.
+    Needes to be ``true`` for a static build.
 
 **static-build**
-    ``true`` or ``false``
+    ``true`` or ``false``.  On OS X this defaults to ``true``.
 
 **xml2-loction**
     Needed if ``libxml2`` is not built.
@@ -68,10 +69,8 @@
     [lxml]
     recipe = z3c.recipe.staticlxml
     egg = lxml
-    force = false
-    build-libxml2 = true
-    build-libxslt = true
-    static-build = true
 
+This will build a ``static`` version of the ``lxml`` egg, that is, it won't have
+any dependencies on ``libxml2`` and ``libxslt``.
 
 

Modified: z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/__init__.py
===================================================================
--- z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/__init__.py	2008-11-28 11:16:21 UTC (rev 93419)
+++ z3c.recipe.staticlxml/trunk/src/z3c/recipe/staticlxml/__init__.py	2008-11-28 12:58:35 UTC (rev 93420)
@@ -56,7 +56,7 @@
         options["force"] = force and "true" or "false"
 
         # XLST build or location option
-        build_xslt = options.get("build-libxslt")
+        build_xslt = options.get("build-libxslt", "true")
         self.build_xslt = build_xslt in ("true", "True")
         options["build-libxslt"] = build_xslt and "true" or "false"
 
@@ -67,7 +67,7 @@
                         " ``build-libxslt`` to ``true``")
 
         # XML2 build or location option
-        build_xml2 = options.get("build-libxml2")
+        build_xml2 = options.get("build-libxml2", "true")
         self.build_xml2 = build_xml2 in ("true", "True")
         options["build-libxml2"] = build_xml2 and "true" or "false"
 
@@ -78,7 +78,7 @@
                         " ``build-libxml2`` to ``true``")
 
         # static build option
-        static_build = options.get("static-build")
+        static_build = options.get("static-build", "darwin" in sys.platform and "true" or None)
         self.static_build = static_build in ("true", "True")
         if self.static_build and not (self.build_xml2 and self.build_xslt):
             raise UserError("Static build is only possible if both "