[Commits] r511 - website

[commits at geoext.org]

Author: whit
Date: 2009-04-29 14:13:41 +0200 (Wed, 29 Apr 2009)
New Revision: 511

Modified:
   website/pavement.py
Log:
point docparser import at new location in new jstools pre-release


Modified: website/pavement.py
===================================================================
--- website/pavement.py	2009-04-29 09:52:31 UTC (rev 510)
+++ website/pavement.py	2009-04-29 12:13:41 UTC (rev 511)
@@ -5,16 +5,15 @@
 except :
     # minilib does not support bootstrap
     pass
+#from paver.path25 import pushd
 from ConfigParser import ConfigParser
+from paver import svn
+from paver.doctools import html
+from paver.easy import path, sh, info
+from paver.easy import task, options, Bunch
 from paver.setuputils import setup
 from paver.tasks import help, needs
-from paver.doctools import html
 from setuptools import find_packages
-from paver.easy import task, options, Bunch
-from paver.easy import path, sh, info
-#from paver.path25 import pushd
-from paver.easy import path
-from paver import svn
 import os
 
 
@@ -35,17 +34,16 @@
       packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
       include_package_data=True,
       zip_safe=False,
-      dependency_links=["http://cloud.github.com/downloads/whitmo/jstools/JSTools-0.1.1pre.tgz#egg=JSTools-0.1.1pre",
+      dependency_links=["http://cloud.github.com/downloads/whitmo/jstools/JSTools-0.1.2dev.tar.gz",
                         "http://svn.repoze.org/repoze.trac/trunk#egg=repoze.trac"],
       install_requires=["sphinx",
                         "PasteDeploy",
                         "Paste",
                         "PasteScript",
-                        "jstools==0.1.1pre",
+                        "jstools==0.1.2dev",
                         "repoze.trac"
                         ],
       entry_points="""
-      # -*- Entry points: -*-
       """,
       )
 
@@ -98,22 +96,24 @@
 def checkup_trunk():
     svn.checkup("%s/trunk" %options.core_url , "src/trunk")
     
+
 @task
 def checkup_docs():
     # only checkup the whole trunk if we haven't already
-    try:
-        d = svn.info("src/trunk")
-    except:
-        checkup_trunk()
     svn.checkup("%s/trunk/geoext" %options.core_url, "src/trunk/geoext")
     svn.checkup("%s/trunk/docsrc" %options.core_url, "src/trunk/docsrc")
 
+
 @task
 def parse_docs():
-    from jst import DocParser
+    from jstools.jst import DocParser
+    if not path('src/trunk').exists(): # add flag?
+        svn.checkup("%s/trunk/geoext" %options.core_url, "src/trunk/geoext")
+        svn.checkup("%s/trunk/docsrc" %options.core_url, "src/trunk/docsrc")
     parser = DocParser.from_fn("jst.cfg")
     parser.run()
 
+
 @task
 @needs(['parse_docs',
         'paver.doctools.html'])