From 64b7823403bf16a847e0063cc7ca5a00ab8b2baa Mon Sep 17 00:00:00 2001 From: David Rousselie Date: Fri, 7 Mar 2008 21:41:37 +0100 Subject: [PATCH] Finish setuptools configuration darcs-hash:20080307204137-86b55-c8e70d7a59efdc5db799a4709aa885ffbdc65de2.gz --- setup.py | 31 +++++++++++++++++++++++++------ src/jmc.egg-info/SOURCES.txt | 2 +- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index b27ddbb..702d489 100644 --- a/setup.py +++ b/setup.py @@ -21,13 +21,20 @@ ## from setuptools import setup, find_packages -from distutils import sysconfig +import sys +import re +import shutil -prefix = sysconfig.get_config_vars("prefix") -if len(prefix) == 0 or prefix[0] == "/usr": - config_dir = "/etc/jabber" +prefix = "/usr" +for arg in sys.argv: + if arg[0:9] == "--prefix=": + prefix = arg[9:] + break + +if prefix == "/usr": + config_dir = "/etc/jabber/" else: - config_dir = prefix[0] + "/etc/jabber" + config_dir = prefix + "/etc/jabber/" setup(name='jmc', version='0.3', @@ -44,4 +51,16 @@ setup(name='jmc', "tests"]), entry_points={'console_scripts': ['jmc=jmc.runner:main']}, test_suite='jmc.tests.suite') -# data_files=[("etc/jabber", "conf/jmc.conf")], + +shutil.copy("conf/jmc.conf", config_dir) +runner_file = open("src/jmc/runner.py") +dest_runner_file = open("build/lib/jmc/runner.py", "w") + +config_file_re = re.compile("(.*self\.config_file = \")(jmc.conf\")") +for line in runner_file: + match = config_file_re.match(line) + if match is not None: + dest_runner_file.write(match.group(1) + config_dir + + match.group(2) + "\n") + else: + dest_runner_file.write(line) diff --git a/src/jmc.egg-info/SOURCES.txt b/src/jmc.egg-info/SOURCES.txt index cdecaef..45f231e 100644 --- a/src/jmc.egg-info/SOURCES.txt +++ b/src/jmc.egg-info/SOURCES.txt @@ -1,7 +1,6 @@ README setup.py src/jmc/__init__.py -src/jmc/config.py src/jmc/lang.py src/jmc/runner.py src/jmc.egg-info/PKG-INFO @@ -13,6 +12,7 @@ src/jmc/jabber/__init__.py src/jmc/jabber/command.py src/jmc/jabber/component.py src/jmc/jabber/disco.py +src/jmc/jabber/feeder.py src/jmc/jabber/message.py src/jmc/jabber/presence.py src/jmc/model/__init__.py