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

Merge remote-tracking branch 'origin/release/1.9.x'

Browse Source
This commit is contained in:
rdb 2018-01-03 14:07:42 +01:00
commit d3249356b3
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makepanda/installpanda.py
View File

@ -229,6 +229,14 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built", libdir=GetLibDir(
DeleteBuildFiles(destdir+prefix+"/include/panda3d")
DeleteEmptyDirs(destdir+prefix+"/include/panda3d")
# Change permissions on include directory.
os.chmod(destdir + prefix + "/include", 0o755)
for root, dirs, files in os.walk(destdir + prefix + "/include"):
for basename in dirs:
os.chmod(os.path.join(root, basename), 0o755)
for basename in files:
os.chmod(os.path.join(root, basename), 0o644)
# rpmlint doesn't like this file, for some reason.
if (os.path.isfile(destdir+prefix+"/share/panda3d/direct/leveleditor/copyfiles.pl")):
os.remove(destdir+prefix+"/share/panda3d/direct/leveleditor/copyfiles.pl")

8
makepanda/makepanda.py
View File

@ -6979,8 +6979,8 @@ def MakeInstallerLinux():
else:
InstallPanda(destdir="targetroot", prefix="/usr", outputdir=GetOutputDir(), libdir=lib_dir)
oscmd("chmod -R 755 targetroot/usr/share/panda3d")
oscmd("mkdir -p targetroot/usr/share/man/man1")
oscmd("cp doc/man/*.1 targetroot/usr/share/man/man1/")
oscmd("mkdir -m 0755 -p targetroot/usr/share/man/man1")
oscmd("install -m 0644 doc/man/*.1 targetroot/usr/share/man/man1/")
oscmd("dpkg --print-architecture > "+GetOutputDir()+"/tmp/architecture.txt")
pkg_arch = ReadFile(GetOutputDir()+"/tmp/architecture.txt").strip()
@ -7145,8 +7145,8 @@ def MakeInstallerOSX():
# Trailing newline is important, works around a bug in OSX
WriteFile("dstroot/tools/etc/paths.d/Panda3D", "/Developer/Panda3D/bin\n")
oscmd("mkdir -p dstroot/tools/usr/local/share/man/man1")
oscmd("cp doc/man/*.1 dstroot/tools/usr/local/share/man/man1/")
oscmd("mkdir -m 0755 -p 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(GetOutputDir()+"/bin"):
binname = "dstroot/tools/Developer/Panda3D/bin/" + base