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

Merge pull request #5 from JonasT/master

Browse Source 
makepanda.py --installer fixes for dpkg confusion on Fedora and python3
This commit is contained in:
rdb 2015-02-08 01:00:52 +01:00
commit 392cff6fb6
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
makepanda/installpanda.py
View File

@ -17,6 +17,11 @@ from distutils.sysconfig import get_python_lib
from optparse import OptionParser
from makepandacore import *
def python_sitepackages_path():
from distutils.sysconfig import get_python_lib
return get_python_lib(1)
PYTHON_SITEPACKAGES=python_sitepackages_path()
MIME_INFO = (
("egg", "model/x-egg", "EGG model file", "pview"),
("bam", "model/x-bam", "Panda3D binary model file", "pview"),

18
makepanda/makepanda.py
View File

@ -6184,11 +6184,11 @@ Description: Runtime binary and browser plugin for the Panda3D Game Engine
"""
# We're not putting "python" in the "Requires" field,
# since the rpm-based distros don't have a common
# naming for the Python package.
INSTALLER_SPEC_FILE="""
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Summary: The Panda3D free 3D engine SDK
Name: panda3d
Version: VERSION
@ -6217,7 +6217,7 @@ This package contains the SDK for development with Panda3D, install panda3d-runt
/usr/share/applications/*.desktop
/etc/ld.so.conf.d/panda3d.conf
/usr/%_lib/panda3d
%{python_sitearch}
""" + PYTHON_SITEPACKAGES + """
/usr/include/panda3d
"""
@ -6285,7 +6285,17 @@ def MakeInstallerLinux():
oscmd("rm -rf targetroot data.tar.gz control.tar.gz panda3d.spec")
oscmd("mkdir --mode=0755 targetroot")
if os.path.exists("/usr/bin/dpkg-deb"):
dpkg_present = False
if os.path.exists("/usr/bin/dpkg-architecture") and os.path.exists("/usr/bin/dpkg-deb"):
dpkg_present = True
rpmbuild_present = False
if os.path.exists("/usr/bin/rpmbuild"):
rpmbuild_present = True
if dpkg_present and rpmbuild_present:
print("Warning: both dpkg and rpmbuild present.")
if dpkg_present:
# Invoke installpanda.py to install it into a temporary dir
lib_dir = GetDebLibDir()
if RUNTIME:
@ -6372,7 +6382,7 @@ def MakeInstallerLinux():
oscmd("chmod 644 targetroot/DEBIAN/conffiles targetroot/DEBIAN/symbols")
oscmd("fakeroot dpkg-deb -b targetroot %s_%s_%s.deb" % (pkg_name, pkg_version, pkg_arch))
elif os.path.exists("/usr/bin/rpmbuild"):
elif rpmbuild_present:
# Invoke installpanda.py to install it into a temporary dir
if RUNTIME:
InstallRuntime(destdir="targetroot", prefix="/usr", outputdir=GetOutputDir(), libdir=GetRPMLibDir())