svn commit: r14426 - trunk/documentation

Author: penyaskito
Date: 2008-04-20 15:01:54-0700
New Revision: 14426

Modified:
   trunk/documentation/build.bat
   trunk/documentation/build.sh
   trunk/documentation/build.xml
   trunk/documentation/default.properties
   trunk/documentation/eclipse-ant-documentation.properties   (props changed)

Log:
Fixed documentation build after last restructuring.

Modified: trunk/documentation/build.bat
Url: http://argouml.tigris.org/source/browse/argouml/trunk/documentation/build.bat?view=diff&rev=14426&p1=trunk/documentation/build.bat&p2=trunk/documentation/build.bat&r1=14425&r2=14426
==============================================================================
--- trunk/documentation/build.bat	(original)
+++ trunk/documentation/build.bat	2008-04-20 15:01:54-0700
@@ -5,7 +5,7 @@
 rem
 
 setlocal
-set ANT_HOME=..\tools\apache-ant-1.7.0
+set ANT_HOME=..\argouml-core-tools\apache-ant-1.7.0
 
 :: Convert relative path to absolute
 pushd %ANT_HOME%

Modified: trunk/documentation/build.sh
Url: http://argouml.tigris.org/source/browse/argouml/trunk/documentation/build.sh?view=diff&rev=14426&p1=trunk/documentation/build.sh&p2=trunk/documentation/build.sh&r1=14425&r2=14426
==============================================================================
--- trunk/documentation/build.sh	(original)
+++ trunk/documentation/build.sh	2008-04-20 15:01:54-0700
@@ -6,7 +6,7 @@
 #
  
 # Always use the ant that comes with ArgoUML
-ANT_HOME=../tools/apache-ant-1.7.0
+ANT_HOME=../argouml-core-tools/apache-ant-1.7.0
 
 echo ANT_HOME is: $ANT_HOME
 echo

Modified: trunk/documentation/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/documentation/build.xml?view=diff&rev=14426&p1=trunk/documentation/build.xml&p2=trunk/documentation/build.xml&r1=14425&r2=14426
==============================================================================
--- trunk/documentation/build.xml	(original)
+++ trunk/documentation/build.xml	2008-04-20 15:01:54-0700
@@ -40,9 +40,9 @@
   <property file="build.properties"/>
   <property file="${user.home}/argouml.build.properties"/>
   <property file="${override.build.properties}"/>
-
+	<property name="argo.build.dir" value="${basedir}/build"/>
   <!-- Fallback definition for argo.src.dir - won't override current value -->
-  <property name="argo.src.dir" value="${argo.root.dir}/src/app/src"/>
+  <property name="argo.src.dir" value="${argo.root.dir}/src/argouml-app/src"/>
 
   <!-- We get the argouml version from the version in the app directory. -->
   <property file="${argo.src.dir}/default.properties"/>

Modified: trunk/documentation/default.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/documentation/default.properties?view=diff&rev=14426&p1=trunk/documentation/default.properties&p2=trunk/documentation/default.properties&r1=14425&r2=14426
==============================================================================
--- trunk/documentation/default.properties	(original)
+++ trunk/documentation/default.properties	2008-04-20 15:01:54-0700
@@ -13,6 +13,10 @@
 #
 # Tools directory locations
 #
+argo.build.dir=./build-dir
+argo.tools.lib=../argouml-core-tools/lib
+argo.tools.dir=../argouml-core-tools
+
 fop.version=fop-0.20.5
 fop.build.dir=${argo.tools.dir}/${fop.version}/build
 fop.lib.dir=${argo.tools.dir}/${fop.version}/lib