Author: niallp
Date: Mon Oct 31 15:50:03 2005
New Revision: 329936

URL: http://svn.apache.org/viewcvs?rev=329936&view=rev
Log:
Correct output directory for javascript "javadoc" built using windows

Modified:
    jakarta/commons/proper/validator/trunk/build.xml
    jakarta/commons/proper/validator/trunk/etc/jsdoc.bat
    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=329936&r1=329935&r2=329936&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/build.xml (original)
+++ jakarta/commons/proper/validator/trunk/build.xml Mon Oct 31 15:50:03 2005
@@ -236,13 +236,13 @@
     <mkdir      dir="${dist.home}/docs"/>
     <mkdir      dir="${dist.home}/docs/api"/>
     <mkdir      dir="${dist.home}/docs/javascript"/>
+    <mkdir      
dir="${dist.home}/docs/javascript/org/apache/commons/validator/javascript/doc-files"/>
   </target>  
 
   <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">
+    <copy 
todir="${dist.home}/docs/javascript/org/apache/commons/validator/javascript/doc-files">
       <fileset 
dir="${javascript.home}/org/apache/commons/validator/javascript/doc-files" 
includes="*.gif"/>
     </copy>
 

Modified: jakarta/commons/proper/validator/trunk/etc/jsdoc.bat
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/etc/jsdoc.bat?rev=329936&r1=329935&r2=329936&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/etc/jsdoc.bat (original)
+++ jakarta/commons/proper/validator/trunk/etc/jsdoc.bat Mon Oct 31 15:50:03 
2005
@@ -2,7 +2,7 @@
 
 rem * $Id$
 rem * ====================================================================
-rem * Copyright  2004 The Apache Software Foundation
+rem * Copyright  2005 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.
@@ -34,6 +34,6 @@
 set _PACKAGE=/org/apache/commons/validator/javascript
 set _JSDOC_HOME=%1
 set _JAVASCRIPT_DIR=%2%_PACKAGE%
-set _OUTPUT_DIR=%3
+set _OUTPUT_DIR=%3%_PACKAGE%
 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% 

Modified: jakarta/commons/proper/validator/trunk/maven.xml
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/maven.xml?rev=329936&r1=329935&r2=329936&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/maven.xml (original)
+++ jakarta/commons/proper/validator/trunk/maven.xml Mon Oct 31 15:50:03 2005
@@ -1,5 +1,5 @@
 <!--
-   Copyright 2003-2004 The Apache Software Foundation
+   Copyright 2003-2005 The Apache Software Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -106,12 +106,11 @@
   </postGoal>
 
   <postGoal name="maven-javadoc-plugin:report"> 
-    <mkdir 
dir="${maven.build.dir}/docs/javascript/org/apache/commons/validator" /> 
+    <mkdir 
dir="${maven.build.dir}/docs/javascript/org/apache/commons/validator/javascript/doc-files"
 /> 
     <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">
+    <copy 
todir="${maven.build.dir}/docs/javascript/org/apache/commons/validator/javascript/doc-files">
       <fileset 
dir="${javascript.home}/org/apache/commons/validator/javascript/doc-files" 
includes="*.gif"/>
     </copy>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to