Changeset 8945:a4617e24438d in orange


Ignore:
Timestamp:
09/10/11 09:50:05 (3 years ago)
Author:
mitar
Branch:
default
Convert:
8e8742ead00de0bfa00b0e2918ab55bccc66b86f
Message:

sys.executable does not work with Mac OS X bundles and Python there as it resolves to an absolute path where dynamic libraries are not found then anymore.

Location:
source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • source/makefile.defs

    r8943 r8945  
    6868 
    6969makefile.deps: 
    70     $(PYTHON) ../pyxtract/makedep.py -n $(MODULENAME) 
     70    PYTHON=$(PYTHON) $(PYTHON) ../pyxtract/makedep.py -n $(MODULENAME) 
    7171    rm -f ppp/stamp 
    7272    rm -f px/stamp 
  • source/pyxtract/makedep.py

    r8929 r8945  
    140140if ppp_timestamp_dep: 
    141141  makedepsfile.write("../orange/ppp/lists: ../pyxtract/defvectors.py\n") 
    142   makedepsfile.write("\t%s ../pyxtract/defvectors.py\n" % (sys.executable,)) 
     142  makedepsfile.write("\t%s ../pyxtract/defvectors.py\n" % (os.environ.get('PYTHON') or sys.executable,)) 
    143143  if modulename != "ORANGE": 
    144144    ppp_timestamp_dep.extend(["../orange/ppp/lists", "../orange/ppp/stamp"]) 
    145145  makedepsfile.write("ppp/stamp: ../pyxtract/pyprops.py %s\n" % " ".join(ppp_timestamp_dep)) 
    146   makedepsfile.write("\t%s ../pyxtract/pyprops.py -q -n %s" % (sys.executable, modulename)) 
     146  makedepsfile.write("\t%s ../pyxtract/pyprops.py -q -n %s" % (os.environ.get('PYTHON') or sys.executable, modulename)) 
    147147  if modulename != "ORANGE": 
    148148    makedepsfile.write(" -l ../orange/ppp/stamp -l ../orange/ppp/lists") 
     
    152152  makedepsfile.write("px/stamp: ../pyxtract/pyxtract.py %s | ppp/stamp\n" % " ".join(px_timestamp_dep)) 
    153153  short = {"ORANGEOM": "-w OM", "ORANGENE": "-w OG"}.get(modulename, "") 
    154   makedepsfile.write("\t%s ../pyxtract/pyxtract.py -m -q -n %s %s %s" % (sys.executable, modulename, short, " ".join(px_timestamp_dep))) 
     154  makedepsfile.write("\t%s ../pyxtract/pyxtract.py -m -q -n %s %s %s" % (os.environ.get('PYTHON') or sys.executable, modulename, short, " ".join(px_timestamp_dep))) 
    155155  if modulename != "ORANGE": 
    156156    makedepsfile.write(" -l ../orange/px/stamp") 
Note: See TracChangeset for help on using the changeset viewer.