src/gitserve/gitweb.cgi.so @@ -1,28 +1,16 @@ -Copyright (c) 2008, Jannis Leidel -All rights reserved. +git-serve - A helper tool for git that mimics mercurial\'s serve command +Copyright (C) 2008 Jannis Leidel -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of the author nor the names of other - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. \ No newline at end of file LICENSE.txt @@ -2,4 +2,4 @@ include README.txt include LICENSE.txt include MANIFEST.in include INSTALL.txt -recursive-include gitserve/media * +recursive-include src/gitserve/media * MANIFEST.in @@ -1,38 +1,36 @@ #!/usr/bin/env python -import os, sys +import os, sys, stat from setuptools import setup, find_packages -from gitserve.__init__ import __version__ as VERSION setup( name='gitserve', - version=VERSION, - license="bsd", + version='0.1.1', + license='GPL2', description="A helper tool for git that mimics mercurial\'s serve command", + long_description=open(os.path.join(os.path.dirname(__file__), 'README.txt')).read(), author='Jannis Leidel', author_email='jannis@leidel.info', url='http://github.com/jezdez/git-serve/', - keywords="PyPI setuptools cheeseshop distutils eggs package management", + keywords="git dvcs mercurial serve cgi", + classifiers = [ + 'Development Status :: 3 - Alpha', + 'Environment :: Console', + 'Environment :: No Input/Output (Daemon)', + 'Intended Audience :: Developers', + 'Intended Audience :: End Users/Desktop', + 'License :: OSI Approved :: GNU General Public License (GPL)', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Topic :: Software Development :: Version Control', + 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', + 'Topic :: Internet :: WWW/HTTP :: HTTP Servers', + ], install_requires=["setuptools"], packages=find_packages('src'), package_dir={'':'src'}, - package_data={'': ['media/*.*', '*.cgi', '*.conf'],}, - entry_points={'console_scripts': ['git-serve = gitserve:main',]}, + package_data={'': ['media/*.*', '*.so', '*.conf'],}, + entry_points={'console_scripts': ['git-serve = gitserve:main',],}, zip_safe=False, include_package_data = True, ) - -try: - import gitserve -except: - pass -else: - gitweb_cgi = os.path.join( - os.path.dirname(os.path.abspath(gitserve.__file__)), "gitweb.cgi") - if not os.access(gitweb_cgi, os.X_OK): - try: - os.chmod(gitweb_cgi, 0755) - except OSError: - pass - else: - print "Making gitweb.cgi executable" setup.py @@ -1,7 +1,7 @@ #!/usr/bin/python # encoding: utf-8 -__version__ = '0.1.0' +__version__ = '0.1.1' import os import sys @@ -166,7 +166,7 @@ def main(): listen = options.address, options.port gitweb_url = "http://%s:%d/%s/" % (options.address, options.port, repo_name) - gitweb_cgi = os.path.join(gitserve_dir, 'gitweb.cgi') + gitweb_cgi = os.path.join(gitserve_dir, 'gitweb.cgi.so') # start daemon mode if options.daemon: src/gitserve/__init__.py src/gitserve/gitweb.cgi c30bbdece99c4c8c30a911ca5311e0b8348890dd Jannis Leidel jannis@leidel.info http://github.com/jezdez/git-serve/commit/0f1e2c09203b1d405d68391ceaaa647fb1a2a4b2 0f1e2c09203b1d405d68391ceaaa647fb1a2a4b2 2008-04-24T08:01:57-07:00 2008-04-24T08:01:57-07:00 * switched back to GPL. * fixed a bug in the manifest template. * added pypi keywords. * removed ugly hack to chmod gitweb.cgi on install time. * added ugly hack to chmod gitweb.cgi on install time. (setuptools will chmod every .so file to be executable. shame on me, I know. but setuptools doesn't allow any post_install scripts.) ef8b8083ce7cf9ce96c41a8c1228a15004735ab1 Jannis Leidel jannis@leidel.info