git://git.onelab.eu
/
sface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove obsolete code
[sface.git]
/
sface-run
diff --git
a/sface-run
b/sface-run
index
74fdb73
..
48650dc
100755
(executable)
--- a/
sface-run
+++ b/
sface-run
@@
-3,14
+3,23
@@
import os
import sys
from optparse import OptionParser
import os
import sys
from optparse import OptionParser
-from PyQt4.QtGui import *
-sys.path.
append(
".")
+sys.path.
insert(0,
".")
exe = os.path.abspath(sys.argv[0])
def using_env(e):
print "Using %s = %s" % (e, os.environ[e])
exe = os.path.abspath(sys.argv[0])
def using_env(e):
print "Using %s = %s" % (e, os.environ[e])
+def print_env(config):
+ if not config.verbose:
+ return
+
+ if sys.platform == "darwin":
+ using_env("DYLD_FRAMEWORK_PATH")
+ using_env("DYLD_LIBRARY_PATH")
+
+ using_env("PATH")
+ print "Using sys.path =", sys.path
if sys.platform == "darwin":
# for testing on mac os x 10.5 - baris
if sys.platform == "darwin":
# for testing on mac os x 10.5 - baris
@@
-20,9
+29,7
@@
if sys.platform == "darwin":
CONTENTS = os.path.dirname(DIR)
RESOURCES = os.path.join(CONTENTS, "Resources")
FRAMEWORKS = os.path.join(CONTENTS, "Frameworks")
CONTENTS = os.path.dirname(DIR)
RESOURCES = os.path.join(CONTENTS, "Resources")
FRAMEWORKS = os.path.join(CONTENTS, "Frameworks")
-
- sys.path.extend([RESOURCES, FRAMEWORKS])
-
+
DYLD_FRAMEWORK_PATH = FRAMEWORKS
DYLD_LIBRARY_PATH = RESOURCES
PATH = os.getenv("PATH")
DYLD_FRAMEWORK_PATH = FRAMEWORKS
DYLD_LIBRARY_PATH = RESOURCES
PATH = os.getenv("PATH")
@@
-32,23
+39,17
@@
if sys.platform == "darwin":
os.environ["PATH"] = PATH
os.environ["DYLD_LIBRARY_PATH"] = DYLD_LIBRARY_PATH
os.environ["DYLD_FRAMEWORK_PATH"] = DYLD_FRAMEWORK_PATH
os.environ["PATH"] = PATH
os.environ["DYLD_LIBRARY_PATH"] = DYLD_LIBRARY_PATH
os.environ["DYLD_FRAMEWORK_PATH"] = DYLD_FRAMEWORK_PATH
-
- using_env("PATH")
- using_env("DYLD_FRAMEWORK_PATH")
- using_env("DYLD_LIBRARY_PATH")
- print "Using sys.path =", sys.path
+ if os.path.exists(RESOURCES): sys.path.insert(0, RESOURCES)
+ if os.path.exists(FRAMEWORKS): sys.path.insert(0, FRAMEWORKS)
elif sys.platform == "linux2":
sys.path.extend(["/usr/share", "/usr/share/sface"])
elif sys.platform == "linux2":
sys.path.extend(["/usr/share", "/usr/share/sface"])
- using_env("PATH")
- print "Using sys.path =", sys.path
-
+from PyQt4.QtGui import *
from sface.mainwindow import MainWindow
from sface.config import config
from sface.mainwindow import MainWindow
from sface.config import config
-
def main(args):
app = QApplication(args)
app.setStyleSheet('''
def main(args):
app = QApplication(args)
app.setStyleSheet('''
@@
-100,4
+101,5
@@
if __name__ == "__main__":
(options,args)=parser.parse_args()
config.update_from_OptionParser(options)
config.display("After command-line")
(options,args)=parser.parse_args()
config.update_from_OptionParser(options)
config.display("After command-line")
+ print_env(config)
main(sys.argv)
main(sys.argv)