# HG changeset patch # User Robal # Date 1287746261 -7200 # Node ID 1f5799d979b49f7bdd5ebb58e9c2083081147529 # Parent 5765007ad9e767615a57ead333906b19cfa43c54 set python2 env diff -r 5765007ad9e7 -r 1f5799d979b4 scidavis/python-includepath.py --- a/scidavis/python-includepath.py Fri Oct 22 13:09:25 2010 +0200 +++ b/scidavis/python-includepath.py Fri Oct 22 13:17:41 2010 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 from distutils import sysconfig from PyQt4 import pyqtconfig config = pyqtconfig.Configuration() diff -r 5765007ad9e7 -r 1f5799d979b4 scidavis/python-libs-win.py --- a/scidavis/python-libs-win.py Fri Oct 22 13:09:25 2010 +0200 +++ b/scidavis/python-libs-win.py Fri Oct 22 13:17:41 2010 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 from PyQt4 import pyqtconfig config = pyqtconfig.Configuration() diff -r 5765007ad9e7 -r 1f5799d979b4 scidavis/python-sipcmd.py --- a/scidavis/python-sipcmd.py Fri Oct 22 13:09:25 2010 +0200 +++ b/scidavis/python-sipcmd.py Fri Oct 22 13:17:41 2010 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 from PyQt4 import pyqtconfig config = pyqtconfig.Configuration() flags = [] diff -r 5765007ad9e7 -r 1f5799d979b4 scidavis/python.pri --- a/scidavis/python.pri Fri Oct 22 13:09:25 2010 +0200 +++ b/scidavis/python.pri Fri Oct 22 13:17:41 2010 +0200 @@ -15,7 +15,7 @@ SOURCES += src/PythonScript.cpp src/PythonScripting.cpp unix { - INCLUDEPATH += $$system(python python-includepath.py) + INCLUDEPATH += $$system(python2 python-includepath.py) macx { LIBS += -framework Python } else { @@ -23,7 +23,7 @@ } LIBS += -lm system(mkdir -p $${SIP_DIR}) - system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip) + system($$system(python2 python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip) } win32 { # HG changeset patch # User Robal # Date 1287751697 -7200 # Node ID 42d95b7369a82382d81670c5d0af3d675262c93f # Parent 1f5799d979b49f7bdd5ebb58e9c2083081147529 change missed 'python' to 'python2' in python.pri diff -r 1f5799d979b4 -r 42d95b7369a8 scidavis/python.pri --- a/scidavis/python.pri Fri Oct 22 13:17:41 2010 +0200 +++ b/scidavis/python.pri Fri Oct 22 14:48:17 2010 +0200 @@ -19,7 +19,7 @@ macx { LIBS += -framework Python } else { - LIBS += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"") + LIBS += $$system(python2 -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"") } LIBS += -lm system(mkdir -p $${SIP_DIR})