diff options
| author | Baruch Sterin <baruchs@gmail.com> | 2011-10-24 15:21:08 -0700 |
|---|---|---|
| committer | Baruch Sterin <baruchs@gmail.com> | 2011-10-24 15:21:08 -0700 |
| commit | 15d0d84bb4ad0fecd9ef2ce4c97235fd9e7a29fd (patch) | |
| tree | 4b08ea3dbb9aa714c8d62db9ef3e425f41b3459d | |
| parent | 521ec0fcf93faf213e3ad5346785a85a61560c71 (diff) | |
| download | abc-15d0d84bb4ad0fecd9ef2ce4c97235fd9e7a29fd.tar.gz abc-15d0d84bb4ad0fecd9ef2ce4c97235fd9e7a29fd.tar.bz2 abc-15d0d84bb4ad0fecd9ef2ce4c97235fd9e7a29fd.zip | |
pyabc: rearrange files and locations
| -rw-r--r-- | src/python/module.make | 4 | ||||
| -rw-r--r-- | src/python/package.py | 5 | ||||
| -rw-r--r-- | src/python/reachx_cmd.py (renamed from scripts/reachx_cmd.py) | 0 | ||||
| -rw-r--r-- | src/python/setup.py | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/python/module.make b/src/python/module.make index 3f48bbaf..09e2de3f 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 9c79a944..1764ab6f 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 index 8461cb1d..8461cb1d 100644 --- a/scripts/reachx_cmd.py +++ b/src/python/reachx_cmd.py diff --git a/src/python/setup.py b/src/python/setup.py index 3ef006af..68a4adae 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'] ) |