/[ascend]/trunk/pygtk/ascend.in
ViewVC logotype

Diff of /trunk/pygtk/ascend.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2083 by jpye, Thu Sep 24 06:37:53 2009 UTC revision 2084 by jpye, Thu Sep 24 07:39:14 2009 UTC
# Line 58  elif platform.system()=="Darwin": Line 58  elif platform.system()=="Darwin":
58    
59      INSTALL_LIB = path_absolute(".")      INSTALL_LIB = path_absolute(".")
60      INSTALL_ASCDATA = path_absolute("Resources")      INSTALL_ASCDATA = path_absolute("Resources")
61      INSATLL_MODELS = path_absolute("""@ASC_LIBRARY_REL_DIST@""")      INSTALL_MODELS = path_absolute("""@ASC_LIBRARY_REL_DIST@""")
62      INSTALL_SOLVERS = path_absolute("""@ASC_SOLVERS_REL_DIST@""")      INSTALL_SOLVERS = path_absolute("""@ASC_SOLVERS_REL_DIST@""")
63      INSTALL_PYTHON = path_absolute("Python")      INSTALL_PYTHON = path_absolute("Python")
64        DEFAULT_ASCENDLIBRARY="%s;%s" % (INSTALL_SOLVERS,INSTALL_MODELS)
65  else:  else:
66      LDPATHVAR = 'LD_LIBRARY_PATH'      LDPATHVAR = 'LD_LIBRARY_PATH'
67    
# Line 101  if not os.environ.get('ASC_GDB'): Line 101  if not os.environ.get('ASC_GDB'):
101          restart = 1          restart = 1
102    
103      # if ASCENDLIBRARY has been specified, make sure it's including the Model Library      # if ASCENDLIBRARY has been specified, make sure it's including the Model Library
104      if os.environ.get('ASCENDLIBRARY'):      if os.environ.get('ASCENDLIBRARY') or platform.system()=="Darwin":
105            if not 'ASCENDLIBRARY' in os.environ:
106                os.environ['ASCENDLIBRARY'] = ""
107          envmodels = [os.path.abspath(i) for i in os.environ['ASCENDLIBRARY'].split(SEP)]          envmodels = [os.path.abspath(i) for i in os.environ['ASCENDLIBRARY'].split(SEP)]
108          if not INSTALL_MODELS in envmodels:          if not INSTALL_MODELS in envmodels:
109              envmodels.append(INSTALL_MODELS)              envmodels.append(INSTALL_MODELS)
# Line 109  if not os.environ.get('ASC_GDB'): Line 111  if not os.environ.get('ASC_GDB'):
111              restart = 1              restart = 1
112    
113      # if ASCENDSOLVERS has been specified, make sure it includes the standard solvers        # if ASCENDSOLVERS has been specified, make sure it includes the standard solvers  
114      if os.environ.get('ASCENDSOLVERS'):      if os.environ.get('ASCENDSOLVERS') or platform.system()=="Darwin":
115            if not 'ASCENDSOLVERS' in os.environ:
116                os.environ['ASCENDSOLVERS'] = ""
117          envsolvers = [os.path.abspath(i) for i in os.environ['ASCENDSOLVERS'].split(SEP)]          envsolvers = [os.path.abspath(i) for i in os.environ['ASCENDSOLVERS'].split(SEP)]
118          if not INSTALL_SOLVERS in envsolvers:          if not INSTALL_SOLVERS in envsolvers:
119              envsolvers.append(INSTALL_SOLVERS)              envsolvers.append(INSTALL_SOLVERS)

Legend:
Removed from v.2083  
changed lines
  Added in v.2084

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22