Changeset 4dc0969 in sasview

Timestamp:

Dec 22, 2011 12:03:30 PM (12 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:

• calculatorview/setup_exe.py (modified) (3 diffs)

calculatorview/setup_exe.py

@@ -47 +47 @@
    />
    <description>SansView</description>
-   <dependency>
-       <dependentAssembly>
-           <assemblyIdentity
-               type="win32"
-               name="Microsoft.Windows.Common-Controls"
-               version="6.0.0.0"
-               processorArchitecture="X86"
-               publicKeyToken="6595b64144ccf1df"
-               language="*"
-           />
-       </dependentAssembly>
+     <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+            type="win32"
+             name="Microsoft.VC90.CRT"
+           version="9.0.21022.8"
+            processorArchitecture="x86"
+            publicKeyToken="1fc8b3b9a1e18e3b">
+      </assemblyIdentity>
+    </dependentAssembly>
    </dependency>
    </assembly>
@@ -116 +115 @@
         data_files.append((os.path.split(f)[0], [f]))
 
+from glob import glob
+py26MSdll = glob(r"C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*")
+# install the MSVC 9 runtime dll's into the application folder
+#data_files += [("", py26MSdll),]
+data_files.append(("Microsoft.VC90.CRT", py26MSdll))
+#                        ("lib\Microsoft.VC90.CRT", py26MSdll)]
+#sys.path.append("Microsoft.VC90.CRT")
+
+mfcdir = "C:\Python27\Lib\site-packages\pythonwin"
+mfcfiles = [os.path.join(mfcdir, i) for i in ["mfc90.dll", "mfc90u.dll", "mfcm90.dll", "mfcm90u.dll", "Microsoft.VC90.MFC.manifest"]]
+data_files.append(("Microsoft.VC90.MFC", mfcfiles))
 
     
@@ -123 +133 @@
 packages = ['matplotlib', 'pytz','encodings', 'scipy']
 includes = ['site']
-excludes = [] 
 
-dll_excludes = [
-    'libgdk_pixbuf-2.0-0.dll', 
-    'libgobject-2.0-0.dll',
-    'libgdk-win32-2.0-0.dll',
-    ]
+excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg']
+
+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',
+                'w9xpopen.exe',
+                'cygwin1.dll']
 
 target_wx_client = Target(