[Zope-Checkins] CVS: Zope/inst - setup.py:1.1.4.12

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv898

Modified Files:
      Tag: new-install-branch
	setup.py 
Log Message:
Now that the top-level directory doesn't contain modules or packages,
the portion of setup.py that handles it can be substantially
simplified.


=== Zope/inst/setup.py 1.1.4.11 => 1.1.4.12 ===
--- Zope/inst/setup.py:1.1.4.11	Fri Feb 21 13:23:22 2003
+++ Zope/inst/setup.py	Mon Feb 24 15:41:53 2003
@@ -1001,7 +1001,6 @@
     scripts=setup_info.get('scripts', []),
     distclass=ZopeDistribution,
     )
-setup_info = {}
 
 # The rest of these modules live in the root of the source tree
 os.chdir(ZOPE_ROOT)
@@ -1027,31 +1026,11 @@
     ]
 os.path.walk("skel", skel_visit, installed_data_files)
 
-# "Top-level" stuff
-setup(
-    name="Zope Scripts",
-    author=AUTHOR,
-    scripts=["bin/runzope.py", "bin/mkzopeinstance"],
-    data_files=installed_data_files,
-    )
-
-# And now, the root-level stuff
-
 distutils.core.setup(
     name='Zope',
     author=AUTHOR,
 
-    packages=setup_info.get('packages', []),
-    data_files=setup_info.get('data_files', []),
-    headers=setup_info.get('headers', []),
-    ext_modules=setup_info.get('ext_modules', []),
-    distclass=ZopeDistribution,
-    )
-distutils.core.setup(
-    name='Zope',
-    author=AUTHOR,
-
-    py_modules=setup_info.get('py_modules', []),
-    scripts=setup_info.get('scripts', []),
+    data_files=installed_data_files,
+    scripts=["bin/runzope.py", "bin/mkzopeinstance"],
     distclass=ZopeDistribution,
     )