get rid of sface.{bin,py}

diff --git a/sface-run b/sface-run
new file mode 100755 (executable)
index 0000000..74fdb73
--- /dev/null
+++ b/sface-run
@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+
+import os
+import sys
+from optparse import OptionParser
+from PyQt4.QtGui import *
+
+sys.path.append(".")
+exe = os.path.abspath(sys.argv[0])
+
+def using_env(e):
+    print "Using %s = %s" % (e, os.environ[e])
+
+
+if sys.platform == "darwin":
+    # for testing on mac os x 10.5 - baris
+    sys.path.append("/opt/local/lib/python2.5/site-packages/")
+
+    DIR = os.path.dirname(exe)
+    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")
+    SFI_PATH = os.path.join(RESOURCES, "sfa/client")
+    PATH=":".join([RESOURCES, SFI_PATH, 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
+
+elif sys.platform == "linux2":
+    sys.path.extend(["/usr/share", "/usr/share/sface"])
+
+    using_env("PATH")
+    print "Using sys.path =", sys.path
+
+
+from sface.mainwindow import MainWindow
+from sface.config import config
+
+
+def main(args):
+    app = QApplication(args)
+    app.setStyleSheet('''
+/* transparency
+QDialog, MainWindow {
+  background-color:rgba(255,255,255,120);
+}
+*/
+
+QTreeView, QLineEdit { 
+  border: 2px solid gray;
+  border-radius: 4px;
+  padding: 1px;
+  margin: 2px;
+}
+
+QPushButton {
+  background-color: white;
+  border: 2px solid gray;
+  border-radius: 4px;
+  padding: 6px;
+}
+
+QPushButton:pressed {
+  background-color: #5599FF;
+}
+
+QLabel {
+  font-size: 14px;
+}
+
+''')
+
+
+    win = MainWindow()
+    win.redirectOutputToLog()
+    win.setWindowTitle("Sface: SFA Interface")
+    win.show()
+    win.raise_()
+    win.activateWindow()
+    app.setActiveWindow(win)
+
+    sys.exit(app.exec_())
+
+
+if __name__ == "__main__":
+    parser=OptionParser()
+    config.add_options_to_OptionParser(parser)
+    (options,args)=parser.parse_args()
+    config.update_from_OptionParser(options)
+    config.display("After command-line")
+    main(sys.argv)

diff --git a/sface.bin b/sface.bin
deleted file mode 100755 (executable)
index 86ba346..0000000
--- a/sface.bin
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-PYTHONPATH=$PYTHONPATH:/opt/local/lib/python2.5/site-packages/
-# thierry : I have this in my .bashrc now
-#PYTHONPATH=/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/:$PYTHONPATH
-# ditto
-#PYTHONPATH=$HOME/stree/sfa/trunk:$PYTHONPATH
-export PYTHONPATH
-
-echo Using PYTHONPATH=$PYTHONPATH
-
-sfacedir=$(dirname $0)
-cd $sfacedir
-echo Running from directory $(pwd)
-
-exec python sface.py "$@" &

diff --git a/sface.py b/sface.py
deleted file mode 100644 (file)
index ee21b2f..0000000
--- a/sface.py
+++ /dev/null
@@ -1,62 +0,0 @@
-import sys
-sys.path.append(".")
-
-from optparse import OptionParser
-
-from PyQt4.QtGui import *
-
-from sface.mainwindow import MainWindow
-from sface.config import config
-
-def main(args):
-    app = QApplication(args)
-    app.setStyleSheet('''
-/* transparency
-QDialog, MainWindow {
-  background-color:rgba(255,255,255,120);
-}
-*/
-
-QTreeView, QLineEdit { 
-  border: 2px solid gray;
-  border-radius: 4px;
-  padding: 1px;
-  margin: 2px;
-}
-
-QPushButton {
-  background-color: white;
-  border: 2px solid gray;
-  border-radius: 4px;
-  padding: 6px;
-}
-
-QPushButton:pressed {
-  background-color: #5599FF;
-}
-
-QLabel {
-  font-size: 14px;
-}
-
-''')
-
-
-    win = MainWindow()
-    win.redirectOutputToLog()
-    win.setWindowTitle("Sface: SFA Interface")
-    win.show()
-    win.raise_()
-    win.activateWindow()
-    app.setActiveWindow(win)
-
-    sys.exit(app.exec_())
-
-
-if __name__ == "__main__":
-    parser=OptionParser()
-    config.add_options_to_OptionParser(parser)
-    (options,args)=parser.parse_args()
-    config.update_from_OptionParser(options)
-    config.display("After command-line")
-    main(sys.argv)