Changeset d4c19e5 in sasview for sansview/setup_exe.py

Timestamp:

Aug 12, 2011 1:48:47 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:

390742c

Parents:

38cfa7a

Message:

fixing setup_exe-ing of sansview app

File:

• sansview/setup_exe.py (modified) (5 diffs)

sansview/setup_exe.py

@@ -75 +75 @@
 # to use the MatPlotLib.
 #
-current_dir = os.getcwd()
-path, _ = os.path.split(current_dir)
+path = os.getcwd()
+
 plugins_dir = os.path.join(path, "plugins")
 media_dir = os.path.join(path, "media")
@@ -85 +85 @@
 matplotlibdata = findall(matplotlibdatadir)
 data_files = []
-from glob import glob
-data_files = [("Microsoft.VC90.CRT", glob(r'C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*'))]
-sys.path.append("C:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\redist\\x86\\Microsoft.VC90.CRT")
 # Copying SLD data
 import periodictable
 import logging
 data_files += periodictable.data_files()
+
+import sans.perspectives.fitting as fitting
+data_files += fitting.data_files()
 
 import sans.perspectives.calculator as calculator
@@ -98 +98 @@
 import sans.perspectives.invariant as invariant
 data_files += invariant.data_files()
+
 import sans.guiframe as guiframe
 data_files += guiframe.data_files()
@@ -114 +115 @@
     data_files.append(('.', [f]))
 f = 'custom_config.py'
+if os.path.isfile(f):
+    data_files.append(('.', [f]))
+f = 'local_config.py'
 if os.path.isfile(f):
     data_files.append(('.', [f]))
@@ -134 +138 @@
 for f in findall(plugins_dir):
     if os.path.split(f)[0].count('.svn')==0:
-        data_files.append((os.path.split(f)[0], [f]))
+        data_files.append(('plugins', [f]))