Commits

Serge Émond committed a1e309e

- Add global makefile
- Change install instructions to point to the new locations
- Upd version

Comments (0)

Files changed (6)

+
+.PHONY: help doc
+
+help:
+	@echo "Usage: make <target>"
+	@echo "Possible targets:"
+	@echo "  docs            Make HTML documentation"
+	@echo "  upload          upload_sdist, upload_doc"
+
+clean:
+	cd doc; $(MAKE) $(MFLAGS) clean
+	python setup.py clean
+	-rm -rf build/docs
+
+upload: upload_sdist upload_doc
+
+upload_sdist:
+	python setup.py sdist upload --identity="Serge Emond" --sign
+
+upload_doc: docs
+	python setup.py upload_docs
+
+docs:
+	cd doc; $(MAKE) $(MFLAGS) html
+	-rm -rf build/docs
+	cp -a doc/_build/html build/docs
+	-rm -f build/docs/.buildinfo
+
 
 You can find other examples in the "examples" directory of the source.
 
-You can browse this online on `qslaunch's mercurial repository <http://greyworld.net/qslaunch/hg/>`_.
+You can browse this online on `qslaunch's mercurial repository <http://bitbucket.org/greyw/qslaunch/>`_.
 
 
 .. code-block:: console
 
-  $ sudo easy_install http://greyworld.net/qslaunch/files/qslaunch-0.2.tar.gz
+  $ sudo easy_install qslaunch
 
 If appscript is not installed, it should be handled automatically by ``easy_install``.
 
 
 .. code-block:: console
 
-  $ sudo pip install hg+http://greyworld.net/qslaunch/hg/
-
+  $ sudo pip install hg+http://bitbucket.org/greyw/qslaunch/
 The project page is currently hosted on my blog:
 `qslaunch <http://greyworld.net/en/projects/qslaunch>`_.
 
+
+Other links:
+* `mercurial repository <http://bitbucket.org/greyw/qslaunch/>`_
+* `online documentation <http://packages.python.org/qslaunch/>`_
+
 
 """
 
-VERSION = (0, 3, 0, 'final', 0)
+VERSION = (0, 3, 1, 'final', 0)
 
 def get_version(full=False):
     """Return version number."""
 :license: Apache License 2.0
 """
 
-__version__ = '0.3.0'
-
 from setuptools import setup, find_packages
+from qslaunch import get_version
 
 setup(
     name='qslaunch',
-    version= __version__,
+    version= get_version().replace(' ', '-'),
     description='Simple QuickSilver launcher helper',
     long_description=u"""\
-``qslaunch`` is a small framework to facilitate launching shell stuff from Quicksilver_.
+``qslaunch`` is a small framework to facilitate launching shell stuff from Quicksilver.
 
-The latest version is available in a `Mercurial repository`_.
+See also:
+- `Mercurial repository`_
+- `Documentation`_
 
 .. _Mercurial repository: http://bitbucket.org/greyw/qslaunch/
-.. _Quicksilver: http://www.blacktree.com/
+.. _Documentation: http://packages.python.org/qslaunch/
 """,
     author=u'Serge Émond',
     author_email='greyl@greyworld.net',