Changeset 6974

Timestamp:

01/02/07 22:18:37 (23 months ago)

Author:

jburke

Message:

Removing docs and website tasks since they are no longer useful. No more -Ddocless=true now for builds.

Location:

trunk/buildscripts

Files:

• build.xml (modified) (4 diffs)
• buildUtil.py (modified) (1 diff)

trunk/buildscripts/build.xml

@@ -225 +225 @@
         <!-- end -fix-config task -->
 
-        <!-- website task -->
-        <!--
-                FIXME:  need to build docs here and copy the HTML files generated from
-                                reST to website/docs/
-        -->
-        <target name="website"
-                depends="-fix-config"
-                description="'builds' the website and moves files into the correct directory, taking care to ensure that file permissions are correct">
-
-                <copy todir="${release_website_dir}" overwrite="true">
-                        <fileset dir="${website_dir}">
-                                <exclude name="**/.svn*" />
-                                <include name="**/*" />
-                        </fileset>
-                </copy>
-                <antcall target="docs" />
-                <copy todir="${release_website_dir}/docs/" overwrite="true">
-                        <fileset dir="${release_docs_dir}">
-                                <exclude name="**/.svn*" />
-                                <include name="*.html" />
-                        </fileset>
-                </copy>
-                <chgrp group="www" type="both">
-                        <fileset dir="${release_website_dir}" followsymlinks="false" includes="**/**" />
-                </chgrp>
-                <chmod perm="g+rwx" type="dir">
-                        <fileset dir="${release_website_dir}" followsymlinks="false" includes="**/**" />
-                </chmod>
-                <chmod perm="g+rw" type="file">
-                        <fileset dir="${release_website_dir}" followsymlinks="false" includes="**/**" />
-                </chmod>
-        </target>
-        <!-- end website task -->
-
-        <!-- FIXME: need to fix this task!! -->
-        <!-- docs task -->
-        <target name="docs"
-                unless="docless"
-                depends="-fix-config"
-                description="'builds' the docs">
-                <!-- first, clobber the docs directory and rebuild it -->
-                <!--
-                        FIXME: how best can we check for staleness here? Shouldn't Ant be
-                        doing this for us? Clobbering entire dirs seems a little
-                        heavyweight.
-                -->
-                <delete dir="${release_docs_dir}"/>
-                <mkdir dir="${release_docs_dir}" />
-                <mkdir dir="${release_docs_dir}/requirements" />
-                <script language="jython" taskName="docs">
-                        <![CDATA[
-import sys
-# make the python standard library avialable
-sys.path.append(project.resolveFile("lib/pyLib.zip").getPath())
-sys.path.append(project.resolveFile(".").getPath())
-
-# import re
-import os
-from buildUtil import *
-
-buildRestFiles( dojo.getProperty("articles_dir"),
-                                dojo.getProperty("release_docs_dir"),
-                                dojo.getProperty("rest_style_sheet"),
-                                dojo.getProperty("rest_files"))
-]]>
-                </script>
-
-                <!-- fix body tags -->
-                <replaceregexp match="^&lt;body&gt;$" byline="true"
-                        replace="&lt;body class=&quot;docs&quot;&gt;" flags="g">
-                        <fileset dir="${release_docs_dir}">
-                                <exclude name="**/.svn*" />
-                                <include name="**/*.html" />
-                        </fileset>
-                </replaceregexp>
-
-        </target>
-        <!-- end docs task -->
-
         <!-- api task -->
         <target name="api"
@@ -914 +835 @@
                 <antcall target="buildFileStorageProvider" />
 
-                <antcall target="-docs-and-tests" />
                 <antcall target="compress" />
                 <!-- <antcall target="intern-strings" /> -->
@@ -931 +851 @@
         <!-- end release task -->
 
-        <target name="-docs-and-tests"
-                unless="docless"
-                description="builds docs, copies in tests, and constructs API outlines">
+        <target name="api-prep"
+                description="Constructs API outlines">
                 <copy todir="${release_dir}/apis" includeEmptyDirs="false" preservelastmodified="true">
                         <fileset dir="${root}/documents/apis">
@@ -941 +860 @@
                         </fileset>
                 </copy>
-
-                <antcall target="docs" />
         </target>
 

trunk/buildscripts/buildUtil.py

@@ -53 +53 @@
         pfd.write(newContents)
         pfd.close() # flush is implicit
-
-def buildRestFiles(docDir, docOutDir, styleSheetFile, restFiles=""):
-        docFiles = []
-
-        # start in docDir and add all the reST files in the directory to the
-        # list
-        docDir = os.path.normpath(os.path.abspath(docDir))
-        styleSheetFile = os.path.normpath(os.path.abspath(styleSheetFile))
-        docOutDir = os.path.normpath(os.path.abspath(docOutDir))
-
-        if not len(restFiles):
-                docFiles = glob.glob1(docDir, "*.rest")
-        else:
-                docFiles = map(lambda x: x.strip(), restFiles.split(","))
-
-        for name in docFiles:
-                x = docDir+os.sep+name
-                if x.find(os.sep+".svn") == -1:
-                        # print x
-                        cmdStr = "rst2html.py --no-doc-info --no-doc-title --embed-stylesheet --stylesheet-path=%s %s %s" % \
-                                (styleSheetFile, x, docOutDir+os.sep+(name[0:-5])+".html")
-
-                        # I'd much rather be using popen3, but it doesn't appear to be
-                        # available from either the os.* or popen2.* modules in a useable
-                        # way. The source of popen2.py leads me to believe that this is an
-                        # underlying Java issue.
-                        os.system("echo `which rst2html.py`")
-                        os.system(cmdStr)
-                        # java.lang.Runtime.exec(??)
-
-        if not len(restFiles):
-                for name in os.listdir(docDir):
-                        tn = os.path.normpath(docDir+os.sep+name)
-                        if os.path.isdir(tn) and not name == ".svn":
-                                buildRestFiles(tn, docOutDir+os.sep+name, styleSheetFile)
 
 def norm(path):