Permalink
Browse files

Fixed so it works for contrib, but core is now giving weird errors

  • Loading branch information...
1 parent b4054f4 commit f6799ad7a9074c4f1fb70832d528ae2e5242b977 @tomfaulhaber committed Dec 1, 2009
@@ -8,7 +8,9 @@
{'work-root-dir '*file-prefix*,
'src-dir '*src-dir*,
'output-dir '*output-directory*,
- 'built-clojure-jar '*built-clojure-jar*})
+ 'built-clojure-jar '*built-clojure-jar*
+ 'clojure-contrib-jar '*clojure-contrib-jar*,
+ 'clojure-contrib-classes '*clojure-contrib-classes*})
(defn ant-wrapper
[param-dir build-target force]
@@ -91,7 +91,7 @@ partial html data leaving a vector of nodes which we then wrap in a <div> tag"
[ns-info]
(for [ns ns-info] [(:short-name ns) (:short-name ns)]))
-(defn var-tag-name [ns v] (str (:short-name ns) "/" (:name v)))
+(defn var-tag-name [ns v] (str (:full-name ns) "/" (:name v)))
(defn var-toc-entries
"Build the var-name, <a> tag pairs for the vars in ns"
@@ -17,6 +17,9 @@
(def *external-doc-tmpdir* nil)
(def *jar-file* nil)
+(def *clojure-contrib-jar* nil)
+(def *clojure-contrib-classes* nil)
+
(def *built-clojure-jar* nil)
(def *namespaces-to-document* nil)
View
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+ant -Dparam-dir=params/clojure-contrib -Dforce=true
@@ -0,0 +1,27 @@
+<project name="clojure-contrib" default="all">
+
+ <description>
+ The subsidiary autodoc build file for building the clojure contrib library
+ </description>
+
+ <target name="all">
+ <ant dir="${src-dir}" inheritAll="false">
+ <property name="clojure.jar" value="${clojure-jar}"/>
+ <target name="clean"/>
+ <target name="jar"/>
+ </ant>
+ <delete dir="${src-dir}/classes"/>
+ <ant dir="${src-dir}" inheritAll="false">
+ <property name="clojure.jar" value="${clojure-jar}"/>
+ <target name="compile_classes"/>
+ </ant>
+ <!-- the following deletes are to hack around clojure issue 130 -->
+ <delete>
+ <fileset dir="${src-dir}/classes" includes="**/jmx*.class"/>
+ </delete>
+ <delete dir="${src-dir}/classes/clojure/contrib/jmx"/>
+ </target>
+
+</project>
+
+
@@ -1,3 +1,19 @@
+(import (java.io File))
+
+(def *file-prefix* (.getAbsolutePath (File. "../autodoc-work-area/clojure-contrib")))
+(def *src-dir* (str *file-prefix* "/src/"))
+(def *src-root* "src")
+(def *web-src-dir* "http://github.com/richhickey/clojure-contrib/blob/")
+
+(def *web-home* "http://richhickey.github.com/clojure-contrib/")
+(def *output-directory* (str *file-prefix* "/autodoc/"))
+(def *external-doc-tmpdir* "/tmp/autodoc/doc")
+(def *jar-file* (str *src-dir* "clojure-contrib-slim.jar"))
+
+(def *clojure-contrib-jar* (str *src-dir* "clojure-contrib-slim.jar"))
+(def *clojure-contrib-classes* (str *src-dir* "classes/"))
+
+(def *namespaces-to-document* ["clojure.contrib"])
(def *load-except-list*
[
@@ -9,3 +25,8 @@
#"/javadoc"
#"/jmx/Bean"
])
+
+(def *page-title* "Clojure-contrib")
+(def *copyright* "Copyright 2007-2009 by Rich Hickey and the various contributors")
+
+

0 comments on commit f6799ad

Please sign in to comment.