commit: c0a49affccc4ed2ca39bfcc1df7a84bc439ddeeb
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 7 14:42:27 2013 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:54:54 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c0a49aff
Streamline data_files generation with additional keys
* Move data_file generation out of setup().
* Return per-directory keys, since distutils only uses the directory
key and value filename (not the value path) when installing
data_files.
* Use relative key paths for more flexible installation.
* Raise NotImplementedError if os.path.sep is not '/', which allows
for simpler path handling.
---
setup.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/setup.py b/setup.py
index 7a57c54..a412d48 100644
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,14 @@ def _files(prefix, root):
yield (install_directory, file_source_paths)
+_data_files = [('/etc/catalyst', ['etc/catalyst.conf','etc/catalystrc']),
+ ('/usr/share/man/man1', ['files/catalyst.1']),
+ ('/usr/share/man/man5', ['files/catalyst-config.5',
'files/catalyst-spec.5'])
+ ]
+_data_files.extend(_files('livecd', 'lib/catalyst/'))
+_data_files.extend(_files('targets', 'lib/catalyst/'))
+
+
_setup(
name=_package_name,
version=__version__,
@@ -69,12 +77,9 @@ _setup(
packages=[
_package_name,
'{0}.arch'.format(_package_name),
+ '{0}.base'.format(_package_name),
'{0}.targets'.format(_package_name),
],
- data_files=list(_itertools.chain(
- _files(prefix='/etc/catalyst', root='etc'),
- _files(prefix='lib/catalyst/livecd', root='livecd'),
- _files(prefix='lib/catalyst/targets', root='targets'),
- )),
+ data_files=_data_files,
provides=[_package_name],
)
