Changeset 4c29e4d in sasview for setup.py

Timestamp:

May 6, 2016 12:43:26 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

b523c0e

Parents:

6a698c0

Message:

remove compiler warnings from mac build

File:

• setup.py (modified) (4 diffs)

setup.py

@@ -215 +215 @@
             os.path.join(gen_dir, "libfunc.c"),
             os.path.join(gen_dir, "librefl.c"),
-            os.path.join(gen_dir, "winFuncs.c"),
         ],
         include_dirs=[numpy_incl_path, gen_dir],
@@ -268 +267 @@
 # packages.append("sas.models")
 
-IGNORED_FILES = [".svn"]
-if not os.name=='nt':
-    IGNORED_FILES.extend(["gamma_win.c","winFuncs.c"])
-
 EXTENSIONS = [".c", ".cpp"]
 
@@ -281 +276 @@
         if os.path.isfile(os.path.join(dir_path, f)):
             _, ext = os.path.splitext(f)
-            if ext.lower() in EXTENSIONS and f not in IGNORED_FILES:
+            if ext.lower() in EXTENSIONS:
                 file_list.append(os.path.join(dir_path, f))
         elif os.path.isdir(os.path.join(dir_path, f)) and \
@@ -289 +284 @@
                 if os.path.isfile(os.path.join(sub_dir, new_f)):
                     _, ext = os.path.splitext(new_f)
-                    if ext.lower() in EXTENSIONS and\
-                         new_f not in IGNORED_FILES:
+                    if ext.lower() in EXTENSIONS:
                         file_list.append(os.path.join(sub_dir, new_f))