diff --git a/Makefile b/Makefile index 8111dc3..f3641b9 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,13 @@ default: echo "sorry, no default action" + +gui: pyqt pyside -gui: +pyside: pyside-uic relational_pyside/survey.ui > relational_pyside/survey.py pyside-uic relational_pyside/maingui.ui > relational_pyside/maingui.py pyside-uic relational_pyside/rel_edit.ui > relational_pyside/rel_edit.py +pyqt: pyuic4 relational_gui/survey.ui > relational_gui/survey.py pyuic4 relational_gui/maingui.ui > relational_gui/maingui.py pyuic4 relational_gui/rel_edit.ui > relational_gui/rel_edit.py @@ -75,24 +78,6 @@ clean: rm -rf setup/*.pyo || echo ok rm -rf relational_mac rm -rf test/*~ -mac: app - mkdir relational_mac || echo Exists - mv Relational.app relational_mac - mkdir relational_mac/samples || echo Exists - cp samples/*csv relational_mac/samples - tar -zcvvf relational_`./relational_gui.py -v | grep Relational | cut -d" " -f2`.tar.gz relational_mac/ - rm -rf relational_mac -app: - mkdir -p Relational.app/Contents/Resources || echo Exists - cp *py Relational.app/Contents/Resources - mkdir -p Relational.app/Contents/Resources/relational || echo Exists - cp relational/*py Relational.app/Contents/Resources/relational - mkdir -p Relational.app/Contents/Resources/relational_gui || echo Exists - cp relational_gui/*py Relational.app/Contents/Resources/relational_gui - cp mac/Info.plist mac/PkgInfo Relational.app/Contents - mkdir -p Relational.app/Contents/MacOS || echo Exists - cp mac/relational_gui mac/Python Relational.app/Contents/MacOS - cp mac/PythonApplet.icns mac/__argvemulator_relational_gui.py Relational.app/Contents/Resources/ debian: dpkg-buildpackage diff --git a/mac/Info.plist b/mac/Info.plist deleted file mode 100644 index 31a013a..0000000 --- a/mac/Info.plist +++ /dev/null @@ -1,35 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleDocumentTypes - - - CFBundleTypeOSTypes - - **** - fold - disk - - CFBundleTypeRole - Viewer - - - CFBundleExecutable - relational_gui - CFBundleIconFile - PythonApplet.icns - CFBundleIdentifier - relational_gui - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - relational_gui - CFBundlePackageType - APPL - CFBundleSignature - ???? - - diff --git a/mac/PkgInfo b/mac/PkgInfo deleted file mode 100644 index bd04210..0000000 --- a/mac/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -APPL???? \ No newline at end of file diff --git a/mac/Python b/mac/Python deleted file mode 100755 index d8c1a9a..0000000 Binary files a/mac/Python and /dev/null differ diff --git a/mac/PythonApplet.icns b/mac/PythonApplet.icns deleted file mode 100644 index a3f08b2..0000000 Binary files a/mac/PythonApplet.icns and /dev/null differ diff --git a/mac/__argvemulator_relational.py b/mac/__argvemulator_relational.py deleted file mode 100644 index aa8d43d..0000000 --- a/mac/__argvemulator_relational.py +++ /dev/null @@ -1,4 +0,0 @@ -import argvemulator, os - -argvemulator.ArgvCollector().mainloop() -execfile(os.path.join(os.path.split(__file__)[0], "relational.py")) diff --git a/mac/__argvemulator_relational_gui.py b/mac/__argvemulator_relational_gui.py deleted file mode 100644 index c422386..0000000 --- a/mac/__argvemulator_relational_gui.py +++ /dev/null @@ -1,4 +0,0 @@ -import argvemulator, os - -argvemulator.ArgvCollector().mainloop() -execfile(os.path.join(os.path.split(__file__)[0], "relational_gui.py")) diff --git a/mac/relational b/mac/relational deleted file mode 100644 index 79f3c05..0000000 --- a/mac/relational +++ /dev/null @@ -1,23 +0,0 @@ -#!/Developer/Applications/Utilities/MacPython-2.3/BuildApplet.app/Contents/MacOS/Python - -import sys, os -execdir = os.path.dirname(sys.argv[0]) -executable = os.path.join(execdir, "Python") -resdir = os.path.join(os.path.dirname(execdir), "Resources") -libdir = os.path.join(os.path.dirname(execdir), "Frameworks") -mainprogram = os.path.join(resdir, "__argvemulator_relational.py") - -sys.argv.insert(1, mainprogram) -if 0 or 0: - os.environ["PYTHONPATH"] = resdir - if 0: - os.environ["PYTHONHOME"] = resdir -else: - pypath = os.getenv("PYTHONPATH", "") - if pypath: - pypath = ":" + pypath - os.environ["PYTHONPATH"] = resdir + pypath -os.environ["PYTHONEXECUTABLE"] = executable -os.environ["DYLD_LIBRARY_PATH"] = libdir -os.environ["DYLD_FRAMEWORK_PATH"] = libdir -os.execve(executable, sys.argv, os.environ) diff --git a/mac/relational_gui b/mac/relational_gui deleted file mode 100755 index a5e1512..0000000 --- a/mac/relational_gui +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/python - - -import sys, os - -execdir = os.path.dirname(sys.argv[0]) -executable = os.path.join(execdir, "Python") -resdir = os.path.join(os.path.dirname(execdir), "Resources") -libdir = os.path.join(os.path.dirname(execdir), "Frameworks") -mainprogram = os.path.join(resdir, "relational_gui.py") - -#sys.argv.insert(1, mainprogram) -#if 0 or 0: -# os.environ["PYTHONPATH"] = resdir -# if 0: -# os.environ["PYTHONHOME"] = resdir -#else: -# pypath = os.getenv("PYTHONPATH", "") -# if pypath: -# pypath = ":" + pypath -# os.environ["PYTHONPATH"] = resdir + pypath -#os.environ["PYTHONEXECUTABLE"] = executable -#os.environ["DYLD_LIBRARY_PATH"] = libdir -#os.environ["DYLD_FRAMEWORK_PATH"] = libdir -#os.execvp("python",(mainprogram,)) -if os.fork() == 0: - os.execvp("python",("python",mainprogram,))