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-07-18 19:31:23 -07:00
parent 2bc7d8cbfb
commit 2b58515986
3 changed files with 27 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
installer/windows/calibre/calibre.mpi
View File

@ -356,7 +356,7 @@ SetupType ::D9ADE41C-B744-690C-2CED-CF826BF03D2E -setup Install -active Yes -pla
InstallComponent 3EA07B17-04D8-6508-B535-96CC7173B49A -setup Install -type pane -title {Welcome Screen} -component Welcome -active Yes -parent StandardInstall InstallComponent 3EA07B17-04D8-6508-B535-96CC7173B49A -setup Install -type pane -title {Welcome Screen} -component Welcome -active Yes -parent StandardInstall
InstallComponent 7CCDA4BB-861C-C21E-3011-E93DB58F07D6 -setup Install -type action -title {Check for Previous Install} -component CheckForPreviousInstall -active Yes -parent 3EA07B17-04D8-6508-B535-96CC7173B49A InstallComponent 7CCDA4BB-861C-C21E-3011-E93DB58F07D6 -setup Install -type action -title {Check for Previous Install} -component CheckForPreviousInstall -active Yes -parent 3EA07B17-04D8-6508-B535-96CC7173B49A
InstallComponent 580ACF2C-517F-5E48-9DEF-7DAEFBA59FDD -setup Install -type action -conditions 6DE3B369-9D6B-6BC1-4EA0-2C54ECE159EB -title {Set Virtual Text} -component SetVirtualText -command reorder -active Yes -parent 3EA07B17-04D8-6508-B535-96CC7173B49A InstallComponent 580ACF2C-517F-5E48-9DEF-7DAEFBA59FDD -setup Install -type action -conditions 6DE3B369-9D6B-6BC1-4EA0-2C54ECE159EB -title {Set Virtual Text} -component SetVirtualText -command insert -active Yes -parent 3EA07B17-04D8-6508-B535-96CC7173B49A
Condition 6DE3B369-9D6B-6BC1-4EA0-2C54ECE159EB -active Yes -parent 580ACF2C-517F-5E48-9DEF-7DAEFBA59FDD -title {String Is Condition} -component StringIsCondition -TreeObject::id 6DE3B369-9D6B-6BC1-4EA0-2C54ECE159EB Condition 6DE3B369-9D6B-6BC1-4EA0-2C54ECE159EB -active Yes -parent 580ACF2C-517F-5E48-9DEF-7DAEFBA59FDD -title {String Is Condition} -component StringIsCondition -TreeObject::id 6DE3B369-9D6B-6BC1-4EA0-2C54ECE159EB
InstallComponent 9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D -setup Install -type pane -title {License Agreement} -component License -active Yes -parent StandardInstall InstallComponent 9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D -setup Install -type pane -title {License Agreement} -component License -active Yes -parent StandardInstall
InstallComponent AAEC34E6-7F02-18F2-30BB-744738192A3B -setup Install -type action -conditions {081A479A-572E-5133-4979-84456DB40EFA A4388F3F-0D32-F14E-BA00-1BE7F54B05ED} -title {Modify Widget} -component ModifyWidget -command insert -active Yes -parent 9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D InstallComponent AAEC34E6-7F02-18F2-30BB-744738192A3B -setup Install -type action -conditions {081A479A-572E-5133-4979-84456DB40EFA A4388F3F-0D32-F14E-BA00-1BE7F54B05ED} -title {Modify Widget} -component ModifyWidget -command insert -active Yes -parent 9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D
@ -373,11 +373,11 @@ InstallComponent D6631BA5-577E-B30C-A73D-2B12B826811A -setup Install -type pane
Condition C6DE83DD-5C2A-AC5B-6ABA-84D73AE38655 -active Yes -parent D6631BA5-577E-B30C-A73D-2B12B826811A -title {Platform Condition} -component PlatformCondition -TreeObject::id C6DE83DD-5C2A-AC5B-6ABA-84D73AE38655 Condition C6DE83DD-5C2A-AC5B-6ABA-84D73AE38655 -active Yes -parent D6631BA5-577E-B30C-A73D-2B12B826811A -title {Platform Condition} -component PlatformCondition -TreeObject::id C6DE83DD-5C2A-AC5B-6ABA-84D73AE38655
InstallComponent 1B9E77A3-10D6-9EDD-160B-64B5EBB31981 -setup Install -type action -title {Add Widget} -component AddWidget -command reorder -active Yes -parent D6631BA5-577E-B30C-A73D-2B12B826811A InstallComponent 1B9E77A3-10D6-9EDD-160B-64B5EBB31981 -setup Install -type action -title {Add Widget} -component AddWidget -command reorder -active Yes -parent D6631BA5-577E-B30C-A73D-2B12B826811A
InstallComponent 8A7FD0C2-F053-8764-F204-4BAE71E05708 -setup Install -type pane -title {Setup Complete} -component SetupComplete -active Yes -parent StandardInstall InstallComponent 8A7FD0C2-F053-8764-F204-4BAE71E05708 -setup Install -type pane -title {Setup Complete} -component SetupComplete -active Yes -parent StandardInstall
InstallComponent 710F2507-2557-652D-EA55-440D710EFDFA -setup Install -type action -conditions {69188956-D764-5B26-B048-46A4239C3733 08195201-0797-932C-4B51-E5EF9D1D41BD 2E18F4AE-F1BB-5C62-2900-73A576A49261} -title {Install USB Driver} -component ExecuteExternalProgram -command reorder -alias {Install USB Driver} -active Yes -parent 8A7FD0C2-F053-8764-F204-4BAE71E05708 InstallComponent 710F2507-2557-652D-EA55-440D710EFDFA -setup Install -type action -conditions {69188956-D764-5B26-B048-46A4239C3733 08195201-0797-932C-4B51-E5EF9D1D41BD 2E18F4AE-F1BB-5C62-2900-73A576A49261} -title {Install USB Driver} -component ExecuteExternalProgram -command insert -alias {Install USB Driver} -active Yes -parent 8A7FD0C2-F053-8764-F204-4BAE71E05708
Condition 69188956-D764-5B26-B048-46A4239C3733 -active Yes -parent 710F2507-2557-652D-EA55-440D710EFDFA -title {Platform Condition} -component PlatformCondition -TreeObject::id 69188956-D764-5B26-B048-46A4239C3733 Condition 69188956-D764-5B26-B048-46A4239C3733 -active Yes -parent 710F2507-2557-652D-EA55-440D710EFDFA -title {Platform Condition} -component PlatformCondition -TreeObject::id 69188956-D764-5B26-B048-46A4239C3733
Condition 08195201-0797-932C-4B51-E5EF9D1D41BD -active Yes -parent 710F2507-2557-652D-EA55-440D710EFDFA -title {String Is Condition} -component StringIsCondition -TreeObject::id 08195201-0797-932C-4B51-E5EF9D1D41BD Condition 08195201-0797-932C-4B51-E5EF9D1D41BD -active Yes -parent 710F2507-2557-652D-EA55-440D710EFDFA -title {String Is Condition} -component StringIsCondition -TreeObject::id 08195201-0797-932C-4B51-E5EF9D1D41BD
Condition 2E18F4AE-F1BB-5C62-2900-73A576A49261 -active Yes -parent 710F2507-2557-652D-EA55-440D710EFDFA -title {String Is Condition} -component StringIsCondition -TreeObject::id 2E18F4AE-F1BB-5C62-2900-73A576A49261 Condition 2E18F4AE-F1BB-5C62-2900-73A576A49261 -active Yes -parent 710F2507-2557-652D-EA55-440D710EFDFA -title {String Is Condition} -component StringIsCondition -TreeObject::id 2E18F4AE-F1BB-5C62-2900-73A576A49261
InstallComponent 21B897C4-24BE-70D1-58EA-DE78EFA60719 -setup Install -type action -conditions 76FA3CA2-1F09-75C5-C6CF-72719A8EC4A5 -title {Message Box} -component MessageBox -command reorder -active Yes -parent 8A7FD0C2-F053-8764-F204-4BAE71E05708 InstallComponent 21B897C4-24BE-70D1-58EA-DE78EFA60719 -setup Install -type action -conditions 76FA3CA2-1F09-75C5-C6CF-72719A8EC4A5 -title {Message Box} -component MessageBox -command insert -active Yes -parent 8A7FD0C2-F053-8764-F204-4BAE71E05708
Condition 76FA3CA2-1F09-75C5-C6CF-72719A8EC4A5 -active Yes -parent 21B897C4-24BE-70D1-58EA-DE78EFA60719 -title {String Is Condition} -component StringIsCondition -TreeObject::id 76FA3CA2-1F09-75C5-C6CF-72719A8EC4A5 Condition 76FA3CA2-1F09-75C5-C6CF-72719A8EC4A5 -active Yes -parent 21B897C4-24BE-70D1-58EA-DE78EFA60719 -title {String Is Condition} -component StringIsCondition -TreeObject::id 76FA3CA2-1F09-75C5-C6CF-72719A8EC4A5
InstallComponent 5D20DD8D-064A-9922-29E1-A7FABEF3666A -setup Install -type action -conditions {E5D227F7-E549-EFA9-1781-EFA6C5EEEC5C A8856922-E6C1-160B-E55C-5C1806A89136} -title {Launch Application Checkbutton} -component AddWidget -command insert -active Yes -parent 8A7FD0C2-F053-8764-F204-4BAE71E05708 InstallComponent 5D20DD8D-064A-9922-29E1-A7FABEF3666A -setup Install -type action -conditions {E5D227F7-E549-EFA9-1781-EFA6C5EEEC5C A8856922-E6C1-160B-E55C-5C1806A89136} -title {Launch Application Checkbutton} -component AddWidget -command insert -active Yes -parent 8A7FD0C2-F053-8764-F204-4BAE71E05708
Condition E5D227F7-E549-EFA9-1781-EFA6C5EEEC5C -active Yes -parent 5D20DD8D-064A-9922-29E1-A7FABEF3666A -title {File Exists Condition} -component FileExistsCondition -TreeObject::id E5D227F7-E549-EFA9-1781-EFA6C5EEEC5C Condition E5D227F7-E549-EFA9-1781-EFA6C5EEEC5C -active Yes -parent 5D20DD8D-064A-9922-29E1-A7FABEF3666A -title {File Exists Condition} -component FileExistsCondition -TreeObject::id E5D227F7-E549-EFA9-1781-EFA6C5EEEC5C
@ -466,9 +466,7 @@ Condition 64B8D0F3-4B11-DA22-D6E7-7248872D5FA7 -active Yes -parent 1CA13495-CB19
InstallComponent 521E782E-2C93-8C60-9B2A-B65552FFA8E4 -setup Uninstall -type actiongroup -title {Uninstall Actions} -alias {Uninstall Actions} -active Yes -parent ActionGroupsUninstall InstallComponent 521E782E-2C93-8C60-9B2A-B65552FFA8E4 -setup Uninstall -type actiongroup -title {Uninstall Actions} -alias {Uninstall Actions} -active Yes -parent ActionGroupsUninstall
InstallComponent 79C2EE18-497D-DE39-8AB6-777CE25D9484 -setup Uninstall -type action -title {Uninstall Selected Files} -component UninstallSelectedFiles -active Yes -parent 521E782E-2C93-8C60-9B2A-B65552FFA8E4 InstallComponent 79C2EE18-497D-DE39-8AB6-777CE25D9484 -setup Uninstall -type action -title {Uninstall Selected Files} -component UninstallSelectedFiles -active Yes -parent 521E782E-2C93-8C60-9B2A-B65552FFA8E4
InstallComponent 2D445859-68B9-1761-BA4F-DE91AFE5B9EB -setup Uninstall -type action -title {Uninstall Leftover Files} -component UninstallLeftoverFiles -active Yes -parent 521E782E-2C93-8C60-9B2A-B65552FFA8E4 InstallComponent 2D445859-68B9-1761-BA4F-DE91AFE5B9EB -setup Uninstall -type action -title {Uninstall Leftover Files} -component UninstallLeftoverFiles -active Yes -parent 521E782E-2C93-8C60-9B2A-B65552FFA8E4
InstallComponent 95ED4967-8F0C-7BA2-A7EE-FF9FAACEEADF -setup Uninstall -type action -conditions {3AF1A348-10F4-EEB2-FE44-6B5F622C947D 4CF47FDD-7E34-1485-8F10-5B566D536573} -title {Uninstall USB Driver} -component ExecuteExternalProgram -command reorder -active Yes -parent 521E782E-2C93-8C60-9B2A-B65552FFA8E4 InstallComponent 167174E3-7241-9060-3A3C-1F0D169A1A1F -setup Uninstall -type action -title {Uninstall USB Driver} -component ExecuteExternalProgram -active Yes -parent 521E782E-2C93-8C60-9B2A-B65552FFA8E4
Condition 3AF1A348-10F4-EEB2-FE44-6B5F622C947D -active Yes -parent 95ED4967-8F0C-7BA2-A7EE-FF9FAACEEADF -title {String Is Condition} -component StringIsCondition -TreeObject::id F87E8940-2590-D852-28C3-4E131EC549D8
Condition 4CF47FDD-7E34-1485-8F10-5B566D536573 -active Yes -parent 95ED4967-8F0C-7BA2-A7EE-FF9FAACEEADF -title {Platform Condition} -component PlatformCondition -TreeObject::id 42367477-D72D-7957-4D43-198F0C713618
InstallComponent A57E3390-AA3E-A868-2C7D-75ADF12D8471 -setup Uninstall -type actiongroup -title {Finish Actions} -alias {Finish Actions} -active Yes -parent ActionGroupsUninstall InstallComponent A57E3390-AA3E-A868-2C7D-75ADF12D8471 -setup Uninstall -type actiongroup -title {Finish Actions} -alias {Finish Actions} -active Yes -parent ActionGroupsUninstall
InstallComponent AAFE58A0-2DFB-CA20-1F6E-D3815F885996 -setup Uninstall -type actiongroup -title {Cancel Actions} -alias {Cancel Actions} -active Yes -parent ActionGroupsUninstall InstallComponent AAFE58A0-2DFB-CA20-1F6E-D3815F885996 -setup Uninstall -type actiongroup -title {Cancel Actions} -alias {Cancel Actions} -active Yes -parent ActionGroupsUninstall
@ -503,6 +501,21 @@ Windows
1356216E-90D2-8324-0EEB-975A64F23EB8,Message,subst 1356216E-90D2-8324-0EEB-975A64F23EB8,Message,subst
1 1
167174E3-7241-9060-3A3C-1F0D169A1A1F,Conditions
{0 conditions}
167174E3-7241-9060-3A3C-1F0D169A1A1F,IgnoreErrors
Yes
167174E3-7241-9060-3A3C-1F0D169A1A1F,IncludeStderr
Yes
167174E3-7241-9060-3A3C-1F0D169A1A1F,ProgramCommandLine
{devcon.exe remove "USB\VID_054C&PID_029B"}
167174E3-7241-9060-3A3C-1F0D169A1A1F,WorkingDirectory
<%InstallDir%>/driver
173ABC5E-D4D9-9CAE-D79F-E3067EC87EC7,String 173ABC5E-D4D9-9CAE-D79F-E3067EC87EC7,String
<%ErrorsOccurred%> <%ErrorsOccurred%>
@ -656,12 +669,6 @@ false
37A46164-C287-5D4A-E55A-A2329E25E829,Filename 37A46164-C287-5D4A-E55A-A2329E25E829,Filename
<%ProgramExecutable%> <%ProgramExecutable%>
3AF1A348-10F4-EEB2-FE44-6B5F622C947D,CheckCondition
{Before Action is Executed}
3AF1A348-10F4-EEB2-FE44-6B5F622C947D,String
<%InstallUSBDriver%>
3D180445-8990-20F7-13DC-93B6909B907F,Alias 3D180445-8990-20F7-13DC-93B6909B907F,Alias
{Startup Actions} {Startup Actions}
@ -743,12 +750,6 @@ false
4AAFE838-3E44-5147-0F04-65DB5B647191,String 4AAFE838-3E44-5147-0F04-65DB5B647191,String
<%UpgradeInstall%> <%UpgradeInstall%>
4CF47FDD-7E34-1485-8F10-5B566D536573,CheckCondition
{Before Action is Executed}
4CF47FDD-7E34-1485-8F10-5B566D536573,Platform
Windows
4E5FC4FE-5D37-B216-CFFE-E046A2D6321E,CheckCondition 4E5FC4FE-5D37-B216-CFFE-E046A2D6321E,CheckCondition
{Before Action is Executed} {Before Action is Executed}
@ -924,7 +925,7 @@ Windows
Yes Yes
710F2507-2557-652D-EA55-440D710EFDFA,ProgramCommandLine 710F2507-2557-652D-EA55-440D710EFDFA,ProgramCommandLine
{<%InstallDir%>\driver\devcon.exe install <%InstallDir%>\driver\prs500.inf "USB\VID_054C&PID_029B"} {devcon.exe install prs500.inf "USB\VID_054&PID029B"}
710F2507-2557-652D-EA55-440D710EFDFA,ResultVirtualText 710F2507-2557-652D-EA55-440D710EFDFA,ResultVirtualText
DevconResult DevconResult
@ -933,7 +934,7 @@ DevconResult
DevconStatus DevconStatus
710F2507-2557-652D-EA55-440D710EFDFA,WorkingDirectory 710F2507-2557-652D-EA55-440D710EFDFA,WorkingDirectory
{<%InstallDir\driver>} <%InstallDir%>/driver
72D8B44E-E4CF-7551-645E-FB57C5B000E9,CheckCondition 72D8B44E-E4CF-7551-645E-FB57C5B000E9,CheckCondition
{Before Action is Executed} {Before Action is Executed}
@ -1064,21 +1065,6 @@ CreateDesktopShortcut
940F7FED-7D20-7264-3BF9-ED78205A76B3,Y 940F7FED-7D20-7264-3BF9-ED78205A76B3,Y
150 150
95ED4967-8F0C-7BA2-A7EE-FF9FAACEEADF,Conditions
{2 conditions}
95ED4967-8F0C-7BA2-A7EE-FF9FAACEEADF,IgnoreErrors
Yes
95ED4967-8F0C-7BA2-A7EE-FF9FAACEEADF,ProgramCommandLine
{<%InstallDir%>\driver\devcon.exe remove "USB\VID_054C&PID_029B"}
95ED4967-8F0C-7BA2-A7EE-FF9FAACEEADF,ResultVirtualText
UninstallDevconResult
95ED4967-8F0C-7BA2-A7EE-FF9FAACEEADF,StatusVirtualText
UninstallDevconStatus
96440B8B-C6D0-FCCA-6D3C-7ECE1C304CC0,CheckCondition 96440B8B-C6D0-FCCA-6D3C-7ECE1C304CC0,CheckCondition
{Before Action is Executed} {Before Action is Executed}
@ -1364,9 +1350,6 @@ BE4A731E-1FC2-87A1-547D-91E2CA467AA7,ExecuteAction
BE4A731E-1FC2-87A1-547D-91E2CA467AA7,Level BE4A731E-1FC2-87A1-547D-91E2CA467AA7,Level
system system
BE4A731E-1FC2-87A1-547D-91E2CA467AA7,Location
beginning
BEF8D398-58BA-1F66-39D6-D4A63D5BEEF9,Destination BEF8D398-58BA-1F66-39D6-D4A63D5BEEF9,Destination
<%InstallDir%> <%InstallDir%>
@ -2087,7 +2070,7 @@ E611105F-DC85-9E20-4F7B-E63C54E5DF06,Message
{Install USB driver for the SONY PRS500} {Install USB driver for the SONY PRS500}
21B897C4-24BE-70D1-58EA-DE78EFA60719,Message 21B897C4-24BE-70D1-58EA-DE78EFA60719,Message
{USB Driver installation failed with return code <%DevconStatus%> and concole output \n\n<%DevconResult%>} {USB Driver installation failed with return code <%DevconStatus%> and console output \n\n<%DevconResult%>}
21B897C4-24BE-70D1-58EA-DE78EFA60719,Title 21B897C4-24BE-70D1-58EA-DE78EFA60719,Title
{USB Driver installation failed} {USB Driver installation failed}

3
src/calibre/debug.py
View File

@ -19,6 +19,7 @@ Run an embedded python interpreter.
parser.add_option('--update-module', help='Update the specified module in the frozen library. '+ parser.add_option('--update-module', help='Update the specified module in the frozen library. '+
'Module specifications are of the form full.name.of.module,path_to_module.py', default=None 'Module specifications are of the form full.name.of.module,path_to_module.py', default=None
) )
parser.add_option('-c', help='Run python code.', default=None, dest='command')
return parser return parser
def update_zipfile(zipfile, mod, path): def update_zipfile(zipfile, mod, path):
@ -41,6 +42,8 @@ def main(args=sys.argv):
if opts.update_module: if opts.update_module:
mod, path = opts.update_module.partition(',')[0], opts.update_module.partition(',')[-1] mod, path = opts.update_module.partition(',')[0], opts.update_module.partition(',')[-1]
update_module(mod, os.path.expanduser(path)) update_module(mod, os.path.expanduser(path))
elif opts.command:
exec opts.command
else: else:
from IPython.Shell import IPShellEmbed from IPython.Shell import IPShellEmbed
ipshell = IPShellEmbed() ipshell = IPShellEmbed()

2
src/calibre/trac/bzr_commit_plugin.py
View File

@ -32,6 +32,7 @@ class cmd_commit(_cmd_commit):
return url.replace('//', '//%s:%s@'%(username, password))+'/login/xmlrpc' return url.replace('//', '//%s:%s@'%(username, password))+'/login/xmlrpc'
def get_trac_summary(self, bug, url): def get_trac_summary(self, bug, url):
print 'Getting bug summary for bug #%s'%bug
server = xmlrpclib.ServerProxy(url) server = xmlrpclib.ServerProxy(url)
try: try:
attributes = server.ticket.get(int(bug))[-1] attributes = server.ticket.get(int(bug))[-1]
@ -101,6 +102,7 @@ class cmd_commit(_cmd_commit):
return ret return ret
def close_bug(self, bug, action, url, config): def close_bug(self, bug, action, url, config):
print 'Closing bug #%s'% bug
nick = config.get_nickname() nick = config.get_nickname()
suffix = config.get_user_option('bug_close_comment') suffix = config.get_user_option('bug_close_comment')
if suffix is None: if suffix is None: