From 30e8d98f2cfacf3f641ce58a23ccbb49c6744cc9 Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 14 Feb 2012 23:12:20 +0000 Subject: [PATCH] use toOsSpecific() where it counts --- direct/src/p3d/DeploymentTools.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/direct/src/p3d/DeploymentTools.py b/direct/src/p3d/DeploymentTools.py index 1c7b068e80..35db155c28 100644 --- a/direct/src/p3d/DeploymentTools.py +++ b/direct/src/p3d/DeploymentTools.py @@ -1139,14 +1139,15 @@ class Installer: curdir = "" for root, dirs, files in self.os_walk(hostDir.toOsSpecific()): for name in files: - file = Filename.fromOsSpecific(os.path.join(root, name)) + basefile = Filename.fromOsSpecific(os.path.join(root, name)) + file = Filename(basefile) file.makeAbsolute() file.makeRelativeTo(hostDir) outdir = file.getDirname().replace('/', '\\') if curdir != outdir: print >>nsi, ' SetOutPath "$INSTDIR\\%s"' % outdir curdir = outdir - print >>nsi, ' File "%s"' % os.path.join(root, name) + print >>nsi, ' File "%s"' % (basefile.toOsSpecific()) print >>nsi, ' WriteUninstaller "$INSTDIR\\Uninstall.exe"' print >>nsi, ' ; Start menu items' print >>nsi, ' !insertmacro MUI_STARTMENU_WRITE_BEGIN Application'