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

include explicit .manifest files if they exist

Browse Source
This commit is contained in:
David Rose 2010-08-11 17:42:03 +00:00
parent a975e14907
commit edffdd95ff
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
direct/src/p3d/Packager.py
View File

@ -848,7 +848,8 @@ class Packager:
self.notify.warning("Unable to determine dependencies from %s" % (file.filename)) self.notify.warning("Unable to determine dependencies from %s" % (file.filename))
filenames = [] filenames = []
# Extract the manifest file so we can figure out the dependent assemblies. # Extract the manifest file so we can figure out
# the dependent assemblies.
tempFile = Filename.temporary('', 'p3d_', '.manifest') tempFile = Filename.temporary('', 'p3d_', '.manifest')
resindex = 2 resindex = 2
if file.filename.getExtension().lower() == "exe": if file.filename.getExtension().lower() == "exe":
@ -865,6 +866,21 @@ class Packager:
if tempFile.exists(): if tempFile.exists():
afilenames = self.__parseManifest(tempFile) afilenames = self.__parseManifest(tempFile)
tempFile.unlink() tempFile.unlink()
# Also check for an explicit private-assembly
# manifest file on disk.
mfile = file.filename + '.manifest'
if mfile.exists():
if afilenames is None:
afilenames = []
afilenames += self.__parseManifest(mfile)
# Since it's an explicit manifest file, it
# means we should include the manifest
# file itself in the package.
newName = Filename(file.dependencyDir, mfile.getBasename())
self.addFile(mfile, newName = newName.cStr(),
explicit = False, executable = True)
if afilenames is None and out != 31: if afilenames is None and out != 31:
self.notify.warning("Unable to determine dependent assemblies from %s" % (file.filename)) self.notify.warning("Unable to determine dependent assemblies from %s" % (file.filename))