changeset 553:65c27fd21769

small fixes for distutils
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 06 Oct 2010 18:02:46 +0200
parents 2642f128ad46
children 100b0aea57c2
files MANIFEST.in setup.py
diffstat 2 files changed, 19 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/MANIFEST.in	Wed Oct 06 15:37:23 2010 +0200
+++ b/MANIFEST.in	Wed Oct 06 18:02:46 2010 +0200
@@ -1,17 +1,5 @@
-include MANIFEST.in
-include COPYING
-include development.ini
-include production.ini
-
 include rhodecode/config/deployment.ini_tmpl
 
-#init.d scripts
-include init.d/rhodecode-daemon
-include init.d/rhodecode-daemon2
-
-#celery config
-include celeryconfig.py
-
 #images
 recursive-include rhodecode/public/css *
 recursive-include rhodecode/public/images *
--- a/setup.py	Wed Oct 06 15:37:23 2010 +0200
+++ b/setup.py	Wed Oct 06 18:02:46 2010 +0200
@@ -1,5 +1,5 @@
 from rhodecode import get_version
-
+import sys
 
 requirements = [
         "Pylons>=1.0.0",
@@ -15,16 +15,22 @@
         "celery",
     ]
 
-#additional files for project
-data_files = [
-              ('init.d', ['init.d/rhodecode-daemon',
-                          'init.d/rhodecode-daemon2',
-                          'init.d/celeryd']),
-              ('', ['celeryconfig.py', 'production.ini', 'development.ini']),
-              ]
+#additional files from project that goes somewhere in the filesystem
+#relative to sys.prefix
+data_files = []
+
+#additional files that goes into package itself
+package_data = {'rhodecode': ['i18n/*/LC_MESSAGES/*.mo', ], }
 
+#long description
+try:
+    readme_file = 'README.rst'
+    long_description = open(readme_file).read()
+except IOError, err:
+    sys.stderr.write("[ERROR] Cannot find file specified as "
+        "long_description (%s)\n" % readme_file)
+    sys.exit(1)
 
-long_description = '\n' + open('README.rst').read()
 
 try:
     from setuptools import setup, find_packages
@@ -32,6 +38,8 @@
     from ez_setup import use_setuptools
     use_setuptools()
     from setuptools import setup, find_packages
+#packages
+packages = find_packages(exclude=['ez_setup'])
 
 setup(
     name='RhodeCode',
@@ -46,10 +54,10 @@
     install_requires=requirements,
     setup_requires=["PasteScript>=1.6.3"],
     data_files=data_files,
-    packages=find_packages(exclude=['ez_setup']),
+    packages=packages,
     include_package_data=True,
     test_suite='nose.collector',
-    package_data={'rhodecode': ['i18n/*/LC_MESSAGES/*.mo']},
+    package_data=package_data,
     message_extractors={'rhodecode': [
             ('**.py', 'python', None),
             ('templates/**.mako', 'mako', {'input_encoding': 'utf-8'}),