commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mr...@apache.org
Subject svn commit: r279907 - in /jakarta/commons/proper/validator/trunk: build.xml etc/jsdoc.sh project.properties xdocs/navigation.xml
Date Fri, 09 Sep 2005 23:08:38 GMT
Author: mrdon
Date: Fri Sep  9 16:08:35 2005
New Revision: 279907

URL: http://svn.apache.org/viewcvs?rev=279907&view=rev
Log:
 * Fixed jsdoc to run, assuming it is installed.  Still not integrated
   with maven so requires 'ant javadoc.js'
 * Changed compile to target 1.3   

Modified:
    jakarta/commons/proper/validator/trunk/build.xml
    jakarta/commons/proper/validator/trunk/etc/jsdoc.sh
    jakarta/commons/proper/validator/trunk/project.properties
    jakarta/commons/proper/validator/trunk/xdocs/navigation.xml

Modified: jakarta/commons/proper/validator/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/build.xml?rev=279907&r1=279906&r2=279907&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/build.xml (original)
+++ jakarta/commons/proper/validator/trunk/build.xml Fri Sep  9 16:08:35 2005
@@ -76,7 +76,7 @@
   <property name="conf.home"               value="conf/share"/>
 
   <!-- The base directory for distribution targets -->
-  <property name="dist.home"               value="dist"/>
+  <property name="dist.home"               value="m-target"/>
 
   <!-- The base directory for release targets -->
   <property name="release.home"            value="release" />
@@ -230,11 +230,23 @@
    description="Clean and compile all components"/>
 
 
-  <target name="javadoc" depends="compile"
-   description="Create component Javadoc documentation">
+  <target name="javadoc.init" 
+   description="Initializes Javadoc directories">
     <mkdir      dir="${dist.home}"/>
     <mkdir      dir="${dist.home}/docs"/>
     <mkdir      dir="${dist.home}/docs/api"/>
+    <mkdir      dir="${dist.home}/docs/javascript"/>
+  </target>  
+
+  <target name="javadoc.js" depends="javadoc.init"
+   description="Create Javascript Javadoc documentation">
+    <exec  executable="bash" failifexecutionfails="false">
+         <arg line="-c 'etc/jsdoc.sh ${jsdoc.home} ${javascript.home} ${dist.home}/docs/javascript'
"/>
+    </exec>
+  </target>
+
+  <target name="javadoc" depends="compile, javadoc.js"
+   description="Create component Javadoc documentation">
     <javadoc sourcepath="${source.home}"
                 destdir="${dist.home}/docs/api"
            packagenames="org.apache.commons.*"
@@ -245,11 +257,10 @@
             windowtitle="${component.title} (Version ${component.version})"
                  bottom="Copyright (c) 2001-2004  Apache Software Foundation"
            classpathref="compile.classpath" />
-    <exec  executable="bash" failifexecutionfails="false">
-         <arg line="-c 'etc/jsdoc.sh ${jsdoc.home} ${javascript.home} ${dist.home}/docs/api
' "/>
-    </exec>
   </target>
-  
+
+
+
   <target name="change-log" >
    	<cvschangelog destfile="changelog.xml" start="${cvs.start}" />
      <style in="changelog.xml" out="changelog.html" style="${ant.home}/etc/changelog.xsl">

Modified: jakarta/commons/proper/validator/trunk/etc/jsdoc.sh
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/etc/jsdoc.sh?rev=279907&r1=279906&r2=279907&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/etc/jsdoc.sh (original)
+++ jakarta/commons/proper/validator/trunk/etc/jsdoc.sh Fri Sep  9 16:08:35 2005
@@ -27,7 +27,7 @@
 dirtoprocess=$2
 outputto=$3
 package=/org/apache/commons/validator/javascript
-perl ${cmdpath}/jsdoc.pl --project-summary ${dirtoprocess}${package}/package.html --project-name
"Package org.apache.commons.validator.javascript" --page-footer "Copyright © 2000-2003 -
Apache Software Foundation
+perl $1/jsdoc.pl --project-summary ${dirtoprocess}${package}/package.html --project-name
"Package org.apache.commons.validator.javascript" --page-footer "Copyright © 2000-2003 -
Apache Software Foundation
 " -d ${outputto}/${package} -r $dirtoprocess
-mkdir $outputto/${package}/doc-files
+mkdir -p $outputto/${package}/doc-files
 cp ${dirtoprocess}/${package}/doc-files/*.* $outputto/${package}/doc-files

Modified: jakarta/commons/proper/validator/trunk/project.properties
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/project.properties?rev=279907&r1=279906&r2=279907&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/project.properties (original)
+++ jakarta/commons/proper/validator/trunk/project.properties Fri Sep  9 16:08:35 2005
@@ -25,6 +25,8 @@
 
 # Keep ant and maven directories seperate.
 maven.build.dir=m-target
+maven.compile.source=1.3
+maven.compile.target=1.3
 
 # commons site L&F
 maven.xdoc.jsl=../commons-build/commons-site.jsl

Modified: jakarta/commons/proper/validator/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/xdocs/navigation.xml?rev=279907&r1=279906&r2=279907&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/xdocs/navigation.xml (original)
+++ jakarta/commons/proper/validator/trunk/xdocs/navigation.xml Fri Sep  9 16:08:35 2005
@@ -27,7 +27,7 @@
       <item name="Downloads"               href="/downloads.html"/>
       <item name="To Do List"              href="/tasks.html"/>
       <item name="Javadoc" href="apidocs/index.html"/>
-      <item name="Javascript Javadoc"      href="/javascript/org/apache/commons/validator/javascript/allclasses-summary.html"/>
+      <item name="Javascript Javadoc"      href="/javascript/org/apache/commons/validator/javascript/index.html"/>
     </menu>
     
     &common-menus;



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message