# HG changeset patch
# User drewp@bigasterisk.com
# Date 2005-04-10 19:12:57
# Node ID 1a84c5e83d3e4c489692f13e1bb6b9c6e96e8105
# Parent  26704c2ab1ad4747d1ac07906a86d16ec306b1be

dmxserver and subcomposer work in new layout

diff --git a/light8/dmxserver.py b/bin/dmxserver
rename from light8/dmxserver.py
rename to bin/dmxserver
--- a/light8/dmxserver.py
+++ b/bin/dmxserver
@@ -27,8 +27,9 @@ from twisted.internet import reactor
 from twisted.web import xmlrpc, server
 import sys,time,os
 from optparse import OptionParser
-from io import ParportDMX
-from updatefreq import Updatefreq
+import run_local
+from light9.io import ParportDMX
+from light9.updatefreq import Updatefreq
 
 class XMLRPCServe(xmlrpc.XMLRPC):
     def __init__(self,options):
diff --git a/bin/run_local.py b/bin/run_local.py
new file mode 100644
--- /dev/null
+++ b/bin/run_local.py
@@ -0,0 +1,8 @@
+# allows bin/* to work without installation
+
+# this should be turned off when the programs are installed
+
+import sys,os
+sys.path.insert(0,os.path.join(os.path.dirname(sys.argv[0]),".."))
+
+
diff --git a/flax/Subcomposer.py b/bin/subcomposer
rename from flax/Subcomposer.py
rename to bin/subcomposer
--- a/flax/Subcomposer.py
+++ b/bin/subcomposer
@@ -1,15 +1,13 @@
 #!/usr/bin/python
 
 from __future__ import division, nested_scopes
+import sys,os,time,atexit
 import Tkinter as tk
-from dmxchanedit import Levelbox
-import sys,os,time,atexit
-sys.path.append("../light8")
-import dmxclient
-import Patch
-import Submaster
+from dispatch import dispatcher
 
-from dispatch import dispatcher
+import run_local
+from light9.dmxchanedit import Levelbox
+from light9 import dmxclient, Patch, Submaster
 
 class Subcomposer(tk.Frame):
     def __init__(self, master, levelboxopts=None, dmxdummy=0, numchannels=68,
diff --git a/light8/Patch.py b/light9/Patch.py
rename from light8/Patch.py
rename to light9/Patch.py
diff --git a/flax/Submaster.py b/light9/Submaster.py
rename from flax/Submaster.py
rename to light9/Submaster.py
--- a/flax/Submaster.py
+++ b/light9/Submaster.py
@@ -1,10 +1,6 @@
 from __future__ import division
-from TLUtility import dict_scale, dict_max
-
-import sys
-sys.path.append('../light8')
-
-import Patch
+from light9.TLUtility import dict_scale, dict_max
+from light9 import Patch
 
 class Submaster:
     "Contain a dictionary of levels, but you didn't need to know that"
diff --git a/flax/TLUtility.py b/light9/TLUtility.py
rename from flax/TLUtility.py
rename to light9/TLUtility.py
diff --git a/flax/dmxchanedit.py b/light9/dmxchanedit.py
rename from flax/dmxchanedit.py
rename to light9/dmxchanedit.py
diff --git a/light8/dmxclient.py b/light9/dmxclient.py
rename from light8/dmxclient.py
rename to light9/dmxclient.py
diff --git a/light8/Makefile b/light9/io/Makefile
rename from light8/Makefile
rename to light9/io/Makefile
--- a/light8/Makefile
+++ b/light9/io/Makefile
@@ -1,12 +1,9 @@
 LIB=/usr/local/lib
-INC=-I/usr/local/include/python2.2
+INC=-I/usr/local/include/python2.3
 
-go: _parport.so FlyingFader.py _serport.so
+go: _parport.so _serport.so
 	result="your modules and links are now up to date"
 
-FlyingFader.py:
-	ln -s ../Widgets/FlyingFader.py
-
 _parport.so: parport_wrap.c
 	gcc -shared ${INC} parport_wrap.c parport.c -o _parport.so 
 
diff --git a/light8/io.py b/light9/io/__init__.py
rename from light8/io.py
rename to light9/io/__init__.py
diff --git a/light8/parport.c b/light9/io/parport.c
rename from light8/parport.c
rename to light9/io/parport.c
diff --git a/light8/parport.i b/light9/io/parport.i
rename from light8/parport.i
rename to light9/io/parport.i
diff --git a/light8/serport.i b/light9/io/serport.i
rename from light8/serport.i
rename to light9/io/serport.i
diff --git a/light8/updatefreq.py b/light9/updatefreq.py
rename from light8/updatefreq.py
rename to light9/updatefreq.py