From 83247f8e3ec0e083cf55174764685f0375572243 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 20 Oct 2009 17:35:20 -0600
Subject: [PATCH] IGN:...

---
 setup/commands.py |  5 +++--
 setup/publish.py  | 11 +++++++++--
 setup/upload.py   |  1 -
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/setup/commands.py b/setup/commands.py
index e13fe6a448..650d88b5cd 100644
--- a/setup/commands.py
+++ b/setup/commands.py
@@ -21,7 +21,7 @@ __all__ = [
         'linux32', 'linux64', 'linux', 'linux_freeze', 'linux_freeze2',
         'osx32_freeze', 'osx32', 'osx', 'rsync',
         'win32_freeze', 'win32', 'win',
-        'stage1', 'stage2', 'stage3', 'publish'
+        'stage1', 'stage2', 'stage3', 'stage4', 'publish'
         ]
 
 
@@ -50,13 +50,14 @@ from setup.resources import Resources
 resources = Resources()
 
 from setup.publish import Manual, TagRelease, UploadRss, Stage1, Stage2, \
-        Stage3, Publish
+        Stage3, Stage4, Publish
 manual = Manual()
 tag_release = TagRelease()
 upload_rss = UploadRss()
 stage1 = Stage1()
 stage2 = Stage2()
 stage3 = Stage3()
+stage4 = Stage4()
 publish = Publish()
 
 from setup.upload import UploadUserManual, UploadInstallers, UploadDemo, \
diff --git a/setup/publish.py b/setup/publish.py
index e919cd0570..8eadf7c281 100644
--- a/setup/publish.py
+++ b/setup/publish.py
@@ -46,12 +46,19 @@ class Stage3(Command):
    sub_commands = ['upload_rss', 'upload_user_manual', 'upload_demo', 'sdist',
             'upload_to_sourceforge', 'upload_to_google_code', 'tag_release',
             'upload_to_server', 'upload_to_mobileread',
-]
+   ]
+
+class Stage4(Command):
+
+    description = 'Stage 4 of the publish process'
+
+    def run(self, opts):
+        subprocess.check_call('rm -rf build/* dist/*', shell=True)
 
 class Publish(Command):
 
     description = 'Publish a new calibre release'
-    sub_commands = ['stage1', 'stage2', 'stage3']
+    sub_commands = ['stage1', 'stage2', 'stage3', 'stage4']
 
 class Manual(Command):
 
diff --git a/setup/upload.py b/setup/upload.py
index 17411e6f04..e9fb8c66ca 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -345,7 +345,6 @@ class UploadToServer(Command):
                 shell=True)
         check_call('scp dist/calibre-*.tar.gz.asc divok:%s/signatures/'%DOWNLOADS,
                 shell=True)
-        check_call('''rm -rf dist/* build/*''', shell=True)
         check_call('ssh divok bzr update /var/www/calibre.kovidgoyal.net/calibre/',
                    shell=True)
         check_call('ssh divok bzr update /usr/local/calibre',