More typos and other cleanup

README.rst

@@ -301,7 +301,7 @@ in their MODULE variable.
 
 
 Prerequisites
---------------
+-------------
 
 The following are some tips about what is required to build Phoenix for
 yourself. There are likely some other things that may not have been mentioned

TODO.txt

@@ -165,9 +165,9 @@ Other Dev Stuff
 
     evaluates to garbage values, but this works fine::
 
-    	a = theGrid.GetSelectedCells()
-	a[0]
-	a[0][0]
+        a = theGrid.GetSelectedCells()
+        a[0]
+        a[0][0]
 
    * In a Py3 build strings like wx.TreeCtrlNameStr are being generated as
      bytes objects, they should probably be string objects. Or not, sip's
@@ -197,7 +197,7 @@ Other Dev Stuff
    * Add meaningful __hash__ methods for wx.Colour, wx.Point, etc.?
     
    * Double-check wx.PyEvent and wx.PyCommandEvent, does the
-     __getattr__ etc. work with properties?
+     __getattr__ etc. work with properties?  See:
      https://groups.google.com/d/msg/wxpython-dev/dMrpaKs_d0U/nVMY7lMvAwAJ
 
 

build.py

@@ -106,7 +106,7 @@ Usage: ./build.py [command(s)] [options]
                     --python to specify the actual Python executable to use.
                     
       dox           Run Doxygen to produce the XML file used by ETG scripts
-      doxhtml       Run Doxygen to create the HTML documetation for wx
+      doxhtml       Run Doxygen to create the HTML documentation for wx
       touch         'touch' the etg files so they will all get run the next  
                     time the etg command is run.
       etg           Run the ETG scripts that are out of date to update their 
@@ -333,7 +333,8 @@ def setDevModeOptions(args):
 def numCPUs():
     """
     Detects the number of CPUs on a system.
-    This approach is from detectCPUs here: http://www.artima.com/weblogs/viewpost.jsp?thread=230001
+    This approach is from detectCPUs here:
+    http://www.artima.com/weblogs/viewpost.jsp?thread=230001
     """
     # Linux, Unix and MacOS:
     if hasattr(os, "sysconf"):
@@ -348,9 +349,9 @@ def numCPUs():
             
     # Windows:
     if "NUMBER_OF_PROCESSORS" in os.environ:
-            ncpus = int(os.environ["NUMBER_OF_PROCESSORS"]);
-            if ncpus > 0:
-                return ncpus
+        ncpus = int(os.environ["NUMBER_OF_PROCESSORS"])
+        if ncpus > 0:
+            return ncpus
     return 1 # Default
     
 
@@ -637,7 +638,7 @@ def uploadPackage(fileName, options, mask=defaultMask, keep=50):
 
     # NOTE: It is expected that there will be a host entry defined in
     # ~/.ssh/config named wxpython-rbot, with the proper host, user,
-    # idenity file, etc needed for making an SSH connection to the
+    # identity file, etc. needed for making an SSH connection to the
     # snapshots server.
     host = 'wxpython-rbot'
     if options.release_build:
@@ -901,7 +902,7 @@ def cmd_sphinx(options, args):
     runcmd('sphinx-build -b html -d %s/doctrees . %s' % (buildDir, htmlDir))
     del pwd2
     
-    msg('Postprocesing sphinx output...')
+    msg('Postprocessing sphinx output...')
     PostProcess(htmlDir)
 
 
@@ -1429,10 +1430,8 @@ def cmd_bdist_wininst(options, args):
         uploadPackage(filenames[0], options)
 
 
-# bdist_msi requires the version number to be only 3 components, but we're
-# using 4.  TODO: Can we fix this?
-#def cmd_bdist_msi(options, args):
-#    _doSimpleSetupCmd(options, args, 'bdist_msi')
+def cmd_bdist_msi(options, args):
+    _doSimpleSetupCmd(options, args, 'bdist_msi')
 
 
 def cmd_egg_info(options, args, egg_base=None):
@@ -1443,9 +1442,6 @@ def cmd_egg_info(options, args, egg_base=None):
     runcmd(cmd)
 
 
-
-    
-
 def cmd_clean_wx(options, args):
     cmdTimer = CommandTimer('clean_wx')
     if isWindows:

buildbot/master.cfg

@@ -59,12 +59,6 @@ c['slavePortnum'] = 9989
 # The 'change_source' setting tells the buildmaster how it should find out
 # about source code changes.
 
-#wxGitUrl = 'https://github.com/RobinD42/wxWidgets.git'
-#wxGitBranch = 'WX_3_0_BRANCH' #'wxPy-3.0-branch'
-
-phoenixGitUrl = 'https://github.com/RobinD42/Phoenix.git'
-phoenixGitBranch = 'master'
-
 ## c['change_source'] =
 
 # See WebStatus setup below for alternate approach using GitHub's webhooks,
@@ -72,6 +66,12 @@ phoenixGitBranch = 'master'
 # instead of having buildbot poll the repos itself.
 
 
+# TODO: Switch to the wxWidgets/Phoenix repo
+phoenixGitUrl = 'https://github.com/RobinD42/Phoenix.git'
+phoenixGitBranch = 'master'
+
+
+
 
 ####### SCHEDULERS
 
@@ -161,6 +161,20 @@ c['schedulers'].append( ForceScheduler(
 # what steps, and which slaves can execute them.  Note that any particular build will
 # only take place on one slave.
 
+# NOTE on build properties.  The following properties are defined in the
+# factories generated in this function that can be used to customize the
+# builds:
+#
+#    fullclean:  Set to 'yes' to fully clean the "build-*" builders before
+#        checking out the code.  Normally they will try to do an incremental
+#        build to save time, but sometimes things change enough that
+#        incrementals won't work.
+#
+#    buildargs: Adds additional flags or commands to the build.py command
+#        line. For example, adding '--release_build' will (in theory) switch
+#        the "dist-*" builders from making snapshot builds to making release
+#        builds.
+
 from buildbot.process.factory import BuildFactory
 from buildbot.process.properties import Property, WithProperties
 from buildbot.steps.source.git import Git
@@ -172,7 +186,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
     factory = BuildFactory()
 
     # Was the build started from the force build form with a "fullclean"
-    # property set? If so, clobber the SVN checkout folders.
+    # property set? If so, clobber the git workspace and start fresh.
     cmd = ['bash', '-c',
            WithProperties('if [ %(fullclean:-no)s == yes ]; then rm -rf ../Phoenix; echo fully cleaned; fi'),
            ]
@@ -184,7 +198,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
     method = None
     clean = ''
 
-    # Start from a clean build tree for the daily builds
+    # Start from a clean build tree for the daily "dist" builds
     if buildType in ['dist', 'docs']:
         mode = 'full'
         method = 'clobber'