From: Robin Dunn <robin@alldunn.com>
Date: Wed, 17 Mar 2004 19:57:06 +0000 (+0000)
Subject: __version__.py is now always generated from setup.py so there is no
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e83135b283d37e99197b94f8e3e238184af84cec

__version__.py is now always generated from setup.py so there is no
need to have it in src any more.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 685c914828..07c361a8bc 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -16,8 +16,8 @@ from distutils.command.install_data import install_data
 VER_MAJOR        = 2      # The first three must match wxWindows
 VER_MINOR        = 5
 VER_RELEASE      = 1
-VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWindows
-VER_FLAGS        = ""     # release flags, such as prerelease num, unicode, etc.
+VER_SUBREL       = 2      # wxPython release num for x.y.z release of wxWindows
+VER_FLAGS        = "p"    # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
@@ -614,7 +614,7 @@ VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
 
 # Unconditionally updated since the version string can change based
 # on the UNICODE flag
-open('src/__version__.py', 'w').write("""\
+open('wx/__version__.py', 'w').write("""\
 # This file was generated by setup.py...
 
 VERSION_STRING  = '%(VERSION)s'
@@ -624,7 +624,7 @@ RELEASE_VERSION = %(VER_RELEASE)s
 SUBREL_VERSION  = %(VER_SUBREL)s
 
 VERSION = (MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION,
-             SUBREL_VERSION, '%(VER_FLAGS)s')
+           SUBREL_VERSION, '%(VER_FLAGS)s')
 
 RELEASE_NUMBER = RELEASE_VERSION  # for compatibility
 """ % globals())
@@ -700,7 +700,6 @@ swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR,
                           ])
 
 copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
-copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)
 
 
 # update the license files
diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py
deleted file mode 100644
index eed36faadc..0000000000
--- a/wxPython/src/__version__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file was generated by setup.py...
-
-VERSION_STRING  = '2.5.1.1'
-MAJOR_VERSION   = 2
-MINOR_VERSION   = 5
-RELEASE_VERSION = 1
-SUBREL_VERSION  = 1
-
-VERSION = (MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION,
-             SUBREL_VERSION, '')
-
-RELEASE_NUMBER = RELEASE_VERSION  # for compatibility