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

fix failure to update import.xml hash after modifying it

Browse Source
This commit is contained in:
David Rose 2011-03-15 20:31:18 +00:00
parent b2da92fefb
commit 9f9ed8bc56
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
direct/src/p3d/PatchMaker.py
View File

@ -526,7 +526,8 @@ class PatchMaker:
# Also copy the seq to the import desc file, for # Also copy the seq to the import desc file, for
# documentation purposes. # documentation purposes.
importDescFullpath = Filename(self.patchMaker.installDir, self.packageDesc.cStr()[:-3] + 'import.xml') importDescFilename = self.packageDesc.cStr()[:-3] + 'import.xml'
importDescFullpath = Filename(self.patchMaker.installDir, importDescFilename)
doc = TiXmlDocument(importDescFullpath.toOsSpecific()) doc = TiXmlDocument(importDescFullpath.toOsSpecific())
if doc.LoadFile(): if doc.LoadFile():
xpackage = doc.FirstChildElement('package') xpackage = doc.FirstChildElement('package')
@ -544,6 +545,13 @@ class PatchMaker:
fileSpec.fromFile(self.patchMaker.installDir, self.packageDesc) fileSpec.fromFile(self.patchMaker.installDir, self.packageDesc)
fileSpec.storeXml(self.contentsDocPackage) fileSpec.storeXml(self.contentsDocPackage)
# Also important to update the import.xml hash.
ximport = self.contentsDocPackage.FirstChildElement('import')
if ximport:
fileSpec = FileSpec()
fileSpec.fromFile(self.patchMaker.installDir, importDescFilename)
fileSpec.storeXml(ximport)
# Also copy the package seq value into the # Also copy the package seq value into the
# contents.xml file, mainly for documentation purposes # contents.xml file, mainly for documentation purposes
# (the authoritative seq value is within the desc # (the authoritative seq value is within the desc