Fixing cxxtestgen installation issue when setuptools is not available.

git-svn-id: https://cxxtest.svn.sourceforge.net/svnroot/cxxtest/trunk@314 2f8b185b-e3eb-40a7-945f-4de83c84e57e
smikes · Jan 2, 2012 · 9fd51d7 · 9fd51d7
1 parent d0fca49
commit 9fd51d7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/Versions b/Versions
@@ -2,7 +2,14 @@
 CxxTest Releases
 ----------------
 
-* Version 4.0 (TODO)
+* Version 4.0.2 (2012-01-02)
+ - Bug fix to enable installation of cxxtestgen without the 'setuptools' package
+
+* Version 4.0.1 (2012-01-01)
+ - Documentation updates
+ - Bug fix for installation of cxxtestgen script
+
+* Version 4.0 (2011-12-28)
  - Perl is no longer used to support CxxTest scripts.  Python is now the only scripting language used by      CxxTest.
  - The testing scripts have been rewritten using the PyUnit framework.
  - The installation process for CxxTest now leverages and integrates with the system Python installation.

diff --git a/python/cxxtest/__release__.py b/python/cxxtest/__release__.py
@@ -9,5 +9,5 @@
 
 """ Release Information for cxxtest """
 
-__version__ = '4.0'
-__date__ = "alpha"
+__version__ = '4.0.2'
+__date__ = "2012-01-02"
diff --git a/python/scripts/cxxtestgen b/python/scripts/cxxtestgen
@@ -0,0 +1,5 @@
+#! python
+
+import cxxtest.cxxtestgen
+
+cxxtest.cxxtestgen.main()
diff --git a/python/setup.py b/python/setup.py
@@ -34,9 +34,13 @@
       long_description = "\n".join(doclines[2:]),
       packages=['cxxtest'],
       keywords=['utility'],
-      entry_points="""
-        [console_scripts]
-        cxxtestgen = cxxtest.cxxtestgen:main
-      """
+      scripts=['scripts/cxxtestgen']
+      #
+      # The entry_points option is not supported by distutils.core
+      #
+      #entry_points="""
+        #[console_scripts]
+        #cxxtestgen = cxxtest.cxxtestgen:main
+      #"""
       )