svn commit: r15165 - trunk/documentation: . cookbook

Author: linus
Date: 2008-07-04 14:00:13-0700
New Revision: 15165

Removed:
   trunk/documentation/default.properties
Modified:
   trunk/documentation/build.xml
   trunk/documentation/cookbook/building.xml

Log:
Simplified the handling of property files for building documentation.

Now the ../src/argouml-app/src/default.properties file is no longer used.

Modified: trunk/documentation/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/documentation/build.xml?view=diff&rev=15165&p1=trunk/documentation/build.xml&p2=trunk/documentation/build.xml&r1=15164&r2=15165
==============================================================================
--- trunk/documentation/build.xml	(original)
+++ trunk/documentation/build.xml	2008-07-04 14:00:13-0700
@@ -32,22 +32,40 @@
 
 <project name="ArgoDocs" default="defaulthtml" basedir=".">
 
+  <property name="argo.core.version" value="PRE-0.26.beta1"/>
+
   <!-- we really need an absolute path for argo.root.dir -->
   <property name="argo.root.dir" value="${basedir}/.."/>
   
-  <!-- Property files read highest priority first -->
-  <!-- (properties are immutable once set) -->
-  <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/argouml-app/src"/>
+  <property name="argo.build.dir" value="${basedir}/build"/>
+  <property name="argo.docs.output.dir" value="${argo.build.dir}/documentation"/>
+
+  <property name="argo.tools.dir" value="${argo.root.dir}/tools"/>
+  <property name="argo.tools.lib" value="${argo.tools.dir}/lib"/>
 
-  <!-- We get the argouml version from the version in the app directory. -->
-  <property file="${argo.src.dir}/default.properties"/>
   <!-- Our defaults depend on and don't override main props, so they go 2nd -->
-  <property file="default.properties"/>
+
+  <property name="fop.version" value="fop-0.20.5"/>
+  <property name="fop.build.dir" value="${argo.tools.dir}/${fop.version}/build"/>
+  <property name="fop.lib.dir" value="${argo.tools.dir}/${fop.version}/lib"/>
+
+  <property name="docbook-xsl-source-url-base" 
+            value="http://internap.dl.sourceforge.net/sourceforge/docbook/"
+  />
+  <!-- 
+       The mirror below may be faster from Europe 
+       (or can be used as an alternative)
+            value="http://puzzle.dl.sourceforge.net/sourceforge/docbook/"
+  -->
+  <property name="docbook-xsl-version" value="1.69.1"/>
+
+  <property name="saxon.jar.path" value="${argo.tools.lib}/saxon-6.5.2.jar"/>
+  <property name="jimi.jar.path" value="${argo.tools.lib}/JimiProClasses.zip"/>
+
+  <!-- Define in build.properties to skip production of individual manuals -->
+  <!-- <property name="skip-cookbook" value="true"/> -->
+  <!-- <property name="skip-quickguide" value="true"/> -->
+  <!-- <property name="skip-argomanual" value="true"/> -->
 
   <property name="documentation.dir" value="${basedir}"/>
 

Modified: trunk/documentation/cookbook/building.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/documentation/cookbook/building.xml?view=diff&rev=15165&p1=trunk/documentation/cookbook/building.xml&p2=trunk/documentation/cookbook/building.xml&r1=15164&r2=15165
==============================================================================
--- trunk/documentation/cookbook/building.xml	(original)
+++ trunk/documentation/cookbook/building.xml	2008-07-04 14:00:13-0700
@@ -3675,13 +3675,14 @@
 
       <listitem>
         <para>Set the <methodname>argo.core.version</methodname>
-to not include the "PRE-" part.
+to not include the "PRE-" part
+and commit the files.
 </para>
         <para>
-This is done in the <filename>default.properties</filename>-file
-in
-<filename>build/VERSION_<replaceable>GIVEN_VERSION</replaceable>/argouml/src_new</filename>
-and then, commit the file.
+This is done in the <filename>default.properties</filename>-files
+<filename>build/VERSION_<replaceable>GIVEN_VERSION</replaceable>/argouml/src/argouml-app</filename>
+and
+<filename>build/VERSION_<replaceable>GIVEN_VERSION</replaceable>/argouml/documentation/build.xml</filename>.
 </para>
       </listitem>
  

Removed: trunk/documentation/default.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/documentation/default.properties?view=auto&rev=15164