Index: tup_py2exe.py
===================================================================
--- setup_py2exe.py	(revision 87985ca5989a70a24a7e9ac09a971d544fe16dfe)
+++ 	(revision )
@@ -1,322 +1,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2006-2010, University of Maryland
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/ or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# Author: James Krycka
-
-"""
-This script uses py2exe to create dist\bumps.exe and dist\bumps_gui.exe for
-running the Bumps application in either CLI or GUI mode.
-
-These executables start the application and import the rest of the application
-code stored in library.zip.  The python interpreter and other required python
-packages and dlls are also placed in the zip file.  Additional resource files
-that are needed when Bumps is run are copied to the dist directory tree.  On
-completion, the contents of the dist directory tree can be used by the Inno
-Setup Compiler (via a separate script) to build a Windows installer/uninstaller
-for deployment of the Bumps application.  For testing purposes, bumps.exe or
-bumps_gui.exe can be run from the dist directory.
-"""
-
-import os
-import sys
-
-#sys.dont_write_bytecode = True
-
-# Force build before continuing
-os.system('"%s" setup.py build' % sys.executable)
-
-# Remove the current directory from the python path
-here = os.path.abspath(os.path.dirname(__file__))
-sys.path = [p for p in sys.path if os.path.abspath(p) != here]
-
-import glob
-
-from distutils.core import setup
-from distutils.util import get_platform
-
-# Augment the setup interface with the py2exe command and make sure the py2exe
-# option is passed to setup.
-import py2exe
-
-if len(sys.argv) == 1:
-    sys.argv.append('py2exe')
-
-# Put the build lib on the start of the path.
-# For packages with binary extensions, need platform.  If it is a pure
-# script library, use an empty platform string.
-platform = '.%s-%s' % (get_platform(), sys.version[:3])
-#platform = ''
-build_lib = os.path.abspath('build/lib' + platform)
-sys.path.insert(0, build_lib)
-
-# print "\n".join(sys.path)
-
-import wx
-import matplotlib
-matplotlib.use('WXAgg')
-import periodictable
-
-# Retrieve the application version string.
-import bumps
-version = bumps.__version__
-from bumps.gui.resources import resources as gui_resources
-
-# A manifest is required to be included in a py2exe image (or accessible as a
-# file in the image directory) when wxPython is included so that the Windows XP
-# theme is used when rendering wx widgets.  The manifest must be matched to the
-# version of Python that is being used.
-#
-# Create a manifest for use with Python 2.5 on Windows XP or Vista.  It is
-# adapted from the Python manifest file (C:\Python25\pythonw.exe.manifest).
-
-manifest_for_python25 = """
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity
-    version="1.0.0.0"
-    processorArchitecture="x86"
-    name="%(prog)s"
-    type="win32"
-/>
-<description>%(prog)s</description>
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            processorArchitecture="X86"
-            publicKeyToken="6595b64144ccf1df"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-</assembly>
-"""
-
-# Create a manifest for use with Python 2.6 or 2.7 on Windows XP or Vista.
-
-manifest_for_python26 = """
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity
-    version="5.0.0.0"
-    processorArchitecture="x86"
-    name="%(prog)s"
-    type="win32">
-  </assemblyIdentity>
-  <description>%(prog)s</description>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel
-          level="asInvoker"
-          uiAccess="false">
-        </requestedExecutionLevel>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-        type="win32"
-        name="Microsoft.VC90.CRT"
-        version="9.0.21022.8"
-        processorArchitecture="x86"
-        publicKeyToken="1fc8b3b9a1e18e3b">
-      </assemblyIdentity>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-        type="win32"
-        name="Microsoft.Windows.Common-Controls"
-        version="6.0.0.0"
-        processorArchitecture="x86"
-        publicKeyToken="6595b64144ccf1df"
-        language="*">
-      </assemblyIdentity>
-    </dependentAssembly>
-  </dependency>
-</assembly>
-"""
-
-# Select the appropriate manifest to use.
-if sys.version_info >= (3, 0) or sys.version_info < (2, 5):
-    print("*** This script only works with Python 2.5, 2.6, or 2.7.")
-    sys.exit()
-elif sys.version_info >= (2, 6):
-    manifest = manifest_for_python26
-elif sys.version_info >= (2, 5):
-    manifest = manifest_for_python25
-
-# Create a list of all files to include along side the executable being built
-# in the dist directory tree.  Each element of the data_files list is a tuple
-# consisting of a path (relative to dist\) and a list of files in that path.
-data_files = []
-
-# Add resource files that need to reside in the same directory as the image.
-data_files.append(('.', [os.path.join('.', 'LICENSE.txt')]))
-data_files.append(('.', [os.path.join('.', 'README.txt')]))
-data_files.append(('.', [os.path.join('.', 'bin', 'bumps_launch.bat')]))
-
-# Add application specific data files from the bumps\bumps-data folder.
-data_files += gui_resources.data_files()
-
-# Add data files from the matplotlib\mpl-data folder and its subfolders.
-# For matploblib prior to version 0.99 see the examples at the end of the file.
-data_files += matplotlib.get_py2exe_datafiles()
-
-# Add data files from the periodictable\xsf folder.
-data_files += periodictable.data_files()
-
-# Add example directories and their files.  An empty directory is ignored.
-# Note that Inno Setup will determine where these files will be placed such as
-# C:\My Documents\... instead of the installation folder.
-for path in glob.glob(os.path.join('examples', '*')):
-    if os.path.isdir(path):
-        for file in glob.glob(os.path.join(path, '*.*')):
-            data_files.append((path, [file]))
-    else:
-        data_files.append(('examples', [path]))
-
-for path in glob.glob(os.path.join('doc', 'examples', '*')):
-    if os.path.isdir(path):
-        for file in glob.glob(os.path.join(path, '*.*')):
-            data_files.append((path, [file]))
-    else:
-        data_files.append(('doc', [path]))
-
-# Add PDF documentation to the dist staging directory.
-pdf = os.path.join('doc', 'Bumps.pdf')
-if os.path.isfile(pdf):
-    data_files.append(('doc', [pdf]))
-else:
-    print("*** %s not found - building frozen image without it ***" % pdf)
-
-# Add the Microsoft Visual C++ 2008 redistributable kit if we are building with
-# Python 2.6 or 2.7.  This kit will be installed on the target system as part
-# of the installation process for the frozen image.  Note that the Python 2.5
-# interpreter requires msvcr71.dll which is included in the Python25 package,
-# however, Python 2.6 and 2.7 require the msvcr90.dll but they do not bundle it
-# with the Python26 or Python27 package.  Thus, for Python 2.6 and later, the
-# appropriate dll must be present on the target system at runtime.
-if sys.version_info >= (2, 6):
-    pypath = os.path.dirname(sys.executable)
-    data_files.append(('.', [os.path.join(pypath, 'vcredist_x86.exe')]))
-
-# Specify required packages to bundle in the executable image.
-packages = ['numpy', 'scipy', 'matplotlib', 'pytz', 'pyparsing',
-            'periodictable', 'bumps', 'sasmodels', 'pyopencl',
-            ]
-
-# Specify files to include in the executable image.
-includes = []
-
-# Specify files to exclude from the executable image.
-# - We can safely exclude Tk/Tcl and Qt modules because our app uses wxPython.
-# - We do not use ssl services so they are omitted.
-# - We can safely exclude the TkAgg matplotlib backend because our app uses
-#   "matplotlib.use('WXAgg')" to override the default matplotlib configuration.
-# - On the web it is widely recommended to exclude certain lib*.dll modules
-#   but this does not seem necessary any more (but adding them does not hurt).
-# - Python25 requires mscvr71.dll, however, Win XP includes this file.
-# - Since we do not support Win 9x systems, w9xpopen.dll is not needed.
-# - For some reason cygwin1.dll gets included by default, but it is not needed.
-
-excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg', 'numpy.distutils.test']
-
-dll_excludes = ['libgdk_pixbuf-2.0-0.dll',
-                'libgobject-2.0-0.dll',
-                'libgdk-win32-2.0-0.dll',
-                'tcl84.dll',
-                'tk84.dll',
-                'QtGui4.dll',
-                'QtCore4.dll',
-                'msvcr71.dll',
-                'msvcp90.dll',
-                'w9xpopen.exe',
-                'cygwin1.dll']
-
-
-class Target(object):
-
-    """This class stores metadata about the distribution in a dictionary."""
-
-    def __init__(self, **kw):
-        self.__dict__.update(kw)
-        self.version = version
-
-clientCLI = Target(
-    name='Bumps',
-    description='Bumps CLI application',
-    # module to run on application start
-    script=os.path.join('bin', 'bumps_cli.py'),
-    dest_base='bumps',  # file name part of the exe file to create
-    # also need to specify in data_files
-    icon_resources=[
-        (1, os.path.join('bumps', 'gui', 'resources', 'bumps.ico'))],
-    bitmap_resources=[],
-    other_resources=[(24, 1, manifest % dict(prog='Bumps'))])
-
-clientGUI = Target(
-    name='Bumps',
-    description='Bumps GUI application',
-    # module to run on application start
-    script=os.path.join('bin', 'bumps_gui.py'),
-    dest_base='bumps_gui',  # file name part of the exe file to create
-    # also need to specify in data_files
-    icon_resources=[
-        (1, os.path.join('bumps', 'gui', 'resources', 'bumps.ico'))],
-    bitmap_resources=[],
-    other_resources=[(24, 1, manifest % dict(prog='Bumps'))])
-
-# Now we do the work to create a standalone distribution using py2exe.
-#
-# When the application is run in console mode, a console window will be created
-# to receive any logging or error messages and the application will then create
-# a separate GUI application window.
-#
-# When the application is run in windows mode, it will create a GUI application
-# window and no console window will be provided.  Output to stderr will be
-# written to <app-image-name>.log.
-setup(
-    console=[clientCLI],
-    windows=[clientGUI],
-    options={'py2exe': {
-        'packages': packages,
-        'includes': includes,
-        'excludes': excludes,
-        'dll_excludes': dll_excludes,
-        'compressed': 1,   # standard compression
-        'optimize': 0,     # no byte-code optimization
-        'dist_dir': "dist",  # where to put py2exe results
-        'xref': False,     # display cross reference (as html doc)
-        'bundle_files': 1,  # bundle python25.dll in library.zip
-    }
-    },
-    # Since we are building two exe's, do not put the shared library in each
-    # of them.  Instead create a single, separate library.zip file.
-    # zipfile=None,               # bundle library.zip in exe
-    data_files=data_files           # list of files to copy to dist directory
-)
