[Checkins] SVN: bluebream/trunk/ Enabled Distribute by default in the bootstrap

[Christophe Combelles]

Log message for revision 110353:
  Enabled Distribute by default in the bootstrap
  

Changed:
  U   bluebream/trunk/CHANGES.txt
  U   bluebream/trunk/bootstrap.py
  U   bluebream/trunk/src/bluebream/bluebream_base/project_template/bootstrap.py

-=-
Modified: bluebream/trunk/CHANGES.txt
===================================================================
--- bluebream/trunk/CHANGES.txt	2010-03-31 01:26:53 UTC (rev 110352)
+++ bluebream/trunk/CHANGES.txt	2010-03-31 01:53:33 UTC (rev 110353)
@@ -11,6 +11,8 @@
 - Merge the two templates into a single one by allowing to create a
   flat or nested namespace structure, depending on the project name.
 
+- Enabled Distribute by default instead of Setuptools
+
 1.0a5 (2010-03-28)
 ------------------
 

Modified: bluebream/trunk/bootstrap.py
===================================================================
--- bluebream/trunk/bootstrap.py	2010-03-31 01:26:53 UTC (rev 110352)
+++ bluebream/trunk/bootstrap.py	2010-03-31 01:53:33 UTC (rev 110353)
@@ -31,10 +31,13 @@
 parser = OptionParser()
 parser.add_option("-v", "--version", dest="version",
                           help="use a specific zc.buildout version")
+parser.add_option("--setuptools",
+                   action="store_true", dest="setuptools", default=False,
+                   help="Use Setuptools rather than Distribute.")
 parser.add_option("-d", "--distribute",
-                   action="store_true", dest="distribute", default=False,
-                   help="Use Disribute rather than Setuptools.")
-
+                   action="store_true", dest="distribute", default=True,
+                   help="For backward compatibility. "
+                        "Distribute is used by default.")
 parser.add_option("-c", None, action="store", dest="config_file",
                    help=("Specify the path to the buildout configuration "
                          "file to be used."))
@@ -51,6 +54,8 @@
     VERSION = ''
 
 USE_DISTRIBUTE = options.distribute
+if options.setuptools:
+    USE_DISTRIBUTE = False
 args = args + ['bootstrap']
 
 to_reload = False

Modified: bluebream/trunk/src/bluebream/bluebream_base/project_template/bootstrap.py
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/bootstrap.py	2010-03-31 01:26:53 UTC (rev 110352)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/bootstrap.py	2010-03-31 01:53:33 UTC (rev 110353)
@@ -31,10 +31,13 @@
 parser = OptionParser()
 parser.add_option("-v", "--version", dest="version",
                           help="use a specific zc.buildout version")
+parser.add_option("--setuptools",
+                   action="store_true", dest="setuptools", default=False,
+                   help="Use Setuptools rather than Distribute.")
 parser.add_option("-d", "--distribute",
-                   action="store_true", dest="distribute", default=False,
-                   help="Use Disribute rather than Setuptools.")
-
+                   action="store_true", dest="distribute", default=True,
+                   help="For backward compatibility. "
+                        "Distribute is used by default.")
 parser.add_option("-c", None, action="store", dest="config_file",
                    help=("Specify the path to the buildout configuration "
                          "file to be used."))
@@ -51,6 +54,8 @@
     VERSION = ''
 
 USE_DISTRIBUTE = options.distribute
+if options.setuptools:
+    USE_DISTRIBUTE = False
 args = args + ['bootstrap']
 
 to_reload = False