You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ni...@apache.org on 2005/09/21 22:20:25 UTC
svn commit: r290820 - in /jakarta/commons/proper/validator/trunk: build.xml
etc/jsdoc.bat etc/jsdoc.sh maven.xml
Author: niallp
Date: Wed Sep 21 13:20:14 2005
New Revision: 290820
URL: http://svn.apache.org/viewcvs?rev=290820&view=rev
Log:
Add windows JSDoc executable to maven & ant build.
Added:
jakarta/commons/proper/validator/trunk/etc/jsdoc.bat (with props)
Modified:
jakarta/commons/proper/validator/trunk/build.xml
jakarta/commons/proper/validator/trunk/etc/jsdoc.sh
jakarta/commons/proper/validator/trunk/maven.xml
Modified: jakarta/commons/proper/validator/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/build.xml?rev=290820&r1=290819&r2=290820&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/build.xml (original)
+++ jakarta/commons/proper/validator/trunk/build.xml Wed Sep 21 13:20:14 2005
@@ -238,10 +238,27 @@
<mkdir dir="${dist.home}/docs/javascript"/>
</target>
- <target name="javadoc.js" depends="javadoc.init"
+ <target name="javadoc.js" depends="javadoc.js.unix,javadoc.js.windows"
+ description="Create Javascript Javadoc documentation">
+
+ <mkdir dir="${dist.home}/docs/javascript/doc-files"/>
+ <copy todir="${dist.home}/docs/javascript/doc-files">
+ <fileset dir="${javascript.home}/org/apache/commons/validator/javascript/doc-files" includes="*.gif"/>
+ </copy>
+
+ </target>
+
+ <target name="javadoc.js.unix" 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.js.windows" depends="javadoc.init"
+ description="Windows Create Javascript Javadoc documentation">
+ <exec executable="etc/jsdoc.bat" failifexecutionfails="false">
+ <arg line="${jsdoc.home} ${javascript.home} ${dist.home}/docs/javascript"/>
</exec>
</target>
Added: jakarta/commons/proper/validator/trunk/etc/jsdoc.bat
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/etc/jsdoc.bat?rev=290820&view=auto
==============================================================================
--- jakarta/commons/proper/validator/trunk/etc/jsdoc.bat (added)
+++ jakarta/commons/proper/validator/trunk/etc/jsdoc.bat Wed Sep 21 13:20:14 2005
@@ -0,0 +1,39 @@
+@echo off
+
+rem * $Id$
+rem * ====================================================================
+rem * Copyright 2004 The Apache Software Foundation
+rem *
+rem * Licensed under the Apache License, Version 2.0 (the "License");
+rem * you may not use this file except in compliance with the License.
+rem * You may obtain a copy of the License at
+rem *
+rem * http://www.apache.org/licenses/LICENSE-2.0
+rem *
+rem * Unless required by applicable law or agreed to in writing, software
+rem * distributed under the License is distributed on an "AS IS" BASIS,
+rem * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem * See the License for the specific language governing permissions and
+rem * limitations under the License.
+
+rem *--------------------------------------------------------------*
+rem * *
+rem * JSDoc is a perl script for generating javadoc for javascript.*
+rem * *
+rem * The latest version can be downloaded from : *
+rem * *
+rem * http://sourceforge.net/projects/jsdoc/ *
+rem * *
+rem * N.B. You also need something like ActivePerl installed to *
+rem * run this on windows. See the Installation instructions: *
+rem * *
+rem * http://jsdoc.sourceforge.net/#install *
+rem * *
+rem *--------------------------------------------------------------*
+
+set _PACKAGE=/org/apache/commons/validator/javascript
+set _JSDOC_HOME=%1
+set _JAVASCRIPT_DIR=%2%_PACKAGE%
+set _OUTPUT_DIR=%3
+set _COPYRIGHT="Copyright © 2000-2005 - Apache Software Foundation"
+perl %_JSDOC_HOME%/jsdoc.pl --project-summary %_JAVASCRIPT_DIR%/package.html --project-name "Package %_PACKAGE%" --page-footer %_COPYRIGHT% -d %_OUTPUT_DIR% %_JAVASCRIPT_DIR%
Propchange: jakarta/commons/proper/validator/trunk/etc/jsdoc.bat
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/commons/proper/validator/trunk/etc/jsdoc.bat
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: jakarta/commons/proper/validator/trunk/etc/jsdoc.sh
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/etc/jsdoc.sh?rev=290820&r1=290819&r2=290820&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/etc/jsdoc.sh (original)
+++ jakarta/commons/proper/validator/trunk/etc/jsdoc.sh Wed Sep 21 13:20:14 2005
@@ -27,7 +27,5 @@
dirtoprocess=$2
outputto=$3
package=/org/apache/commons/validator/javascript
-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
+perl $1/jsdoc.pl --project-summary ${dirtoprocess}${package}/package.html --project-name "Package org.apache.commons.validator.javascript" --page-footer "Copyright © 2000-2005 - Apache Software Foundation
" -d ${outputto}/${package} -r $dirtoprocess
-mkdir -p $outputto/${package}/doc-files
-cp ${dirtoprocess}/${package}/doc-files/*.* $outputto/${package}/doc-files
Modified: jakarta/commons/proper/validator/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/maven.xml?rev=290820&r1=290819&r2=290820&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/maven.xml (original)
+++ jakarta/commons/proper/validator/trunk/maven.xml Wed Sep 21 13:20:14 2005
@@ -85,6 +85,14 @@
<fileset dir="./xdocs"/>
</copy>
+ <!-- Copy etc files -->
+ <copy todir="${maven.dist.src.assembly.dir}/etc">
+ <fileset dir="./etc">
+ <include name="*.bat"/>
+ <include name="*.sh"/>
+ </fileset>
+ </copy>
+
<!-- Copy configuration files -->
<copy todir="${maven.dist.src.assembly.dir}/conf/share">
<fileset dir="./conf/share">
@@ -99,10 +107,29 @@
<postGoal name="maven-javadoc-plugin:report">
<mkdir dir="${maven.build.dir}/docs/javascript/org/apache/commons/validator" />
+ <attainGoal name="javadoc.js.unix"/>
+ <attainGoal name="javadoc.js.windows"/>
+
+ <mkdir dir="${maven.build.dir}/docs/javascript/doc-files" />
+ <copy todir="${maven.build.dir}/docs/javascript/doc-files">
+ <fileset dir="${javascript.home}/org/apache/commons/validator/javascript/doc-files" includes="*.gif"/>
+ </copy>
+
+ </postGoal>
+
+ <goal name="javadoc.js.unix">
<exec executable="bash" failifexecutionfails="false">
<arg line="-c 'etc/jsdoc.sh ${jsdoc.home} ${javascript.home} ${maven.build.dir}/docs/javascript' "/>
</exec>
- </postGoal>
+ </goal>
+
+ <goal name="javadoc.js.windows">
+ <exec executable="etc/jsdoc.bat" failifexecutionfails="false">
+ <arg line="${jsdoc.home} ${javascript.home} ${maven.build.dir}/docs/javascript"/>
+ </exec>
+ </goal>
+
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org