TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

dist: fix the relative path of the files and output dirs in the generated NSIS script

Browse Source 
Closes #1008
Fixes #1003
This commit is contained in:
LD 2020-09-01 21:19:56 +02:00 committed by rdb
parent c7f75fc906
commit 2e862c1bbe
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
direct/src/dist/commands.py vendored
View File

@ -1408,17 +1408,22 @@ class bdist_apps(setuptools.Command):
nsi.write('Section "" SecCore\n') nsi.write('Section "" SecCore\n')
nsi.write(' SetOutPath "$INSTDIR"\n') nsi.write(' SetOutPath "$INSTDIR"\n')
curdir = "" curdir = ""
nsi_dir = p3d.Filename.fromOsSpecific(build_cmd.build_base)
build_root_dir = p3d.Filename.fromOsSpecific(build_dir)
for root, dirs, files in os.walk(build_dir): for root, dirs, files in os.walk(build_dir):
for name in files: for name in files:
basefile = p3d.Filename.fromOsSpecific(os.path.join(root, name)) basefile = p3d.Filename.fromOsSpecific(os.path.join(root, name))
file = p3d.Filename(basefile) file = p3d.Filename(basefile)
file.makeAbsolute() file.makeAbsolute()
file.makeRelativeTo(build_dir) file.makeRelativeTo(nsi_dir)
outdir = file.getDirname().replace('/', '\\') outdir = p3d.Filename(basefile)
outdir.makeAbsolute()
outdir.makeRelativeTo(build_root_dir)
outdir = outdir.getDirname().replace('/', '\\')
if curdir != outdir: if curdir != outdir:
nsi.write(' SetOutPath "$INSTDIR\\%s"\n' % outdir) nsi.write(' SetOutPath "$INSTDIR\\%s"\n' % outdir)
curdir = outdir curdir = outdir
nsi.write(' File "%s"\n' % (basefile.toOsSpecific())) nsi.write(' File "%s"\n' % (file.toOsSpecific()))
nsi.write(' SetOutPath "$INSTDIR"\n') nsi.write(' SetOutPath "$INSTDIR"\n')
nsi.write(' WriteUninstaller "$INSTDIR\\Uninstall.exe"\n') nsi.write(' WriteUninstaller "$INSTDIR\\Uninstall.exe"\n')
nsi.write(' ; Start menu items\n') nsi.write(' ; Start menu items\n')