Changeset 4dc0969 in sasview


Ignore:
Timestamp:
Dec 22, 2011 12:03:30 PM (13 years ago)
Author:
Jae Cho <jhjcho@…>
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:
5c7cb6f
Parents:
273801b
Message:

correct some problems

File:
1 edited

Legend:

Unmodified
Added
Removed

  • calculatorview/setup_exe.py

    r3ff72e2 r4dc0969  
    4747   /> 
    4848   <description>SansView</description> 
    49    <dependency> 
    50        <dependentAssembly> 
    51            <assemblyIdentity 
    52                type="win32" 
    53                name="Microsoft.Windows.Common-Controls" 
    54                version="6.0.0.0" 
    55                processorArchitecture="X86" 
    56                publicKeyToken="6595b64144ccf1df" 
    57                language="*" 
    58            /> 
    59        </dependentAssembly> 
     49     <dependency> 
     50    <dependentAssembly> 
     51      <assemblyIdentity 
     52            type="win32" 
     53             name="Microsoft.VC90.CRT" 
     54           version="9.0.21022.8" 
     55            processorArchitecture="x86" 
     56            publicKeyToken="1fc8b3b9a1e18e3b"> 
     57      </assemblyIdentity> 
     58    </dependentAssembly> 
    6059   </dependency> 
    6160   </assembly> 
    … …  
    116115        data_files.append((os.path.split(f)[0], [f])) 
    117116 
     117from glob import glob 
     118py26MSdll = glob(r"C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*") 
     119# install the MSVC 9 runtime dll's into the application folder 
     120#data_files += [("", py26MSdll),] 
     121data_files.append(("Microsoft.VC90.CRT", py26MSdll)) 
     122#                        ("lib\Microsoft.VC90.CRT", py26MSdll)] 
     123#sys.path.append("Microsoft.VC90.CRT") 
     124 
     125mfcdir = "C:\Python27\Lib\site-packages\pythonwin" 
     126mfcfiles = [os.path.join(mfcdir, i) for i in ["mfc90.dll", "mfc90u.dll", "mfcm90.dll", "mfcm90u.dll", "Microsoft.VC90.MFC.manifest"]] 
     127data_files.append(("Microsoft.VC90.MFC", mfcfiles)) 
    118128 
    119129     
    … …  
    123133packages = ['matplotlib', 'pytz','encodings', 'scipy'] 
    124134includes = ['site'] 
    125 excludes = []  
    126135 
    127 dll_excludes = [ 
    128     'libgdk_pixbuf-2.0-0.dll',  
    129     'libgobject-2.0-0.dll', 
    130     'libgdk-win32-2.0-0.dll', 
    131     ] 
     136excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg'] 
     137 
     138dll_excludes = ['libgdk_pixbuf-2.0-0.dll', 
     139                'libgobject-2.0-0.dll', 
     140                'libgdk-win32-2.0-0.dll', 
     141                'tcl84.dll', 
     142                'tk84.dll', 
     143                'QtGui4.dll', 
     144                'QtCore4.dll', 
     145                'w9xpopen.exe', 
     146                'cygwin1.dll'] 
    132147 
    133148target_wx_client = Target( 
Note: See TracChangeset for help on using the changeset viewer.