Found those darn issues, and fixed them

This commit is contained in:
rdb 2010-11-13 16:16:23 +00:00
parent f9c1772ef5
commit 1ca48aefcf
2 changed files with 3 additions and 6 deletions

View File

@ -147,7 +147,7 @@ class Standalone:
filenames = []
vfs = VirtualFileSystem.getGlobalPtr()
for e in package.extracts:
if e.basename not in ["p3dembed", "p3dembed.exe"]:
if e.basename not in ["p3dembed", "p3dembed.exe", "p3dembed.exe.manifest"]:
filename = Filename(package.getPackageDir(), e.filename)
filename.makeAbsolute()
if vfs.exists(filename):

View File

@ -895,18 +895,15 @@ class Packager:
command = 'mt -inputresource:"%s";#%d -out:"%s" > nul' % (
file.filename.toOsSpecific(),
resindex, tempFile.toOsSpecific())
print command
try:
out = os.system(command)
except:
print "failed"
pass
afilenames = None
if tempFile.exists():
afilenames = self.__parseManifest(tempFile)
print tempFile
#tempFile.unlink()
tempFile.unlink()
# Also check for an explicit private-assembly
# manifest file on disk.
@ -999,7 +996,7 @@ class Packager:
while dependency:
depassembly = dependency.FirstChildElement("dependentAssembly")
if depassembly:
ident = assembly.FirstChildElement("assemblyIdentity")
ident = depassembly.FirstChildElement("assemblyIdentity")
if ident:
name = ident.Attribute("name")
if name: