diff --git a/build.py b/build.py index ce7fa180..8ca3844e 100755 --- a/build.py +++ b/build.py @@ -59,7 +59,7 @@ isWindows = sys.platform.startswith('win') isDarwin = sys.platform == "darwin" devMode = False -baseName = 'wxPython_Phoenix' +baseName = version.PROJECT_NAME eggInfoName = baseName + '.egg-info' defaultMask='%s-%s*' % (baseName, version.VER_MAJOR) @@ -1698,7 +1698,7 @@ def cmd_sdist(options, args): # Add some extra stuff to the root folder cmd_egg_info(options, args, egg_base=PDEST) - copyFile(opj(PDEST, 'wxPython_Phoenix.egg-info/PKG-INFO'), + copyFile(opj(PDEST, '{}.egg-info/PKG-INFO'.format(baseName)), opj(PDEST, 'PKG-INFO')) # build the tarball diff --git a/buildtools/version.py b/buildtools/version.py index 46c732bd..2a01c213 100644 --- a/buildtools/version.py +++ b/buildtools/version.py @@ -1,7 +1,8 @@ #---------------------------------------------------------------------- # Name: buildtools.version -# Purpose: wxPython version numbers used in the build. This can be -# considered the master copy of the version digits. +# Purpose: wxPython project name and version numbers used in the +# build. This can be considered the master copy of the +# version digits. # # Author: Robin Dunn # @@ -10,6 +11,7 @@ # License: wxWindows License #---------------------------------------------------------------------- +PROJECT_NAME = 'wxPython_Phoenix' VER_MAJOR = 3 # Matches wxWidgets MAJOR version number VER_MINOR = 0 # Matches wxWidgets MINOR version number @@ -41,7 +43,7 @@ VER_FLAGS = "a1" # wxPython release flags # release # # ".dev12345" for daily snapshot builds, by default this is automatically -# pulled from the REV.txt file made by the setrev command, +# pulled from the REV.txt file made by the setrev build command, # if it exists, and is appended to VER_FLAGS # # diff --git a/setup.py b/setup.py index 8117fcb0..d7195a5c 100644 --- a/setup.py +++ b/setup.py @@ -24,11 +24,12 @@ except ImportError: haveWheel = False from buildtools.config import Config, msg, opj, runcmd, canGetSOName, getSOName +import buildtools.version as version #---------------------------------------------------------------------- -NAME = "wxPython_Phoenix" +NAME = version.PROJECT_NAME DESCRIPTION = "Cross platform GUI toolkit for Python, Phoenix version" AUTHOR = "Robin Dunn" AUTHOR_EMAIL = "Robin Dunn "