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

makepanda: makepackage/makewheel take default version from setup.cfg

Browse Source 
dtool/PandaVersion.pp is obsolete and will be removed soon.
This commit is contained in:
rdb 2019-08-20 13:21:29 +02:00
parent 0265ee8ef8
commit 64982f8b14
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makepanda/makepackage.py
View File

@ -1039,7 +1039,7 @@ def MakeInstaller(version, **kwargs):
if __name__ == "__main__": if __name__ == "__main__":
version = ParsePandaVersion("dtool/PandaVersion.pp") version = GetMetadataValue('version')
parser = OptionParser() parser = OptionParser()
parser.add_option('', '--version', dest='version', help='Panda3D version number (default: %s)' % (version), default=version) parser.add_option('', '--version', dest='version', help='Panda3D version number (default: %s)' % (version), default=version)

4
makepanda/makewheel.py
View File

@ -15,7 +15,7 @@ import tempfile
import subprocess import subprocess
from distutils.sysconfig import get_config_var from distutils.sysconfig import get_config_var
from optparse import OptionParser from optparse import OptionParser
from makepandacore import ColorText, LocateBinary, ParsePandaVersion, GetExtensionSuffix, SetVerbose, GetVerbose, GetMetadataValue from makepandacore import ColorText, LocateBinary, GetExtensionSuffix, SetVerbose, GetVerbose, GetMetadataValue
from base64 import urlsafe_b64encode from base64 import urlsafe_b64encode
@ -717,7 +717,7 @@ __version__ = '{0}'
if __name__ == "__main__": if __name__ == "__main__":
version = ParsePandaVersion("dtool/PandaVersion.pp") version = GetMetadataValue('version')
parser = OptionParser() parser = OptionParser()
parser.add_option('', '--version', dest = 'version', help = 'Panda3D version number (default: %s)' % (version), default = version) parser.add_option('', '--version', dest = 'version', help = 'Panda3D version number (default: %s)' % (version), default = version)