ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/JSOC/localize.py
(Generate patch)

Comparing localize.py (file contents):
Revision 1.11 by arta, Tue Nov 19 23:41:02 2013 UTC vs.
Revision 1.12 by arta, Fri Nov 22 01:58:25 2013 UTC

# Line 554 | Line 554 | def configureComps(defs, mDefs):
554          hasgfort = bool(0)
555          
556          # Try icc.
557 <        cmd = 'icc -V 2>&1'
557 >        cmd = 'icc --version 2>&1'
558          try:
559              ret = check_output(cmd, shell=True)
560              ret = ret.decode("utf-8")
# Line 563 | Line 563 | def configureComps(defs, mDefs):
563              rv = bool(1)
564          
565          if not rv:
566 <            regexp = re.compile(r".+Version\s+(\d+)[.](\d+)", re.DOTALL)
566 >            regexp = re.compile(r"\s*\S+\s+\S+\s+(\d+)[.](\d+)", re.DOTALL)
567              matchobj = regexp.match(ret)
568              if matchobj is None:
569                  raise Exception('unexpectedIccRet', ret)
# Line 595 | Line 595 | def configureComps(defs, mDefs):
595                          hasgcc = bool(1)
596  
597          # Try ifort.
598 <        cmd = 'ifort -V 2>&1'
598 >        cmd = 'ifort --version 2>&1'
599          try:
600              ret = check_output(cmd, shell=True)
601              ret = ret.decode("utf-8")
# Line 604 | Line 604 | def configureComps(defs, mDefs):
604              rv = bool(1)
605  
606          if not rv:
607 <            regexp = re.compile(r".+Version\s+(\d+)\.(\d+)", re.DOTALL)
607 >            regexp = re.compile(r"\s*\S+\s+\S+\s+(\d+)\.(\d+)", re.DOTALL)
608              matchobj = regexp.match(ret)
609              if matchobj is None:
610                  raise Exception('unexpectedIfortRet', ret)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines