[Zope-Checkins] SVN: Zope/branches/five-integration/setup.py fixed install voodoo

[Brian Lloyd]

Log message for revision 29486:
  fixed install voodoo

Changed:
  U   Zope/branches/five-integration/setup.py

-=-
Modified: Zope/branches/five-integration/setup.py
===================================================================
--- Zope/branches/five-integration/setup.py	2005-03-16 09:50:38 UTC (rev 29485)
+++ Zope/branches/five-integration/setup.py	2005-03-16 11:22:19 UTC (rev 29486)
@@ -1212,6 +1212,7 @@
     # Distribution.__init__().
     def __init__(self, *attrs):
         Distribution.__init__(self, *attrs)
+        self.cmdclass['install'] = ZopeInstall
         self.cmdclass['build'] = MyBuilder
         self.cmdclass['build_ext'] = MyExtBuilder
         self.cmdclass['install_lib'] = MyLibInstaller
@@ -1258,44 +1259,39 @@
 # We're using the module docstring as the distutils descriptions.
 doclines = __doc__.split("\n")
 
-setup(name="zope",
+setup(name="zopex30",
       version="X3.0",
       maintainer="Zope Corporation",
       maintainer_email="zope3-dev at zope.org",
       url = "http://dev.zope.org/Zope3/",
       ext_modules = ext_modules,
-      # This doesn't work right at all
-      headers = ["persistent/cPersistence.h",
-                 "zope/proxy/proxy.h"],
-      scripts = [],
       license = "http://www.zope.org/Resources/ZPL",
       platforms = ["any"],
       description = doclines[0],
       long_description = "\n".join(doclines[2:]),
       packages = packages,
-      #package_dir = {'': 'src'},
       distclass = MyDistribution,
       )
 
 
-setup(
-    name='Five',
-    author='Martijn Faassen',
+#setup(
+#    name='Five',
+#    author='Martijn Faassen',
+#
+#    packages=['Products.Five'],
+#    data_files=[['Products/Five', ['Products/Five/*']],
+#                ['Products/Five/demo', ['Products/Five/demo/*']],
+#                ['Products/Five/doc', ['Products/Five/doc/*']],
+#                ['Products/Five/skel', ['Products/Five/skel/*']],
+#                ['Products/Five/tests', ['Products/Five/tests/*']],
+#                ],
+#    )
 
-    packages=['Products.Five'],
-    data_files=[['Products/Five', ['Products/Five/*']],
-                ['Products/Five/demo', ['Products/Five/demo/*']],
-                ['Products/Five/doc', ['Products/Five/doc/*']],
-                ['Products/Five/skel', ['Products/Five/skel/*']],
-                ['Products/Five/tests', ['Products/Five/tests/*']],
-                ],
-    )
 
 
 
 
 
-
 # Call distutils setup with all lib/python packages and modules, and
 # flush setup_info.  Wondering why we run py_modules separately?  So am I.
 # Distutils won't let us specify packages and py_modules in the same call.