Changeset 365a17f6 in sasview

Timestamp:

Feb 13, 2009 5:55:35 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

cbee247

Parents:

6c98b98

Message:

Preparing for executable build

Location:

sansview

Files:

• sansview.py (modified) (1 diff)
• setup_exe.py (modified) (6 diffs)

sansview/sansview.py

@@ -19 +19 @@
         # Additional perspectives can still be loaded
         # dynamically
+        # Note: py2exe can't find dynamically loaded
+        # modules. We load the fitting module here
+        # to ensure a complete Windows executable build.
+        import perspectives.fitting as module    
+        fitting_plug = module.Plugin()
+        self.gui.add_perspective(fitting_plug)
             
         # Build the GUI

sansview/setup_exe.py

@@ -2 +2 @@
 
 #
-# The setup to create a single exe file.
+# The setup to create a Windows executable.
+# Inno Setup can then be used with the installer.iss file 
+# in the top source directory to create an installer. 
 #
+# Setuptools clashes with py2exe 0.6.8 (and probably later too).
+# For that reason, most of the code needs to have direct imports
+# that are not going through pkg_resources. 
+#
+# Attention should be paid to dynamic imports. Data files can
+# be added to the distribution directory for that purpose.
+# See for example the 'images' directory below.
 
 import os, sys
-
 from distutils.core import setup
-
 from distutils.filelist import findall
-
 import matplotlib
-
 import py2exe
 
@@ -25 +30 @@
        type="win32"
    />
-   <description>PrView</description>
+   <description>SansView</description>
    <dependency>
        <dependentAssembly>
@@ -46 +51 @@
         self.__dict__.update(kw)
         # for the versioninfo resources
-        self.version = "0.1"
+        self.version = "0.2"
         self.company_name = "U Tennessee"
         self.copyright = "copyright 2008"
-        self.name = "PrView"
+        self.name = "SansView"
         
 #
@@ -57 +62 @@
 matplotlibdatadir = matplotlib.get_data_path()
 matplotlibdata = findall(matplotlibdatadir)
-matplotlibdata_files = []
+data_files = []
 
 for f in matplotlibdata:
-    dirname = os.path.join('matplotlibdata', f[len(matplotlibdatadir)+1:])
-    matplotlibdata_files.append((os.path.split(dirname)[0], [f]))
+    dirname = os.path.join('mpl-data', f[len(matplotlibdatadir)+1:])
+    data_files.append((os.path.split(dirname)[0], [f]))
 
+# Copying the images directory to the distribution directory.
+for f in findall('images'):
+    if os.path.split(f)[0].count('.svn')==0:
+        data_files.append((os.path.split(f)[0], [f]))
+    
 #
 # packages
 #
-packages = [
-    'matplotlib', 'pytz'
-    ]
-
+packages = ['matplotlib', 'pytz']
 includes = []
-excludes = ['OpenGL'] 
+excludes = [] 
 
 dll_excludes = [
@@ -79 +86 @@
     ]
 
-## This is the client for PARK: run on wx
 target_wx_client = Target(
-    description = 'fit  viewer',
+    description = 'SanView',
     script = 'sansview.py',
-    #other_resources = [(RT_MANIFEST, 1, manifest_template % dict(prog="AppJob"))],
     icon_resources = [(1, "images/ball.ico")],
     other_resources = [(24,1,manifest)],
-    dest_base = "sansView"
+    dest_base = "SansView"
     )
 
@@ -106 +111 @@
             },
     },
-    data_files=matplotlibdata_files
+    data_files=data_files
     
-    # Do something like this to add images to the distribution
-    #data_files=[ ("prog",["kategorien.xml",])]
 )