Merge lp:~rockstar/tarmac/die-makefile-die into lp:tarmac

[Paul Hummer]

Kill the Makefile

I killed the Makefile. Rodney and I had already talked about it, and it didn't take too much effort for Rodney to convince me that we don't need it.

All the functionality has been ported over to distutils stuff, except for test-fail, which I couldn't find a use for anywhere.

[dobey (dobey)]

The clean command needs to derive from the one provided by distutils and chain up to it. For a simple example, the ubuntuone-storage-protocol clean command does this:

http://bazaar.launchpad.net/~ubuntuone-control-tower/ubuntuone-storage-protocol/trunk/view/head:/setup.py#L57

review: Needs Fixing

[lp:~rockstar/tarmac/die-makefile-die]

393. By Paul Hummer on 2011-02-14

CleanCommand now DTRT

[dobey (dobey)]

review: Approve

=== removed file 'Makefile'
--- Makefile	2010-07-20 06:46:47 +0000
+++ Makefile	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-TESTFLAGS=
-test:
-	trial $(TESTFLAGS) tarmac
-
-test-fail:
-	trial this-will-fail
-
-build:
-	mkdir build
-	mkdir build/docs
-
-build/docs/introduction.html: build docs/introduction.txt
-	rst2html docs/introduction.txt build/docs/introduction.html
-
-build/docs/writingplugins.html: build docs/writingplugins.txt
-	rst2html docs/writingplugins.txt build/docs/writingplugins.html
-
-doc: build/docs/introduction.html build/docs/writingplugins.html
-
-clean:
-	rm -rf build
-
-release:
-	python setup.py sdist
-	cd dist
-	gpg --armor --sign --detach-sig `find . -name "tarmac-*"`
-
-.PHONY: test test-fail

=== modified file 'setup.py'
--- setup.py	2010-08-17 17:08:07 +0000
+++ setup.py	2011-02-14 17:46:28 +0000
@@ -17,13 +17,79 @@
 # along with Tarmac.  If not, see <http://www.gnu.org/licenses/>.
 '''Tarmac installation script.'''
 
-from distutils.core import setup
+from distutils.command import clean
+from distutils.core import Command, setup
+import os
 
 from tarmac import __version__
 
+
+class BaseCommand(Command):
+    '''A base command...'''
+
+    user_options = []
+
+    def initialize_options(self):
+        self.cwd = None
+
+    def finalize_options(self):
+        self.cwd = os.getcwd()
+
+
+class CleanCommand(clean.clean):
+    '''Customized command for clean.'''
+
+    description = 'Customized clean command'
+
+    def run(self):
+        os.system('rm -rf build _trial_temp dist')
+
+        super(CleanCommand, self).run()
+
+
+class DocCommand(BaseCommand):
+    '''Command for building the docs.'''
+
+    description = 'Build the docs'
+
+    def run(self):
+        if not os.path.exists('build/docs'):
+            os.makedirs('build/docs')
+        os.system(
+            'rst2html docs/introduction.txt build/docs/introduction.html')
+        os.system(
+            'rst2html docs/writingplugins.txt build/docs/writingplugins.html')
+
+
+class ReleaseCommand(BaseCommand):
+    '''A command for cutting releases.'''
+
+    description = 'Cut a release'
+
+    def run(self):
+        os.system('python setup.py sdist')
+        os.system(
+            'gpg --armor --sign --detach-sig `find dist -name "tarmac-*"`')
+
+
+class TestCommand(BaseCommand):
+    '''A Command for running the tests.'''
+
+    description = 'Run the tests'
+
+    def run(self):
+        os.system('trial tarmac')
+
+
 setup(
     author='Paul Hummer',
     author_email='Paul Hummer <[e-mail]',
+    cmdclass={
+        'clean': CleanCommand,
+        'docs': DocCommand,
+        'release': ReleaseCommand,
+        'test': TestCommand
+        },
     name=u'tarmac',
     version=__version__,
     description=u'Tarmac - The Launchpad Lander',