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

a few small fixes

Browse Source
This commit is contained in:
David Rose 2009-10-07 14:48:06 +00:00
parent 843bc110c4
commit fe65b1ce40
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -323,6 +323,12 @@ class Packager:
# only three settings: None (unset), True, or False. # only three settings: None (unset), True, or False.
self.platformSpecificConfig = self.configs.get('platform_specific', None) self.platformSpecificConfig = self.configs.get('platform_specific', None)
if self.platformSpecificConfig is not None: if self.platformSpecificConfig is not None:
# First, convert it to an int, in case it's "0" or "1".
try:
self.platformSpecificConfig = int(self.platformSpecificConfig)
except ValueError:
pass
# Then, make it a bool.
self.platformSpecificConfig = bool(self.platformSpecificConfig) self.platformSpecificConfig = bool(self.platformSpecificConfig)
del self.configs['platform_specific'] del self.configs['platform_specific']
@ -2655,7 +2661,8 @@ class Packager:
prefix += '/' prefix += '/'
for subfile in dirList: for subfile in dirList:
filename = subfile.getFilename() filename = subfile.getFilename()
self.__recurseDir(filename, prefix + filename.getBasename()) self.__recurseDir(filename, prefix + filename.getBasename(),
unprocessed = unprocessed)
return return
# It's a file name. Add it. # It's a file name. Add it.

3
direct/src/p3d/panda3d.pdef
View File

@ -51,7 +51,8 @@ class panda3d(package):
'direct.particles.*', 'direct.particles.*',
'direct.showbase.*', 'direct.showbase.*',
'direct.showutil.*', 'direct.showutil.*',
'direct.stdpy.*') 'direct.stdpy.*',
'direct.task.*')
# Exclude these Panda3D libs; they are big and many applications don't # Exclude these Panda3D libs; they are big and many applications don't
# use them. We define them as separate, optional packages, below, # use them. We define them as separate, optional packages, below,

9
direct/src/showbase/VFSImporter.py
View File

@ -1,4 +1,4 @@
from libpandaexpress import Filename, VirtualFileSystem, VirtualFileMountSystem from libpandaexpress import Filename, VirtualFileSystem, VirtualFileMountSystem, OFileStream, copyStream
import sys import sys
import new import new
import os import os
@ -203,8 +203,9 @@ class VFSLoader:
# It's a real file. # It's a real file.
filename = self.filename filename = self.filename
elif self.filename.exists(): elif self.filename.exists():
# It's a virtual file, but it's shadowing a real file. # It's a virtual file, but it's shadowing a real file in
# Assume they're the same, and load the real one. # the same directory. Assume they're the same, and load
# the real one.
filename = self.filename filename = self.filename
else: else:
# It's a virtual file with no real-world existence. Dump # It's a virtual file with no real-world existence. Dump
@ -214,7 +215,7 @@ class VFSLoader:
type = Filename.TDso) type = Filename.TDso)
filename.setExtension(self.filename.getExtension()) filename.setExtension(self.filename.getExtension())
filename.setBinary() filename.setBinary()
sin = vfile.openReadFile() sin = vfile.openReadFile(True)
sout = OFileStream() sout = OFileStream()
if not filename.openWrite(sout): if not filename.openWrite(sout):
raise IOError raise IOError