From db58ffbaaa58e82fbd7fd2d6d1a3f816fc93ed7f Mon Sep 17 00:00:00 2001
From: xi <xi@18f92427-320e-0410-9341-c67f048884a3>
Date: Sat, 19 Aug 2006 19:37:57 +0000
Subject: [PATCH] Preparing the next release.

git-svn-id: http://svn.pyyaml.org/pyyaml/trunk@227 18f92427-320e-0410-9341-c67f048884a3
---
 MANIFEST.in           |  3 ++-
 setup.py              | 37 +++++++++++++++++++------------------
 setup_ext.py          | 13 -------------
 setup_with_libyaml.py | 31 +++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 32 deletions(-)
 delete mode 100644 setup_ext.py
 create mode 100644 setup_with_libyaml.py

diff --git a/MANIFEST.in b/MANIFEST.in
index 4650914..b3af719 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
-include README LICENSE
+include README LICENSE setup.py setup_with_libyaml.py
+include ext/_yaml.pyx ext/_yaml.pxd ext/_yaml.h ext/_yaml.c
 recursive-include examples *.py *.cfg
diff --git a/setup.py b/setup.py
index cf3c4b0..54c4711 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 
 NAME = 'PyYAML'
-VERSION = '3.03'
+VERSION = '3.04'
 DESCRIPTION = "YAML parser and emitter for Python"
 LONG_DESCRIPTION = """\
 YAML is a data serialization format designed for human readability and
@@ -30,23 +30,24 @@ CLASSIFIERS = [
     "Topic :: Text Processing :: Markup",
 ]
 
-
 from distutils.core import setup
 
-setup(
-    name=NAME,
-    version=VERSION,
-    description=DESCRIPTION,
-    long_description=LONG_DESCRIPTION,
-    author=AUTHOR,
-    author_email=AUTHOR_EMAIL,
-    license=LICENSE,
-    platforms=PLATFORMS,
-    url=URL,
-    download_url=DOWNLOAD_URL,
-    classifiers=CLASSIFIERS,
-
-    package_dir={'': 'lib'},
-    packages=['yaml'],
-)
+if __name__ == '__main__':
+
+    setup(
+        name=NAME,
+        version=VERSION,
+        description=DESCRIPTION,
+        long_description=LONG_DESCRIPTION,
+        author=AUTHOR,
+        author_email=AUTHOR_EMAIL,
+        license=LICENSE,
+        platforms=PLATFORMS,
+        url=URL,
+        download_url=DOWNLOAD_URL,
+        classifiers=CLASSIFIERS,
+
+        package_dir={'': 'lib'},
+        packages=['yaml'],
+    )
 
diff --git a/setup_ext.py b/setup_ext.py
deleted file mode 100644
index 76a4fbb..0000000
--- a/setup_ext.py
+++ /dev/null
@@ -1,13 +0,0 @@
-
-from distutils.core import setup
-from distutils.extension import Extension
-from Pyrex.Distutils import build_ext
-
-setup(
-    name = '_yaml',
-    ext_modules=[
-        Extension("_yaml", ["ext/_yaml.pyx"], libraries=['yaml']),
-    ],
-    cmdclass = {'build_ext': build_ext}
-)
-
diff --git a/setup_with_libyaml.py b/setup_with_libyaml.py
new file mode 100644
index 0000000..a084ca7
--- /dev/null
+++ b/setup_with_libyaml.py
@@ -0,0 +1,31 @@
+
+from setup import *
+
+from distutils.core import setup
+from distutils.extension import Extension
+from Pyrex.Distutils import build_ext
+
+if __name__ == '__main__':
+
+    setup(
+        name=NAME,
+        version=VERSION,
+        description=DESCRIPTION,
+        long_description=LONG_DESCRIPTION,
+        author=AUTHOR,
+        author_email=AUTHOR_EMAIL,
+        license=LICENSE,
+        platforms=PLATFORMS,
+        url=URL,
+        download_url=DOWNLOAD_URL,
+        classifiers=CLASSIFIERS,
+
+        package_dir={'': 'lib'},
+        packages=['yaml'],
+        ext_modules=[
+            Extension("_yaml", ["ext/_yaml.pyx"], libraries=['yaml']),
+        ],
+
+        cmdclass = {'build_ext': build_ext}
+    )
+
-- 
2.11.4.GIT