[Commits] r2439 - website

[commits at geoext.org]

Author: ahocevar
Date: 2010-10-09 18:58:49 +0200 (Sat, 09 Oct 2010)
New Revision: 2439

Modified:
   website/jst.cfg
   website/pavement.py
   website/website-conf.cfg
Log:
now we can build docs for specific releases that we define in website-conf.cfg, and have paver build a release including docs.


Modified: website/jst.cfg
===================================================================
--- website/jst.cfg	2010-10-09 16:36:47 UTC (rev 2438)
+++ website/jst.cfg	2010-10-09 16:58:49 UTC (rev 2439)
@@ -1,9 +1,9 @@
 [GeoExt]
-root = src/trunk/geoext/lib
-template = src/trunk/docsrc/lib/template.jst
-output = src/trunk/docsrc/lib
+root = src/geoext/lib
+template = src/docsrc/lib/template.jst
+output = src/docsrc/lib
 
 [examples]
-root = src/trunk/geoext/examples/tmp
-template = src/trunk/docsrc/examples.jst
-output = src/trunk/docsrc/
+root = src/geoext/examples/tmp
+template = src/docsrc/examples.jst
+output = src/docsrc/

Modified: website/pavement.py
===================================================================
--- website/pavement.py	2010-10-09 16:36:47 UTC (rev 2438)
+++ website/pavement.py	2010-10-09 16:58:49 UTC (rev 2439)
@@ -45,7 +45,7 @@
                         "repoze.trac"
                         ],
       entry_points="""
-      """,
+      """
       )
 
 
@@ -55,7 +55,7 @@
                      packages_to_install=['pastescript'],
                      paver_command_line="after_bootstrap"
                      ),
-    sphinx=Bunch(docroot="src/trunk/docsrc",
+    sphinx=Bunch(docroot="src/docsrc",
                  builddir=path(curdir) / "built")
     )
 
@@ -87,11 +87,6 @@
 
 
 @task
-def checkup_latest_release():
-    latest = options.config.get("releases", "latest")
-    svn.checkup("%s/tag/%s" %(options.core_url, latest) , "src/latest_release")
-
- at task
 def install_zine():
     env = os.environ.get("VIRTUAL_ENV")
     if env is None:
@@ -109,9 +104,14 @@
  
 
 @task
-def checkup_docs():
-    svn.checkup("%s/trunk/geoext" %options.core_url, "src/trunk/geoext")
-    svn.checkup("%s" %options.docsrc_url, "src/trunk/docsrc")
+def export_src(options):
+    path("src").rmtree()
+    if not "release" in options:
+        release = "dev"
+    else:
+        release = options.release
+    svn.export("%s/%s/geoext" %(options.core_url, options.config.get("releases", release)), "src/geoext")
+    svn.export("%s" %options.docsrc_url, "src/docsrc")
 
 def find_path(file_list, regex):
     paths = [p for p in file_list if regex.findall(p)]
@@ -137,9 +137,11 @@
     
 @task
 def parse_examples():
-    exdir = path("src/trunk/geoext/examples")
+    if not path("src/geoext").exists():
+        call_task("export_src")
+    exdir = path("src/geoext/examples")
     js = [p for p in exdir.listdir() if p.endswith(".js")]
-    odir = path("src/trunk/geoext/examples/tmp")
+    odir = path("src/geoext/examples/tmp")
     odir.mkdir()
     out = odir / "examples.js"
     h = out.open("w")
@@ -150,10 +152,6 @@
 @needs(['pavement.parse_examples'])
 def parse_docs():
     from jstools.jst import DocParser
-    if not path('src/trunk').exists(): # add flag?
-        svn.checkup("%s/trunk/geoext" %options.core_url, "src/trunk/geoext")
-        # @@ will have to change to handle "versions"
-        svn.checkup(options.docsrc_url, "src/trunk/docsrc")
     parser = DocParser.from_fn("jst.cfg")
     parser.run()
 
@@ -168,3 +166,21 @@
     builtdocs.move(destdir)
     options.builddir.rmtree()
 
+ at task
+ at needs(['export_src', 'pavement.build_docs'])
+def dist(options):
+    if not "release" in options:
+        release = "dev"
+    else:
+        release = options.release
+    version = options.config.get("releases", release).replace('tags/release-', '')
+    build_dir = path("src/geoext/build")
+    path.chdir(build_dir)
+    sh("make release VERSION=%s" %version)
+    path.chdir(path(curdir));
+    dist = build_dir.files("*.zip")
+    for f in dist:
+        f.copy(path(curdir))
+    path.chdir(build_dir)
+    sh("make clean VERSION=%s" %version)
+    

Modified: website/website-conf.cfg
===================================================================
--- website/website-conf.cfg	2010-10-09 16:36:47 UTC (rev 2438)
+++ website/website-conf.cfg	2010-10-09 16:58:49 UTC (rev 2439)
@@ -3,4 +3,5 @@
 docsrc=http://svn.geoext.org/core/trunk/docsrc
 
 [releases]
-latest=0.5
+dev=trunk
+latest=tags/release-1.0-rc1