- Removed mac target and generation, it didn't work for new versions of osx

anyway, and the .app is not self contained.
- Separate make targets for pyqt and pyside

Makefile

@@ -1,10 +1,13 @@
 default:
 	echo "sorry, no default action"
 	
-gui:
+gui: pyqt pyside
+
+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

mac/Info.plist

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>****</string>
-				<string>fold</string>
-				<string>disk</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-		</dict>
-	</array>
-	<key>CFBundleExecutable</key>
-	<string>relational_gui</string>
-	<key>CFBundleIconFile</key>
-	<string>PythonApplet.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>relational_gui</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>relational_gui</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-</dict>
-</plist>

mac/PkgInfo

@@ -1 +0,0 @@
-APPL????

mac/__argvemulator_relational.py

@@ -1,4 +0,0 @@
-import argvemulator, os
-
-argvemulator.ArgvCollector().mainloop()
-execfile(os.path.join(os.path.split(__file__)[0], "relational.py"))

mac/__argvemulator_relational_gui.py

@@ -1,4 +0,0 @@
-import argvemulator, os
-
-argvemulator.ArgvCollector().mainloop()
-execfile(os.path.join(os.path.split(__file__)[0], "relational_gui.py"))

mac/relational

@@ -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)

mac/relational_gui

@@ -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,))