From ecbf38a3d6f623c822edfb8258e6f21147051d01 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 6 Aug 2008 03:03:37 -0700
Subject: [PATCH] IGN:...

---
 installer/windows/calibre/calibre.mpi | 2 --
 pyqtdistutils.py                      | 7 ++++---
 upload.py                             | 3 +++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/installer/windows/calibre/calibre.mpi b/installer/windows/calibre/calibre.mpi
index 35de36caab..5d70665c2b 100644
--- a/installer/windows/calibre/calibre.mpi
+++ b/installer/windows/calibre/calibre.mpi
@@ -216,7 +216,6 @@ File ::0F47A44E-E347-1CD4-E89F-37B447C4A270 -type dir -name driver -parent 6CCF3
 File ::A146565C-D163-7F68-7C70-A6A336B32526 -type dir -name iconengines -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3
 File ::3245B06C-1C22-1A8A-5710-6D36651AAA70 -name etree.pyd -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3
 File ::B49A5610-13F6-FB5D-0673-DB47C6BB385D -name rtf-meta.exe.local -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3
-File ::1F7D32C6-D61D-A09F-6D9E-690F7DD10D04 -name clit.exe.local -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3
 File ::CE4F2A21-12CC-2B9A-6D48-6A0FEA7C9D13 -name _compiled_base.pyd -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3
 File ::D6C46340-8335-7FC4-A027-D701DF1B70AB -name pdf2lrf.exe -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3
 File ::53F2B07D-8F92-2328-C55E-5F7F0E63D5DB -name opf-meta.exe.local -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3
@@ -347,7 +346,6 @@ File ::ACE1537B-B234-3C90-759A-8947A7AADC77 -name mobi2oeb.exe -parent 6CCF3F71-
 File ::92701E8F-1D91-A796-C899-2A266029F61D -name _socket.pyd -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3
 File ::45BD27B5-B910-7633-C827-37E82E89C27C -name w9xpopen.exe.local -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3
 File ::45C27909-D761-787F-84B2-66596E5C4E99 -name bz2.pyd -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3
-File ::7B2DE5D8-17A6-B167-ABC7-799AEBCC1C02 -name clit.exe -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3
 File ::36E8EEAC-F54D-5DE9-02D8-ECDFEBB4B5E2 -type dir -name plugins -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3
 File ::71930E14-A27B-C23C-8D94-C7E97ADB8723 -name pictureflow.pyd -parent 36E8EEAC-F54D-5DE9-02D8-ECDFEBB4B5E2
 File ::293E6ABE-17C9-5E53-1B44-C27029C8C061 -name winutil.pyd -parent 36E8EEAC-F54D-5DE9-02D8-ECDFEBB4B5E2
diff --git a/pyqtdistutils.py b/pyqtdistutils.py
index f80486e314..2291efba01 100644
--- a/pyqtdistutils.py
+++ b/pyqtdistutils.py
@@ -14,8 +14,9 @@ from distutils import log
 import sipconfig, os, sys, string, glob, shutil
 from PyQt4 import pyqtconfig
 iswindows = 'win32' in sys.platform
+QMAKE = os.path.expanduser('~/qt/bin/qmake') if 'darwin' in sys.platform else'qmake'
 WINDOWS_PYTHON = ['C:/Python25/libs']
-OSX_SDK = 'TODO:'
+OSX_SDK = '/Developer/SDKs/MacOSX10.4u.sdk'
 
 def replace_suffix(path, new_suffix):
     return os.path.splitext(path)[0] + new_suffix
@@ -62,10 +63,10 @@ VERSION  = 1.0.0
 CONFIG   += x86 ppc
 '''%(name, ' '.join(headers), ' '.join(sources))
             open(name+'.pro', 'wb').write(pro)
-            self.spawn(['qmake', '-o', 'Makefile.qt', name+'.pro'])
+            self.spawn([QMAKE, '-o', 'Makefile.qt', name+'.pro'])
             self.make('Makefile.qt')
             pat = 'release\\*.o' if iswindows else '*.o'
-            return glob.glob(pat)
+            return map(os.path.abspath, glob.glob(pat))
         finally:
             os.chdir(cwd)
     
diff --git a/upload.py b/upload.py
index 0cc4d99e61..fc8a1754c2 100644
--- a/upload.py
+++ b/upload.py
@@ -75,6 +75,8 @@ def build_windows(shutdown=True):
     installer = installer_name('exe')
     vm = '/vmware/Windows XP/Windows XP Professional.vmx'
     start_vm(vm, 'windows', BUILD_SCRIPT%('python setup.py develop', 'python','installer\\\\windows\\\\freeze.py'))
+    if os.path.exists('build/py2exe'):
+        shutil.rmtree('build/py2exe')
     subprocess.check_call(('scp', '-rp', 'windows:build/%s/build/py2exe'%PROJECT, 'build'))
     if not os.path.exists('build/py2exe'):
         raise Exception('Failed to run py2exe')
@@ -240,6 +242,7 @@ def stage_three():
     upload_user_manual()
     check_call('python setup.py register bdist_egg --exclude-source-files upload')
     check_call('''rm -rf dist/* build/*''')
+    check_call('''ssh divok bzr update /var/www/calibre.kovidgoyal.net/calibre/''')
 
 def main(args=sys.argv):
     print 'Starting stage one...'