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

Add --rtdist-version option to makepanda

Browse Source
This commit is contained in:
rdb 2016-06-03 02:40:14 +02:00
parent 5543716660
commit 0d770deeaa
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
makepanda/makepanda.py
View File

@ -46,7 +46,7 @@ CFLAGS=""
CXXFLAGS="" CXXFLAGS=""
LDFLAGS="" LDFLAGS=""
RTDIST=0 RTDIST=0
RTDIST_VERSION="dev" RTDIST_VERSION=None
RUNTIME=0 RUNTIME=0
DISTRIBUTOR="" DISTRIBUTOR=""
VERSION=None VERSION=None
@ -162,13 +162,13 @@ 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,OSX_ARCHS,HOST_URL global COMPRESSOR,THREADCOUNT,OSXTARGET,OSX_ARCHS,HOST_URL
global DEBVERSION,RPMRELEASE,GIT_COMMIT,P3DSUFFIX global DEBVERSION,RPMRELEASE,GIT_COMMIT,P3DSUFFIX,RTDIST_VERSION
global STRDXSDKVERSION, WINDOWS_SDK, MSVC_VERSION, BOOUSEINTELCOMPILER global STRDXSDKVERSION, WINDOWS_SDK, MSVC_VERSION, BOOUSEINTELCOMPILER
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=","rpmrelease=","p3dsuffix=", "static","host=","debversion=","rpmrelease=","p3dsuffix=","rtdist-version=",
"directx-sdk=", "windows-sdk=", "msvc-version=", "clean", "use-icl", "directx-sdk=", "windows-sdk=", "msvc-version=", "clean", "use-icl",
"universal", "target=", "arch=", "git-commit="] "universal", "target=", "arch=", "git-commit="]
anything = 0 anything = 0
@ -213,6 +213,7 @@ def parseopts(args):
elif (option=="--rpmrelease"): RPMRELEASE=value elif (option=="--rpmrelease"): RPMRELEASE=value
elif (option=="--git-commit"): GIT_COMMIT=value elif (option=="--git-commit"): GIT_COMMIT=value
elif (option=="--p3dsuffix"): P3DSUFFIX=value elif (option=="--p3dsuffix"): P3DSUFFIX=value
elif (option=="--rtdist-version"): RTDIST_VERSION=value
# Backward compatibility, OPENGL was renamed to GL # Backward compatibility, OPENGL was renamed to GL
elif (option=="--use-opengl"): PkgEnable("GL") elif (option=="--use-opengl"): PkgEnable("GL")
elif (option=="--no-opengl"): PkgDisable("GL") elif (option=="--no-opengl"): PkgDisable("GL")
@ -399,9 +400,12 @@ if (RUNTIME or RTDIST):
if DISTRIBUTOR == "": if DISTRIBUTOR == "":
DISTRIBUTOR = "makepanda" DISTRIBUTOR = "makepanda"
else: elif not RTDIST_VERSION:
RTDIST_VERSION = DISTRIBUTOR.strip() + "_" + MAJOR_VERSION RTDIST_VERSION = DISTRIBUTOR.strip() + "_" + MAJOR_VERSION
if not RTDIST_VERSION:
RTDIST_VERSION = "dev"
if not IsCustomOutputDir(): if not IsCustomOutputDir():
if GetTarget() == "windows" and GetTargetArch() == 'x64': if GetTarget() == "windows" and GetTargetArch() == 'x64':
outputdir_suffix += '_x64' outputdir_suffix += '_x64'