mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Sync to trunk.
This commit is contained in:
commit
4bad3508fe
@ -90,7 +90,7 @@ class UploadInstallers(Command):
|
|||||||
|
|
||||||
def run(self, opts):
|
def run(self, opts):
|
||||||
self.info('Uploading installers...')
|
self.info('Uploading installers...')
|
||||||
installers = list(map(installer_name, ('dmg', 'exe', 'tar.bz2')))
|
installers = list(map(installer_name, ('dmg', 'msi', 'tar.bz2')))
|
||||||
installers.append(installer_name('tar.bz2', is64bit=True))
|
installers.append(installer_name('tar.bz2', is64bit=True))
|
||||||
map(self.upload_installer, installers)
|
map(self.upload_installer, installers)
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ __license__ = 'GPL v3'
|
|||||||
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
|
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
|
||||||
__docformat__ = 'restructuredtext en'
|
__docformat__ = 'restructuredtext en'
|
||||||
__appname__ = 'calibre'
|
__appname__ = 'calibre'
|
||||||
__version__ = '0.6.16'
|
__version__ = '0.6.17'
|
||||||
__author__ = "Kovid Goyal <kovid@kovidgoyal.net>"
|
__author__ = "Kovid Goyal <kovid@kovidgoyal.net>"
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
@ -36,8 +36,8 @@ class JETBOOK(USBMS):
|
|||||||
WINDOWS_MAIN_MEM = 'EBOOK'
|
WINDOWS_MAIN_MEM = 'EBOOK'
|
||||||
WINDOWS_CARD_A_MEM = 'EBOOK'
|
WINDOWS_CARD_A_MEM = 'EBOOK'
|
||||||
|
|
||||||
OSX_MAIN_MEM = None
|
OSX_MAIN_MEM = 'Linux ebook Media'
|
||||||
OSX_CARD_A_MEM = None
|
OSX_CARD_A_MEM = 'Linux ebook Media'
|
||||||
|
|
||||||
MAIN_MEMORY_VOLUME_LABEL = 'Jetbook Main Memory'
|
MAIN_MEMORY_VOLUME_LABEL = 'Jetbook Main Memory'
|
||||||
STORAGE_CARD_VOLUME_LABEL = 'Jetbook Storage Card'
|
STORAGE_CARD_VOLUME_LABEL = 'Jetbook Storage Card'
|
||||||
|
@ -141,7 +141,7 @@ else:
|
|||||||
|
|
||||||
def windows(self, req):
|
def windows(self, req):
|
||||||
version = self.version_from_filename()
|
version = self.version_from_filename()
|
||||||
file = '%s-%s.exe'%(__appname__, version,)
|
file = '%s-%s.msi'%(__appname__, version,)
|
||||||
data = dict(version = version, name='windows',
|
data = dict(version = version, name='windows',
|
||||||
installer_name='Windows installer',
|
installer_name='Windows installer',
|
||||||
title='Download %s for windows'%(__appname__),
|
title='Download %s for windows'%(__appname__),
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user