Yet more corrections required for the 0.1.1 release, including some

typos in the doc-building ANT script and the main setup script. Also
added an ANT script which automates much of the release process.

diff --git a/build.xml b/build.xml
index 96b4e6e2b41b178a02ca265242f68da7765fe74a..07d3bd24174f0d99eb534ba60c004d8827694631 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -15,12 +15,13 @@
                </delete>
        </target>
 
-       <target name="compile" depends="sdist,bdist_egg_26,bdist_egg_27,bdist_wininst_27" />
+       <target name="compile" depends="sdist,bdist_egg_26,bdist_egg_27" />
 
        <target name="sdist">
                <exec executable="python">
                        <arg value="setup.py" />
                        <arg value="sdist" />
+                       <arg value="upload" />
                </exec>
        </target>
        
@@ -36,6 +37,7 @@
                                <exec executable="python2.7">
                                        <arg value="setup.py" />
                                        <arg value="bdist_egg" />
+                                       <arg value="upload" />
                        </exec>
        </target>
        
@@ -43,7 +45,9 @@
                                        <exec executable="python2.6">
                                                <arg value="setup.py" />
                                                <arg value="bdist_wininst" />
+                                               <arg value="upload" />
                                </exec>
-               </target>
+       </target>
+       
 
 </project>
\ No newline at end of file

diff --git a/doc/build.xml b/doc/build.xml
index 704e17d59364b58d5f7121728269e6a5614441fe..d9a9c73f407853000d119d8a43078f22128bce6f 100644 (file)
--- a/doc/build.xml
+++ b/doc/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<project name="calyon_egg" default="all">\r
+<project name="jenkinsapi.doc" default="all">\r
        <property file="build.properties"/>     \r
        \r
        <target name="all" depends="clean, doc_zip" />\r

diff --git a/setup.py b/setup.py
index c28e36ff59f277ad9ffc2a2c6dc9ced731b7b036..e8d58488ff198309dd2fb724f129b8dc3f7e9de3 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,11 @@ setup(name=PROJECT_NAME.lower(),
       version=VERSION,
       author=PROJECT_AUTHORS,
       author_email=PROJECT_EMAILS,
-      packages=["jenkinsapi",'jenkinsapi.utils'], # Disabled use fo find-packages to exclude examples & tests
+      packages=["jenkinsapi",'jenkinsapi.utils'], 
       zip_safe=True,
       include_package_data = False,
       entry_points = GLOBAL_ENTRY_POINTS,
       url=PROJECT_URL,
       description=SHORT_DESCRIPTION,
-      long_description=DESCRIPTION,
+      long_description=DESCRIPTION
       )

diff --git a/setup_config.py b/setup_config.py
index fc1daa4aebdc0024b2838f6334d8be7f8c8452c7..deaba788147d1c900c8059e40398d18074ca1156 100644 (file)
--- a/setup_config.py
+++ b/setup_config.py
@@ -9,10 +9,13 @@ DESCRIPTION = open( os.path.join(PROJECT_ROOT, "README") ).read()
 VERSION = REVISION = '0.1.1'\r
 PROJECT_NAME = 'JenkinsAPI'\r
 PROJECT_AUTHORS = "Salim Fadhley, Ramon van Alteren, Ruslan Lutsenko"\r
-PROJECT_EMAILS = 'salimfadhley@gmail.com, ramon@vanalteren.nl, ruslan.lutcenko@gmail.com',\r
+PROJECT_EMAILS = 'salimfadhley@gmail.com, ramon@vanalteren.nl, ruslan.lutcenko@gmail.com'\r
 PROJECT_URL = "https://github.com/salimfadhley/jenkinsapi"\r
 SHORT_DESCRIPTION = 'A Python API for accessing resources on a Jenkins continuous-integration server.'\r
 \r
 GLOBAL_ENTRY_POINTS = {\r
         "console_scripts":[ "jenkins_invoke=jenkinsapi.command_line.jenkins_invoke:main"]\r
-        }
\ No newline at end of file
+        }\r
+\r
+if __name__ == "__main__":\r
+    print(DESCRIPTION)
\ No newline at end of file