TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 16:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepackage: avoid packaging deploy-stub with installers

Browse Source
This commit is contained in:
rdb 2018-12-26 23:42:39 +01:00
parent 01915a36db
commit ae74e2d18e
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makepanda/installer.nsi
View File

@ -367,7 +367,7 @@ Section "Tools and utilities" SecTools
SetDetailsPrint listonly SetDetailsPrint listonly
SetOutPath "$INSTDIR\bin" SetOutPath "$INSTDIR\bin"
File /r "${BUILT}\bin\*.exe" File /r /x deploy-stub.exe /x deploy-stubw.exe "${BUILT}\bin\*.exe"
File /nonfatal /r "${BUILT}\bin\*.p3d" File /nonfatal /r "${BUILT}\bin\*.p3d"
SetOutPath "$INSTDIR\NSIS" SetOutPath "$INSTDIR\NSIS"
File /r /x CVS "${NSISDIR}\*" File /r /x CVS "${NSISDIR}\*"

5
makepanda/installpanda.py
View File

@ -220,12 +220,15 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built", libdir=GetLibDir(
else: else:
oscmd("echo '"+libdir+"/panda3d'> "+destdir+"/etc/ld.so.conf.d/panda3d.conf") oscmd("echo '"+libdir+"/panda3d'> "+destdir+"/etc/ld.so.conf.d/panda3d.conf")
oscmd("cp "+outputdir+"/bin/* "+destdir+prefix+"/bin/")
for base in os.listdir(outputdir+"/lib"): for base in os.listdir(outputdir+"/lib"):
if (not base.endswith(".a")) or base == "libp3pystub.a": if (not base.endswith(".a")) or base == "libp3pystub.a":
# We really need to specify -R in order not to follow symlinks on non-GNU # We really need to specify -R in order not to follow symlinks on non-GNU
oscmd("cp -R -P "+outputdir+"/lib/"+base+" "+destdir+libdir+"/panda3d/"+base) oscmd("cp -R -P "+outputdir+"/lib/"+base+" "+destdir+libdir+"/panda3d/"+base)
for base in os.listdir(outputdir+"/bin"):
if not base.startswith("deploy-stub"):
oscmd("cp -R -P "+outputdir+"/bin/"+base+" "+destdir+prefix+"/bin/"+base)
DeleteVCS(destdir+prefix+"/share/panda3d") DeleteVCS(destdir+prefix+"/share/panda3d")
DeleteBuildFiles(destdir+prefix+"/share/panda3d") DeleteBuildFiles(destdir+prefix+"/share/panda3d")
DeleteEmptyDirs(destdir+prefix+"/share/panda3d") DeleteEmptyDirs(destdir+prefix+"/share/panda3d")

7
makepanda/makepackage.py
View File

@ -512,9 +512,10 @@ def MakeInstallerOSX(version, runtime=False, python_versions=[], **kwargs):
oscmd("install -m 0644 doc/man/*.1 dstroot/tools/usr/local/share/man/man1/") oscmd("install -m 0644 doc/man/*.1 dstroot/tools/usr/local/share/man/man1/")
for base in os.listdir(outputdir+"/bin"): for base in os.listdir(outputdir+"/bin"):
binname = "dstroot/tools/Developer/Panda3D/bin/" + base if not base.startswith("deploy-stub"):
# OSX needs the -R argument to copy symbolic links correctly, it doesn't have -d. How weird. binname = "dstroot/tools/Developer/Panda3D/bin/" + base
oscmd("cp -R " + outputdir + "/bin/" + base + " " + binname) # OSX needs the -R argument to copy symbolic links correctly, it doesn't have -d. How weird.
oscmd("cp -R " + outputdir + "/bin/" + base + " " + binname)
if python_versions: if python_versions:
# Let's only write a ppython link if there is only one Python version. # Let's only write a ppython link if there is only one Python version.