svn commit: r14174 - trunk/src

Author: linus
Date: 2008-03-02 09:22:56-0800
New Revision: 14174

Modified:
   trunk/src/build.xml
   trunk/src/default.properties

Log:
Moved back the javadoc directories to work better with the nightly build.

Modified: trunk/src/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/build.xml?view=diff&rev=14174&p1=trunk/src/build.xml&p2=trunk/src/build.xml&r1=14173&r2=14174
==============================================================================
--- trunk/src/build.xml	(original)
+++ trunk/src/build.xml	2008-03-02 09:22:56-0800
@@ -362,7 +362,6 @@
   </target>
 
   <target name="javadocs" depends="init-javadoc, init, package">
-    <property name="argo.javadocs.dir" value="${argo.build.dir}/javadocs/"/>
     <mkdir dir="${argo.javadocs.dir}"/>
 
     <javadoc author="${javadoc.author}"
@@ -414,7 +413,6 @@
 
 
   <target name="javadocs-api" depends="init-javadoc, init, package">
-    <property name="argo.api.dir" value="${argo.build.dir}/api/"/>
     <mkdir dir="${argo.api.dir}"/>
 
     <!-- The package name list shall be the list of all the main packages for

Modified: trunk/src/default.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/default.properties?view=diff&rev=14174&p1=trunk/src/default.properties&p2=trunk/src/default.properties&r1=14173&r2=14174
==============================================================================
--- trunk/src/default.properties	(original)
+++ trunk/src/default.properties	2008-03-02 09:22:56-0800
@@ -61,6 +61,14 @@
 #
 argo.docbook.dir=${argo.root.dir}/documentation/docbook-setup
 
+
+#
+# javadocs directories
+# They are in this property files to be found also from the argouml-gen
+# build file.
+argo.javadocs.dir=${argo.build.dir}/javadocs/
+argo.api.dir=${argo.build.dir}/api/
+
 #
 # javadoc link properties
 # The defaults point to known on-line locations