Changeset 0c17d96 in sasview

Timestamp:

Jun 22, 2015 12:03:49 PM (9 years ago)

Author:

krzywon

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:

6a6d687

Parents:

28812b8

Message:

Modified the windows build script to keep folder structure of the test
data

File:

• sasview/setup_exe.py (modified) (6 diffs)

sasview/setup_exe.py

@@ -231 +231 @@
 images_dir = os.path.join(path, "images")
 test_dir = os.path.join(path, "test")
+test_1d_dir = os.path.join(path, "test\\1d_data")
+test_2d_dir = os.path.join(path, "test\\2d_data")
+test_save_dir = os.path.join(path, "test\\save_states")
+test_upcoming_dir = os.path.join(path, "test\\upcoming_formats")
 
 matplotlibdatadir = matplotlib.get_data_path()
@@ -290 +294 @@
 
 # Copying the sample data user data
-for f in findall(test_dir):
-    if not ".svn" in f:
-        data_files.append(("test", [f]))
+for f in findall(test_1d_dir):
+    if not ".svn" in f:
+        data_files.append(("test\\1d_data", [f]))
+
+# Copying the sample data user data
+for f in findall(test_2d_dir):
+    if not ".svn" in f:
+        data_files.append(("test\\2d_data", [f]))
+
+# Copying the sample data user data
+for f in findall(test_save_dir):
+    if not ".svn" in f:
+        data_files.append(("test\\save_states", [f]))
+
+# Copying the sample data user data
+for f in findall(test_upcoming_dir):
+    if not ".svn" in f:
+        data_files.append(("test\\upcoming_formats", [f]))
+
 
 # See if the documentation has been built, and if so include it.
@@ -310 +330 @@
     # install the MSVC 9 runtime dll's into the application folder
     data_files.append(("Microsoft.VC90.CRT", py26MSdll_x86))
-
 
 # NOTE:
@@ -335 +354 @@
 packages.append('periodictable.core') # not found automatically
 #packages.append('IPython')
-includes = ['site', 'lxml._elementpath', 'lxml.etree']
+includes = ['site', 'lxml._elementpath', 'lxml.etree', 'zmq.backend.cython']
 
 # Exclude packages that are not needed but are often found on build systems
-excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg', 'sip', 'pytz']
+excludes = ['Tkinter', 'PyQt4', '_ssl', '_tkagg', 'sip', 'pytz', 'zmq.libzmq']
 
 
@@ -353 +372 @@
     # accidental links to msys/cygwin binaries; shouldn't be needed
     'cygwin1.dll',
+    'libzmq.pyd'
     ]
 
@@ -370 +390 @@
 #initialize category stuff
 #from sas.guiframe.CategoryInstaller import CategoryInstaller
-#CategoryInstaller.check_install()
+#CategoryInstaller.check_install(s)
+
+sys.setrecursionlimit(10000)
 
 setup(