Changeset c82cf89 in sasview

Timestamp:

May 1, 2018 8:16:02 AM (6 years ago)

Author:

wojciech

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

d2647feb

Parents:

f4161f7a

Message:

Forcing cc check at installation that should trigger Xcode

File:

• src/sas/sasview/sasview.py (modified) (2 diffs)

src/sas/sasview/sasview.py

@@ -198 +198 @@
 def check_sasmodels_compiler():
     """
-    Checking c compiler for sasmodels
-    """
-    if sys.platform == "darwin" and not os.path.exists("/Library/Developer/CommandLineTools/usr/bin/cc"):
-        raise RuntimeError("No compiler. Open Terminal.app and type 'cc' at the command prompt for more instructions.")
+    Checking c compiler for sasmodels and trying to trigger xcode command line
+    for installation
+    """
+    import subprocess
+    logger = logging.getLogger(__name__)
+    #if sys.platform == "darwin" and not\
+    try:
+        # need shell=True on windows to keep console box from popping up
+        shell = (os.name == 'nt')
+        subprocess.check_output("cc", shell=shell, stderr=subprocess.STDOUT)
+    except subprocess.CalledProcessError:
+        raise RuntimeError("No compiler installed. Please follow installation instructions\n")
 
 def setup_sasmodels():
@@ -225 +233 @@
     setup_sasmodels()
     setup_wx()
-    #check_sasmodels_compiler()
+    check_sasmodels_compiler()
     SasView()