1.1 --- a/MysteryMachine/Ui/wx/__init__.py	Thu Apr 07 20:51:36 2011 +0100
     1.2 +++ b/MysteryMachine/Ui/wx/__init__.py	Thu Apr 07 20:53:16 2011 +0100
     1.3 @@ -50,7 +50,7 @@
     1.4  """
     1.5  
     1.6  NAME   =    "MysteryMachine"
     1.7 -VERSION   = "0.14pre"
     1.8 +VERSION   = "0.14"
     1.9  WEBSITE   = "http://trac.backslashat.org/mysterymachine"
    1.10  
    1.11  ID_NEW=wx.ID_NEW

     2.1 --- a/README	Thu Apr 07 20:51:36 2011 +0100
     2.2 +++ b/README	Thu Apr 07 20:53:16 2011 +0100
     2.3 @@ -28,6 +28,11 @@
     2.4  
     2.5  to build you own source distribution and install from that.
     2.6  
     2.7 +You will also find it useful to install wxPython and mercurial (at least 1.3) 
     2.8 +seperately . Similiary bpython is recommended for cli affiondadios on platforms
     2.9 +which support it.
    2.10 +
    2.11 +
    2.12  Windows Install Quick Reference
    2.13  -------------------------------
    2.14  
    2.15 @@ -36,21 +41,23 @@
    2.16  doing this
    2.17  
    2.18      1. Download a recent Python (2.6.x is recommended) from www.python.org and install it.
    2.19 -    2. Download mercurial from  http://bitbucket.org/tortoisehg/thg-winbuild/downloads/ and install it. 
    2.20 -    3. From the MysteryMachine zip file run 
    2.21 -            python install -d c:\mysterymachine
    2.22 +    2. Download a recent wxPython (2.8.10 is recommoned) from www.wxpython.org and install it.
    2.23 +    3. Download mercurial from  http://bitbucket.org/tortoisehg/thg-winbuild/downloads/ and install it. 
    2.24 +    4. From the MysteryMachine zip file run 
    2.25 +            python setup.py install -d c:\mysterymachine
    2.26  
    2.27 -    4. Find where your TCL scripts are stored , this will normally by c:\pythonXX\tcl\tclY.Y
    2.28 -       then edit c:\mysterymachine\scripts\activate to add this following line at
    2.29 -       the beginning:-
    2.30 -            set TCL_LIBRARY=c:\pythonXX\tcl\tclY,Z
    2.31 -        
    2.32 -        where X,Y are version numbers in the file names, eg if you have a folder of yout
    2.33 -        computer called c:\python26\tcl\tcl8.5 you woud add this line:=
    2.34 -            set TCL_LIBRARY=c:\python26\tcl\tcl8.5
    2.35 +    5 Add a Link to the mmcli.exe and mmwx.exe scripts to your Start Menu.
    2.36  
    2.37 -    5. Run c:\mysterymachine\scripts\activate
    2.38 -    6. You ready to go - make sure you  
    2.39 +
    2.40 +Installation on Debian/Unbuntu
    2.41 +------------------------------
    2.42 +
    2.43 +    1. Run 'aptitude install python2.6  python-wxgtk2.8 mercurial'
    2.44 +    2. From the MysteryMachine zip file run 
    2.45 +            python setup.py install -d /opt/mysterymachine
    2.46 +
    2.47 +    3 Add a Link to the /opt/mysterynachine/mmcli and /opt/mysterymachine/binmmwx
    2.48 +        to your desktop
    2.49  
    2.50  
    2.51  Libraries Required
    2.52 @@ -59,21 +66,15 @@
    2.53  You will need to install the following Python packages to use the 
    2.54  MysteryMachine .
    2.55  
    2.56 -Yapsy > 1.7 : A Patch for versions lower than this can be found patches
    2.57  pyparsing > 1.5.0
    2.58 +mercurial > 1.3.1 
    2.59  
    2.60  Yapsy 
    2.61  '''''
    2.62 -Yapsy does not currently meet our python3 requirements, and in fact the use of 
    2.63 -exec, rather than execfile creates a small security race hazard. Wether
    2.64 -our application's useis sensitive enough to worry about this is a moot point
    2.65 -though. 
    2.66 +Yapsy does not currently meet our python3 or other requirements.
    2.67  
    2.68 -Having said that since for python3 we need to fix yapsy - changing it to be
    2.69 -secure as well strikes me as a good idea.
    2.70 -
    2.71 -Additionall MysteryMachine ships with a patched ersion of Yapsy which should
    2.72 -be backwardly compatible with 1.7 - but add a filter mechanism which is currently
    2.73 +MysteryMachine ships with a patched version of Yapsy which should
    2.74 +be backwardly compatible with 1.7 - but adds a filter mechanism which is currently
    2.75  used so we ignore UnTrusted plugins.
    2.76  
    2.77  Pyparsing
    2.78 @@ -101,7 +102,7 @@
    2.79  it require python2.X-dev and working C toolchain installed . But that is quite
    2.80  common on Unix machines.
    2.81  
    2.82 -I haven't yet worked out the best to get Mercurial installed appropriately on windows,
    2.83 +I haven't yet worked out the best to get Mercurial installed automatically on windows,
    2.84  due to the common lack of Visual Studio , which is required to build the C extension
    2.85  parts. However a binary version which can be used a a library can be downloaded from
    2.86  http://bitbucket.org/tortoisehg/thg-winbuild/downloads/
    2.87 @@ -174,3 +175,13 @@
    2.88  Similiarily this supports auto-completion and pop-up documentation but
    2.89  where as Bpython will show the complete docstring, Idle tries to 
    2.90  shorten it.
    2.91 +
    2.92 +
    2.93 +GUI
    2.94 +'''
    2.95 +
    2.96 +Your more likely to be interested in running the New MysteryMachine GUI 
    2.97 +and this can be starting by running the mmwx binary from either the bin
    2.98 +or scripts directory depending on your platform.
    2.99 +
   2.100 +

     3.1 --- a/pavement.py	Thu Apr 07 20:51:36 2011 +0100
     3.2 +++ b/pavement.py	Thu Apr 07 20:53:16 2011 +0100
     3.3 @@ -52,7 +52,9 @@
     3.4  
     3.5  DIST_PACKAGES = [ "yapsy" , "MysteryMachine","MysteryMachine.schema",
     3.6                   "MysteryMachine.store","MysteryMachine.parsetools",
     3.7 -                 "MysteryMachine.Ui","MysteryMachine.utils",
     3.8 +                 "MysteryMachine.Ui",
     3.9 +                 "MysteryMachine.Ui.wx","MysteryMachine.Ui.wx.dialogs",
    3.10 +                 "MysteryMachine.utils",
    3.11                   "MysteryMachine.policies" , "MysteryMachine.document"  ]
    3.12  
    3.13  PY_MODULES  = [ 'pyparsing' ]
    3.14 @@ -60,7 +62,7 @@
    3.15  #Mercurial and pyaprsing (as of 1.5.2 ) don't install with easy_install. 
    3.16  EZ_PACKAGES   = ["docutils" , 
    3.17  #                 "mercurial" ,
    3.18 -                 "bpython" , 
    3.19 +#                 "bpython" ,    # We add bpython back in later...
    3.20  #                 "pyparsing > 1.5" ,
    3.21                   "PyYaml"]
    3.22  
    3.23 @@ -168,8 +170,10 @@
    3.24  
    3.25  @task
    3.26  def test_installed():
    3.27 -    """Run MysteryMachine units tests on the Install MysteryMachine distribution
    3.28 -        with the default python"""
    3.29 +    """Run MysteryMachine units tests on the Installed MysteryMachine distribution
    3.30 +        with the current python"""
    3.31 +    global PYTHONS
    3.32 +    PYTHONS = [ sys.executable ]
    3.33      _do_test()
    3.34  
    3.35  def _do_test(path_prefix=[]):
    3.36 @@ -252,13 +256,6 @@
    3.37          #**** NEVER GETS HERE - Relaunch DOES NOT RETURN****
    3.38     
    3.39      if sys.platform[:3] == 'win':
    3.40 -        #Bpython doesn't work under windows to remove it from the
    3.41 -        # deps list
    3.42 -        if 'bpython' in  options.virtualenv.packages_to_install:
    3.43 -            options.virtualenv.packages_to_install.remove('bpython')
    3.44 -        if 'bpython' in options.setup.install_requires:
    3.45 -            options.setup.install_requires.remove('bpython')
    3.46 -      
    3.47          try:
    3.48              ##This is a workaround for issue 40 in virtualenv
    3.49              import FixTk
    3.50 @@ -272,7 +269,11 @@
    3.51              options.setup.py_modules += ['FixTk']
    3.52          except ImportError:
    3.53              pass            
    3.54 -
    3.55 +    else:
    3.56 +        #Bpython is worth install on the Unix & Macs.
    3.57 +        if 'bpython' not in  options.virtualenv.packages_to_install:
    3.58 +            options.virtualenv.packages_to_install.append('bpython')
    3.59 + 
    3.60  @task
    3.61  @needs('dst_environ')
    3.62  def install_here():
    3.63 @@ -347,7 +348,7 @@
    3.64        packages = DIST_PACKAGES ,
    3.65        scripts  = SCRIPTS ,
    3.66        py_modules =PY_MODULES,
    3.67 -      version  = "0.1.3pre", 
    3.68 +      version  = "0.1.4", 
    3.69        install_requires = EZ_PACKAGES,
    3.70        url="http://trac.backslashat.org/MysteryMachine",
    3.71        author="Roger Gammans",
    3.72 @@ -355,7 +356,8 @@
    3.73        license = "GPLv2",
    3.74        entry_points={ 'console_scripts': [
    3.75                           "mysterymachine = MysteryMachine.Main:main",
    3.76 -                         "mmcli          = MysteryMachine.Ui.cli:main"
    3.77 +                         "mmcli         = MysteryMachine.Ui.cli:main",
    3.78 +                         "mmwx          = MysteryMachine.Ui.wx:main"
    3.79                     ]},
    3.80        package_data= paver.setuputils.find_package_data(".", package="paver",
    3.81                                              only_in_packages=False),