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

fix python subdirectory issue

Browse Source
This commit is contained in:
David Rose 2010-01-15 19:32:29 +00:00
parent 87baa4aab4
commit d18f226684
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/p3d/AppRunner.py
View File

@ -677,7 +677,7 @@ class AppRunner(DirectObject):
self.initPackedAppEnvironment() self.initPackedAppEnvironment()
# Mount the Multifile under /mf, by convention. # Mount the Multifile under self.multifileRoot.
vfs.mount(mf, self.multifileRoot, vfs.MFReadOnly) vfs.mount(mf, self.multifileRoot, vfs.MFReadOnly)
VFSImporter.reloadSharedPackages() VFSImporter.reloadSharedPackages()

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

@ -1472,6 +1472,7 @@ class Packager:
filename = file.newName.rsplit('.', 1)[0] filename = file.newName.rsplit('.', 1)[0]
moduleName = filename.replace("/", ".") moduleName = filename.replace("/", ".")
newName = moduleName
if moduleName.endswith('.__init__'): if moduleName.endswith('.__init__'):
moduleName = moduleName.rsplit('.', 1)[0] moduleName = moduleName.rsplit('.', 1)[0]
@ -1480,7 +1481,7 @@ class Packager:
# deal with it again. # deal with it again.
return return
self.freezer.addModule(moduleName, newName = moduleName, self.freezer.addModule(moduleName, newName = newName,
filename = file.filename) filename = file.filename)
def addEggFile(self, file): def addEggFile(self, file):