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])
-def print_env(options):
- if not options.verbose:
+def print_env(config):
+ if not config.verbose:
return
if sys.platform == "darwin":
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")
os.environ["PATH"] = PATH
os.environ["DYLD_LIBRARY_PATH"] = DYLD_LIBRARY_PATH
os.environ["DYLD_FRAMEWORK_PATH"] = DYLD_FRAMEWORK_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"])
+from PyQt4.QtGui import *
from sface.mainwindow import MainWindow
from sface.config import config
(options,args)=parser.parse_args()
config.update_from_OptionParser(options)
config.display("After command-line")
- print_env(options)
+ print_env(config)
main(sys.argv)