Changeset 0f282a5 in sasview

Timestamp:

Aug 10, 2011 6:56:49 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:

bcfc969

Parents:

0cd16c2

Message:

fixed a bug; trying to compiles the files that are not c or cpp

File:

• sansmodels/setup.py (modified) (5 diffs)

sansmodels/setup.py

@@ -11 +11 @@
 """
 import sys
+if len(sys.argv) == 1:
+    sys.argv.append('install')
 import os
 
@@ -48 +50 @@
     class_list = ModelFactory().getAllModels()
     for name in class_list:
-        odb = open("sans/models/pyre/%s.odb" % name, 'w')
+        odb = open("src/sans/models/pyre/%s.odb" % name, 'w')
         odb.write(createODBcontent(name))
         odb.close()
-        print "sans/models/pyre/%s.odb created" % name
+        print "src/sans/models/pyre/%s.odb created" % name
         
 #
@@ -92 +94 @@
                    "winFuncs.c"]
 IGNORED_EXTENSIONS = [".h", ".txt", ".def", ".mm", ".hh", ".py"]
+EXTENSIONS = [".c", ".cpp"]
 
 def append_file(file_list, dir_path):
@@ -100 +103 @@
         if os.path.isfile(os.path.join(dir_path, f)):
             _, ext = os.path.splitext(f)
-            if ext not in IGNORED_EXTENSIONS and f not in IGNORED_FILES:
+            if ext.lower() in EXTENSIONS and f not in IGNORED_FILES:
                 file_list.append(os.path.join(dir_path, f)) 
         elif os.path.isdir(os.path.join(dir_path, f)) and \
@@ -108 +111 @@
                 if os.path.isfile(os.path.join(sub_dir, new_f)):
                     _, ext = os.path.splitext(new_f)
-                    if ext not in IGNORED_EXTENSIONS and\
+                    if ext.lower() in EXTENSIONS and\
                          new_f not in IGNORED_FILES:
                         file_list.append(os.path.join(sub_dir, new_f))