diff --git a/installer/windows/calibre/calibre.mpi b/installer/windows/calibre/calibre.mpi index 63d812f041..3dc587e603 100644 --- a/installer/windows/calibre/calibre.mpi +++ b/installer/windows/calibre/calibre.mpi @@ -353,7 +353,6 @@ File ::36E8EEAC-F54D-5DE9-02D8-ECDFEBB4B5E2 -type dir -name plugins -parent 6CCF 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 File ::A5737158-18DF-7F20-2BDF-2DF615663891 -name lzx.pyd -parent 36E8EEAC-F54D-5DE9-02D8-ECDFEBB4B5E2 -File ::87085EC3-26D5-975D-A820-0691F193733D -name pictureflow1.dll -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3 File ::CA9E098C-2931-9781-1303-213C242F9A5E -name lit2oeb.exe -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3 File ::16B5A447-066C-C93E-F63D-8BC0D57CA544 -name lit2oeb.exe.local -parent 6CCF3F71-74BB-ED69-D0E6-9F12348ABDD3 Component ::F6829AB7-9F66-4CEE-CA0E-21F54C6D3609 -setup Install -active Yes -platforms {AIX-ppc FreeBSD-4-x86 FreeBSD-x86 HPUX-hppa Linux-x86 Solaris-sparc Windows} -name Main -parent Components diff --git a/setup.py b/setup.py index fdb0afad90..03cd53efe5 100644 --- a/setup.py +++ b/setup.py @@ -48,15 +48,15 @@ main_functions = { if __name__ == '__main__': from setuptools import setup, find_packages, Extension import subprocess, glob - + entry_points['console_scripts'].append('calibre_postinstall = calibre.linux:post_install') ext_modules = [Extension('calibre.plugins.lzx', - sources=['src/calibre/utils/lzx/lzxmodule.c', + sources=['src/calibre/utils/lzx/lzxmodule.c', 'src/calibre/utils/lzx/lzxd.c'], include_dirs=['src/calibre/utils/lzx'])] if iswindows: ext_modules.append(Extension('calibre.plugins.winutil', - sources=['src/calibre/utils/windows/winutil.c'], + sources=['src/calibre/utils/windows/winutil.c'], libraries=['shell32', 'setupapi'], include_dirs=['C:/WinDDK/6001.18001/inc/api/']) ) @@ -64,7 +64,7 @@ if __name__ == '__main__': ext_modules.append(Extension('calibre.plugins.usbobserver', sources=['src/calibre/devices/usbobserver/usbobserver.c']) ) - + def build_PyQt_extension(path): pro = glob.glob(os.path.join(path, '*.pro'))[0] raw = open(pro).read() @@ -97,59 +97,59 @@ if __name__ == '__main__': os.unlink(f) except: continue - + + for path in [(os.path.join('src', 'calibre', 'gui2', 'pictureflow'))]: + build_PyQt_extension(path) + setup( - name=APPNAME, - packages = find_packages('src'), - package_dir = { '' : 'src' }, - version=VERSION, - author='Kovid Goyal', - author_email='kovid@kovidgoyal.net', - url = 'http://%s.kovidgoyal.net'%APPNAME, + name=APPNAME, + packages = find_packages('src'), + package_dir = { '' : 'src' }, + version=VERSION, + author='Kovid Goyal', + author_email='kovid@kovidgoyal.net', + url = 'http://%s.kovidgoyal.net'%APPNAME, package_data = {'calibre':['plugins/*']}, include_package_data=True, - entry_points = entry_points, + entry_points = entry_points, zip_safe = False, options = { 'bdist_egg' : {'exclude_source_files': True,}, }, ext_modules=ext_modules, - description = + description = ''' E-book management application. - ''', - long_description = + ''', + long_description = ''' %s is an e-book library manager. It can view, convert and catalog e-books in most of the major e-book formats. It can also talk to a few e-book reader devices. It can go out to the internet and fetch metadata for your books. It can download newspapers and convert them into e-books for convenient reading. It is cross platform, running on Linux, Windows and OS X. - + For screenshots: https://%s.kovidgoyal.net/wiki/Screenshots - - For installation/usage instructions please see + + For installation/usage instructions please see http://%s.kovidgoyal.net - - For source code access: - bzr branch http://bzr.kovidgoyal.net/code/%s/trunk %s - - To update your copy of the source code: + + For source code access: + bzr branch http://bzr.kovidgoyal.net/code/%s/trunk %s + + To update your copy of the source code: bzr merge - + '''%(APPNAME, APPNAME, APPNAME, APPNAME, APPNAME), - license = 'GPL', + license = 'GPL', classifiers = [ - 'Development Status :: 4 - Beta', - 'Environment :: Console', - 'Environment :: X11 Applications :: Qt', - 'Intended Audience :: Developers', - 'Intended Audience :: End Users/Desktop', - 'License :: OSI Approved :: GNU General Public License (GPL)', - 'Natural Language :: English', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Topic :: Software Development :: Libraries :: Python Modules', + 'Development Status :: 4 - Beta', + 'Environment :: Console', + 'Environment :: X11 Applications :: Qt', + 'Intended Audience :: Developers', + 'Intended Audience :: End Users/Desktop', + 'License :: OSI Approved :: GNU General Public License (GPL)', + 'Natural Language :: English', + 'Operating System :: POSIX :: Linux', + 'Programming Language :: Python', + 'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: System :: Hardware :: Hardware Drivers' ] ) - - for path in [(os.path.join('src', 'calibre', 'gui2', 'pictureflow'))]: - build_PyQt_extension(path) - + if 'develop' in ' '.join(sys.argv) and islinux: subprocess.check_call('calibre_postinstall', shell=True) diff --git a/src/calibre/trac/plugins/templates/distro.html b/src/calibre/trac/plugins/templates/distro.html index 61944e7747..c75532caef 100644 --- a/src/calibre/trac/plugins/templates/distro.html +++ b/src/calibre/trac/plugins/templates/distro.html @@ -14,7 +14,8 @@

$title

- See the Changelog for the changes in the latest version. + See the Changelog for the changes in the latest version. Note: As of 0.4.80 this install + will not work on 64-bit CPUs. Try the precompiled binary available here instead.
First verify that you have a sufficiently new installation of python 
python --version
should return at least 2.5.1
diff --git a/src/calibre/trac/plugins/templates/pyinstaller.html b/src/calibre/trac/plugins/templates/pyinstaller.html index 4061b0aadc..901ba16d75 100644 --- a/src/calibre/trac/plugins/templates/pyinstaller.html +++ b/src/calibre/trac/plugins/templates/pyinstaller.html @@ -14,7 +14,7 @@

Download $app for Linux

-

This binary package is compatible with most recent linux distributions running on Intel 32 bit CPUs.

+

This binary package is compatible with most recent linux distributions running on Intel 32 bit CPUs. It needs testing on 64 bit CPUs.

(Version: $version Changelog) diff --git a/upload.py b/upload.py index 4d5dcf5121..6a9f22807b 100644 --- a/upload.py +++ b/upload.py @@ -221,8 +221,8 @@ def stage_one(): os.mkdir('build') shutil.rmtree('docs') os.mkdir('docs') - check_call("sudo python setup.py develop", shell=True) - check_call('sudo rm src/%s/gui2/images_rc.pyc'%__appname__, shell=True) + check_call(['python', 'setup.py', 'build']) + check_call('sudo rm -f src/%s/gui2/images_rc.pyc'%__appname__, shell=True) check_call('make', shell=True) tag_release() upload_demo() @@ -230,7 +230,7 @@ def stage_one(): def stage_two(): subprocess.check_call('rm -rf dist/*', shell=True) build_installers() - build_src_tarball() + build_src_tarball() def stage_three(): print 'Uploading installers...'