TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

add --cab

Browse Source
This commit is contained in:
David Rose 2010-01-13 21:02:30 +00:00
parent 4d872ca9c7
commit 01ac73fc87
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
direct/src/plugin_installer/make_installer.py
View File

@ -44,7 +44,7 @@ parser.add_option('-w', '--website', dest = 'website',
default = 'http://www.panda3d.org') default = 'http://www.panda3d.org')
parser.add_option('', '--start', dest = 'start', parser.add_option('', '--start', dest = 'start',
help = 'Specify this option to add a start menu', help = 'Specify this option to add a start menu',
action = 'store_false', default = False) action = 'store_true', default = False)
parser.add_option('', '--welcome_image', dest = 'welcome_image', parser.add_option('', '--welcome_image', dest = 'welcome_image',
help = 'The image to display on the installer, 170x312 BMP', help = 'The image to display on the installer, 170x312 BMP',
default = None) default = None)
@ -54,8 +54,11 @@ parser.add_option('', '--install_icon', dest = 'install_icon',
parser.add_option('', '--nsis', dest = 'nsis', parser.add_option('', '--nsis', dest = 'nsis',
help = 'The path to the makensis executable', help = 'The path to the makensis executable',
default = None) default = None)
parser.add_option('', '--cab', dest = 'cab',
help = 'Generate an ActiveX CAB file (Windows only). If --spc and --pvk are not also specified, the CAB file will be unsigned.',
action = 'store_true', default = False)
parser.add_option('', '--spc', dest = 'spc', parser.add_option('', '--spc', dest = 'spc',
help = 'Generate an ActiveX CAB file, then sign it with the indicated spc file (Windows only). You must also specify --pvk.', help = 'Sign the CAB file generated by --cab with the indicated spc file (Windows only). You must also specify --pvk.',
default = None) default = None)
parser.add_option('', '--pvk', dest = 'pvk', parser.add_option('', '--pvk', dest = 'pvk',
help = 'Specifies the private key to be used in conjuction with --spc to sign a CAB file (Windows only).', help = 'Specifies the private key to be used in conjuction with --spc to sign a CAB file (Windows only).',
@ -511,12 +514,13 @@ def makeCabFile(ocx, pluginDependencies):
print "Successfully generated %s" % (cabFilename) print "Successfully generated %s" % (cabFilename)
# Now we have to sign the cab file. if options.spc and options.pvk:
cmd = '"%s" -spc "%s" -k "%s" "%s"' % (signcode, options.spc, options.pvk, cabFilename) # Now we have to sign the cab file.
print cmd cmd = '"%s" -spc "%s" -k "%s" "%s"' % (signcode, options.spc, options.pvk, cabFilename)
result = subprocess.call(cmd) print cmd
if result: result = subprocess.call(cmd)
sys.exit(result) if result:
sys.exit(result)
def makeInstaller(): def makeInstaller():
# Locate the plugin(s). # Locate the plugin(s).
@ -725,8 +729,8 @@ def makeInstaller():
if result: if result:
sys.exit(result) sys.exit(result)
if options.spc and options.pvk: if options.cab:
# Generate a CAB file and sign it. # Generate a CAB file and optionally sign it.
makeCabFile(ocx, pluginDependencies) makeCabFile(ocx, pluginDependencies)
if options.plugin_root: if options.plugin_root: