TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add --rpmrelease flag

Browse Source
This commit is contained in:
rdb 2010-11-14 14:14:30 +00:00
parent 688fdbbf1a
commit a271bec848
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
makepanda/makepanda.py
View File

@ -46,6 +46,7 @@ RUNTIME=0
DISTRIBUTOR="" DISTRIBUTOR=""
VERSION=None VERSION=None
DEBVERSION=None DEBVERSION=None
RPMRELEASE="1"
MAJOR_VERSION=None MAJOR_VERSION=None
COREAPI_VERSION=None COREAPI_VERSION=None
OSXTARGET=None OSXTARGET=None
@ -121,12 +122,12 @@ def usage(problem):
def parseopts(args): def parseopts(args):
global INSTALLER,RTDIST,RUNTIME,GENMAN,DISTRIBUTOR,VERSION global INSTALLER,RTDIST,RUNTIME,GENMAN,DISTRIBUTOR,VERSION
global COMPRESSOR,THREADCOUNT,OSXTARGET,HOST_URL,DEBVERSION global COMPRESSOR,THREADCOUNT,OSXTARGET,HOST_URL,DEBVERSION,RPMRELEASE
longopts = [ longopts = [
"help","distributor=","verbose","runtime","osxtarget=", "help","distributor=","verbose","runtime","osxtarget=",
"optimize=","everything","nothing","installer","rtdist","nocolor", "optimize=","everything","nothing","installer","rtdist","nocolor",
"version=","lzma","no-python","threads=","outputdir=","override=", "version=","lzma","no-python","threads=","outputdir=","override=",
"static","host=","debversion="] "static","host=","debversion=","rpmrelease="]
anything = 0 anything = 0
optimize = "" optimize = ""
for pkg in PkgListGet(): longopts.append("no-"+pkg.lower()) for pkg in PkgListGet(): longopts.append("no-"+pkg.lower())
@ -156,6 +157,7 @@ def parseopts(args):
elif (option=="--static"): SetLinkAllStatic(True) elif (option=="--static"): SetLinkAllStatic(True)
elif (option=="--host"): HOST_URL=value elif (option=="--host"): HOST_URL=value
elif (option=="--debversion"): DEBVERSION=value elif (option=="--debversion"): DEBVERSION=value
elif (option=="--rpmrelease"): RPMRELEASE=value
else: else:
for pkg in PkgListGet(): for pkg in PkgListGet():
if (option=="--use-"+pkg.lower()): if (option=="--use-"+pkg.lower()):
@ -4979,7 +4981,7 @@ INSTALLER_SPEC_FILE="""
Summary: The Panda3D free 3D engine SDK Summary: The Panda3D free 3D engine SDK
Name: panda3d Name: panda3d
Version: VERSION Version: VERSION
Release: 1 Release: RPMRELEASE
License: BSD License License: BSD License
Group: Development/Libraries Group: Development/Libraries
BuildRoot: PANDASOURCE/targetroot BuildRoot: PANDASOURCE/targetroot
@ -5088,13 +5090,13 @@ def MakeInstallerLinux():
txt = RUNTIME_INSTALLER_SPEC_FILE[1:] txt = RUNTIME_INSTALLER_SPEC_FILE[1:]
else: else:
txt = INSTALLER_SPEC_FILE[1:] txt = INSTALLER_SPEC_FILE[1:]
txt = txt.replace("VERSION",VERSION).replace("PANDASOURCE",pandasource).replace("PV",PV) txt = txt.replace("VERSION", VERSION).replace("RELEASE", RPMRELEASE).replace("PANDASOURCE", pandasource).replace("PV", PV)
WriteFile("panda3d.spec", txt) WriteFile("panda3d.spec", txt)
oscmd("rpmbuild --define '_rpmdir "+pandasource+"' --root "+pandasource+" --buildroot targetroot -bb panda3d.spec") oscmd("rpmbuild --define '_rpmdir "+pandasource+"' --root "+pandasource+" --buildroot targetroot -bb panda3d.spec")
if (RUNTIME): if (RUNTIME):
oscmd("mv "+ARCH+"/panda3d-runtime-"+VERSION+"-1."+ARCH+".rpm .") oscmd("mv "+ARCH+"/panda3d-runtime-"+VERSION+"-"+RPMRELEASE+"."+ARCH+".rpm .")
else: else:
oscmd("mv "+ARCH+"/panda3d-"+VERSION+"-1."+ARCH+".rpm .") oscmd("mv "+ARCH+"/panda3d-"+VERSION+"-"+RPMRELEASE+"."+ARCH+".rpm .")
oscmd("rmdir "+ARCH, True) oscmd("rmdir "+ARCH, True)
if (os.path.exists("/usr/bin/dpkg-deb")): if (os.path.exists("/usr/bin/dpkg-deb")):
@ -5104,7 +5106,7 @@ def MakeInstallerLinux():
txt = RUNTIME_INSTALLER_DEB_FILE[1:] txt = RUNTIME_INSTALLER_DEB_FILE[1:]
else: else:
txt = INSTALLER_DEB_FILE[1:] txt = INSTALLER_DEB_FILE[1:]
txt = txt.replace("VERSION", str(DEBVERSION)).replace("ARCH", ARCH).replace("PV", PV).replace("MAJOR", MAJOR_VERSION) txt = txt.replace("VERSION", DEBVERSION).replace("ARCH", ARCH).replace("PV", PV).replace("MAJOR", MAJOR_VERSION)
oscmd("mkdir --mode=0755 -p targetroot/DEBIAN") oscmd("mkdir --mode=0755 -p targetroot/DEBIAN")
oscmd("cd targetroot ; (find usr -type f -exec md5sum {} \;) > DEBIAN/md5sums") oscmd("cd targetroot ; (find usr -type f -exec md5sum {} \;) > DEBIAN/md5sums")
if (not RUNTIME): if (not RUNTIME):