TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

oops

Browse Source
This commit is contained in:
David Rose 2009-10-26 23:05:35 +00:00
parent 2e5da4019f
commit c4ac2aac6a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,6 +254,7 @@ def getDllVersion(filename):
def makeCabFile(ocx, pluginDependencies):
""" Creates an ActiveX CAB file. Windows only. """
ocxFullpath = findExecutable(ocx)
cabFilename = os.path.splitext(ocx)[0] + '.cab'
cabarc = 'cabarc'
@ -271,7 +272,7 @@ def makeCabFile(ocx, pluginDependencies):
for filename in dependencies:
print >> inf, '%s=%s' % (filename, filename)
print >> inf, '\n[%s]\nfile=thiscab' % (infFile)
print >> inf, '\n[%s]\nfile=thiscab\nclsid={924B4927-D3BA-41EA-9F7E-8A89194AB3AC}\nRegisterServer=yes\nFileVersion=%s' % (ocx, getDllVersion(ocx))
print >> inf, '\n[%s]\nfile=thiscab\nclsid={924B4927-D3BA-41EA-9F7E-8A89194AB3AC}\nRegisterServer=yes\nFileVersion=%s' % (ocx, getDllVersion(ocxFullpath))
fullpaths = []
for filename in dependencies:
@ -289,7 +290,7 @@ def makeCabFile(ocx, pluginDependencies):
cmd = '"%s" -s 6144 n "%s"' % (cabarc, cabFilename)
for fullpath in fullpaths:
cmd += ' "%s"' % (fullpath)
cmd += ' "%s" %s' % (findExecutable(ocx), infFile)
cmd += ' "%s" %s' % (ocxFullpath, infFile)
print cmd
result = subprocess.call(cmd)
if result:
@ -445,9 +446,9 @@ def makeInstaller():
print ""
print CMD
print "packing..."
#result = subprocess.call(CMD)
#if result:
# sys.exit(result)
result = subprocess.call(CMD)
if result:
sys.exit(result)
if options.spc and options.pvk:
# Generate a CAB file and sign it.