From 15d0d84bb4ad0fecd9ef2ce4c97235fd9e7a29fd Mon Sep 17 00:00:00 2001
From: Baruch Sterin <baruchs@gmail.com>
Date: Mon, 24 Oct 2011 15:21:08 -0700
Subject: [PATCH] pyabc: rearrange files and locations

---
 src/python/module.make                | 4 +---
 src/python/package.py                 | 5 ++++-
 {scripts => src/python}/reachx_cmd.py | 0
 src/python/setup.py                   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename {scripts => src/python}/reachx_cmd.py (100%)

diff --git a/src/python/module.make b/src/python/module.make
index 3f48bbafa..09e2de3f9 100644
--- a/src/python/module.make
+++ b/src/python/module.make
@@ -57,7 +57,7 @@ pyabc.tgz : $(PROG) $(ABC_PYTHON_SRC:_wrap.c=.py) $(ABC_PYTHON_FILES_PREFIX)/abc
     $(ABC_PYTHON) $(ABC_PYTHON_FILES_PREFIX)/package.py \
         --abc=$(PROG) \
         --abc_sh=$(ABC_PYTHON_FILES_PREFIX)/abc.sh \
-        --pyabc=$(ABC_PYTHON_SRC:_wrap.c=.py) \
+        --pyabc=$(ABC_PYTHON_FILES_PREFIX) \
         --out=$@ \
         $(ABC_PYTHON_OPTIONS)
 
@@ -66,8 +66,6 @@ PYABC_INSTALL_TARGET := $(PYABC_INSTALL_TARGET)
 
 PYABC_INSTALL_DIR ?= /hd/common/pyabc/builds/pyabc_builds/
 
-.PHONY: zzz
-
 pyabc_install_target: pyabc_extension_bdist
     mkdir -p "$(PYABC_INSTALL_DIR)/$(PYABC_INSTALL_TARGET)"
     tar \
diff --git a/src/python/package.py b/src/python/package.py
index 9c79a9441..1764ab6fb 100644
--- a/src/python/package.py
+++ b/src/python/package.py
@@ -70,7 +70,10 @@ def package(abc_exe, abc_sh, pyabc, ofname, scripts_dir, use_sys):
                     add_file( tf, fullname, os.path.join("pyabc/scripts", fn), 0666, mtime)
     
     add_dir(tf, "pyabc/lib", mtime)
-    add_file( tf, pyabc, "pyabc/lib/pyabc.py", 0666, mtime)
+    
+    for entry in os.listdir(pyabc):
+        if entry.endswith('.py'):
+            add_file( tf, os.path.join(pyabc, entry), os.path.join("pyabc/lib", entry), 0666, mtime)
     
     if not use_sys:
         # ZIP standard library    
diff --git a/scripts/reachx_cmd.py b/src/python/reachx_cmd.py
similarity index 100%
rename from scripts/reachx_cmd.py
rename to src/python/reachx_cmd.py
diff --git a/src/python/setup.py b/src/python/setup.py
index 3ef006af9..68a4adae6 100644
--- a/src/python/setup.py
+++ b/src/python/setup.py
@@ -63,5 +63,5 @@ setup(
     name='pyabc',
     version='1.0',
     ext_modules=[ext],
-    py_modules=['pyabc','getch','pyabc_split','redirect']
+    py_modules=['pyabc','getch','pyabc_split','redirect', 'reachx_cmd']
 )