Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

IGN:..

Browse Source
This commit is contained in:
Kovid Goyal 2008-05-18 23:29:34 -07:00
parent 1766639e38
commit 2114ea70f2
3 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
osx_installer.py
View File

@ -9,6 +9,8 @@ from setuptools import setup
from py2app.build_app import py2app from py2app.build_app import py2app
from modulegraph.find_modules import find_modules from modulegraph.find_modules import find_modules
PYTHON = '/Library/Frameworks/Python.framework/Versions/Current/bin/python'
class BuildAPP(py2app): class BuildAPP(py2app):
QT_PREFIX = '/Users/kovid/qt' QT_PREFIX = '/Users/kovid/qt'
LOADER_TEMPLATE = \ LOADER_TEMPLATE = \
@ -108,15 +110,15 @@ _check_symlinks_prescript()
dmg = os.path.join(destdir, volname+'.dmg') dmg = os.path.join(destdir, volname+'.dmg')
if os.path.exists(dmg): if os.path.exists(dmg):
os.unlink(dmg) os.unlink(dmg)
subprocess.check_call(['hdiutil', 'create', '-srcfolder', os.path.abspath(d), subprocess.check_call(['/usr/bin/hdiutil', 'create', '-srcfolder', os.path.abspath(d),
'-volname', volname, '-format', format, dmg]) '-volname', volname, '-format', format, dmg])
if internet_enable: if internet_enable:
subprocess.check_call(['hdiutil', 'internet-enable', '-yes', dmg]) subprocess.check_call(['/usr/bin/hdiutil', 'internet-enable', '-yes', dmg])
return dmg return dmg
@classmethod @classmethod
def qt_dependencies(cls, path): def qt_dependencies(cls, path):
pipe = subprocess.Popen('otool -L '+path, shell=True, stdout=subprocess.PIPE).stdout pipe = subprocess.Popen('/usr/bin/otool -L '+path, shell=True, stdout=subprocess.PIPE).stdout
deps = [] deps = []
for l in pipe.readlines(): for l in pipe.readlines():
match = re.search(r'(.*)\(', l) match = re.search(r'(.*)\(', l)
@ -140,7 +142,7 @@ _check_symlinks_prescript()
raise Exception('Unknown Qt dependency') raise Exception('Unknown Qt dependency')
module = match.group(1) module = match.group(1)
newpath = fp + '%s.framework/Versions/Current/%s'%(module, module) newpath = fp + '%s.framework/Versions/Current/%s'%(module, module)
cmd = ' '.join(['install_name_tool', '-change', dep, newpath, path]) cmd = ' '.join(['/usr/bin/install_name_tool', '-change', dep, newpath, path])
subprocess.check_call(cmd, shell=True) subprocess.check_call(cmd, shell=True)
@ -175,11 +177,11 @@ _check_symlinks_prescript()
subprocess.check_call(['make']) subprocess.check_call(['make'])
files.append((os.path.abspath(os.path.realpath('libpictureflow.dylib')), 'libpictureflow.dylib')) files.append((os.path.abspath(os.path.realpath('libpictureflow.dylib')), 'libpictureflow.dylib'))
os.chdir('PyQt/.build') os.chdir('PyQt/.build')
subprocess.check_call(['python', '../configure.py']) subprocess.check_call([PYTHON, '../configure.py'])
subprocess.check_call(['make']) subprocess.check_call(['/usr/bin/make'])
files.append((os.path.abspath('pictureflow.so'), 'pictureflow.so')) files.append((os.path.abspath('pictureflow.so'), 'pictureflow.so'))
subprocess.check_call(['install_name_tool', '-change', 'libpictureflow.0.dylib', '@executable_path/../Frameworks/libpictureflow.dylib', 'pictureflow.so']) subprocess.check_call(['/usr/bin/install_name_tool', '-change', 'libpictureflow.0.dylib', '@executable_path/../Frameworks/libpictureflow.dylib', 'pictureflow.so'])
subprocess.check_call(['install_name_tool', '-change', '/System/Library/Frameworks/Python.framework/Versions/2.5/Python', '@executable_path/../Frameworks/Python.framework/Versions/2.5/Python', 'pictureflow.so']) subprocess.check_call(['/usr/bin/install_name_tool', '-change', '/System/Library/Frameworks/Python.framework/Versions/2.5/Python', '@executable_path/../Frameworks/Python.framework/Versions/2.5/Python', 'pictureflow.so'])
for i in range(2): for i in range(2):
deps = BuildAPP.qt_dependencies(files[i][0]) deps = BuildAPP.qt_dependencies(files[i][0])
BuildAPP.fix_qt_dependencies(files[i][0], deps) BuildAPP.fix_qt_dependencies(files[i][0], deps)
@ -251,13 +253,13 @@ sys.frameworks_dir = os.path.join(os.path.dirname(os.environ['RESOURCEPATH']), '
def main(): def main():
auto = '--auto' in sys.argv # auto = '--auto' in sys.argv
if auto: # if auto:
sys.argv.remove('--auto') # sys.argv.remove('--auto')
if auto and not os.path.exists('dist/auto'): # if auto and not os.path.exists('dist/auto'):
print '%s does not exist'%os.path.abspath('dist/auto') # print '%s does not exist'%os.path.abspath('dist/auto')
return 1 # return 1
#
sys.argv[1:2] = ['py2app'] sys.argv[1:2] = ['py2app']
setup( setup(
name = APPNAME, name = APPNAME,
@ -290,8 +292,10 @@ def main():
}, },
setup_requires = ['py2app'], setup_requires = ['py2app'],
) )
if auto: subprocess.check_call('scp dist/*.dmg giskard:work/calibre/dist', shell=True)
subprocess.call(('sudo', 'shutdown', '-h', '+2')) # if '--shutdown' in sys.argv:
# print 'Shutting down'
# subprocess.call(('/usr/bin/sudo', '/sbin/shutdown', '-h', '+0'))
return 0 return 0
if __name__ == '__main__': if __name__ == '__main__':

6
src/calibre/utils/__init__.py
View File

@ -35,10 +35,8 @@ def sendmail(recipient='', subject='', attachments=[], body=''):
pt.write(open(attachments[0], 'rb').read()) pt.write(open(attachments[0], 'rb').read())
pt.close() pt.close()
try: subprocess.Popen(('open', '-t', pt.name))
subprocess.call('open -t '+pt.name, shell=True)
except: # For some reason making this call leads to a system call interrupted error
pass
else: else:
body = '"' + body.replace('"', '\\"') + '"' body = '"' + body.replace('"', '\\"') + '"'
subject = '"' + subject.replace('"', '\\"') + '"' subject = '"' + subject.replace('"', '\\"') + '"'

13
upload.py
View File

@ -64,7 +64,18 @@ def build_windows():
def build_osx(): def build_osx():
installer = installer_name('dmg') installer = installer_name('dmg')
vm = '/vmware/Mac OSX/Mac OSX.vmx' vm = '/vmware/Mac OSX/Mac OSX.vmx'
return build_installer(installer, vm, 20) vmware = ('vmware', '-q', '-x', '-n', vm)
subprocess.Popen(vmware)
print 'Waiting for OS X to boot up...'
time.sleep(120)
print 'Trying to ssh into the OS X server'
subprocess.check_call(('ssh', 'osx', '/Users/kovid/bin/build-calibre'))
if not os.path.exists(installer):
raise Exception('Failed to build installer '+installer)
subprocess.Popen(('ssh', 'osx', 'sudo', '/sbin/shutdown', '-h', '+1'))
return os.path.basename(installer)
#return build_installer(installer, vm, 20)
def build_installers(): def build_installers():
return build_windows(), build_osx() return build_windows(), build_osx()