Changeset 78f74bd7 in sasview

Timestamp:

Feb 3, 2012 6:58:53 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:

e5c83e01

Parents:

60eea02

Message:

try to clean the cmodel folder before compiling

File:

• setup.py (modified) (2 diffs)

setup.py

@@ -217 +217 @@
 smear_dir  = os.path.join("sansmodels", "src", "c_smearer")
 wrapper_dir  = os.path.join("sansmodels", "src", "python_wrapper", "generated")
-if not os.path.isdir(wrapper_dir):
+if os.path.isdir(wrapper_dir):
+    for file in os.listdir(wrapper_dir): 
+        file_path =  os.path.join(wrapper_dir, file)
+        os.remove(file_path)
+else:
     os.makedirs(wrapper_dir)
-
 sys.path.append(os.path.join("sansmodels", "src", "python_wrapper"))
 from wrapping import generate_wrappers
@@ -308 +311 @@
     #required.extend(['comtypes', 'pisa', 'html5lib', 'reportlab'])
     #required.extend(['pisa', 'html5lib'])
-    if sys.version_info < (2, 7):
+    if sys.version_info < (2, 5):
         required.append('comtypes')
 else: