From 397c40c35e86c07e7741b6feeb75b9177405cbb2 Mon Sep 17 00:00:00 2001
From: Marcel Kronfeld <makron@gmx.net>
Date: Mon, 16 Aug 2010 16:19:06 +0000
Subject: [PATCH] Updating doc and ant-build.

---
 ant/build.xml | 17 +++++++++++++++--
 ant/out       | 52 ---------------------------------------------------
 2 files changed, 15 insertions(+), 54 deletions(-)
 delete mode 100644 ant/out

diff --git a/ant/build.xml b/ant/build.xml
index 622e5875..8352c794 100644
--- a/ant/build.xml
+++ b/ant/build.xml
@@ -571,9 +571,17 @@
   </target>
 	
 <!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	        Copy documentation to web directory. tex2html must be updated manually beforehand!
+	        Perform tex-to-HTML of the short documentation. Export tex from lyx manually beforehand!!!
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
-	<target name="docToWWW" depends="init">
+	<target name="docLatexToHTML" depends="init">
+		<exec dir="${doc.directory}" executable="./tex2html" os="Linux">
+		</exec>
+	</target>
+		
+<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+	        Copy documentation to web directory. Note that the doc is not copied to the versioned directory here.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
+	<target name="docToWWW" depends="init, docLatexToHTML">
 	  	<delete>
 			<fileset dir="${web.documentation.directory}">
 				<include name="**" />
@@ -635,6 +643,11 @@
 	    <copy todir="${web.download.versionprefix}-${DSTAMP}">
 	    	<fileset refid="EvA2Stuff"/>
 	    </copy>
+		<!-- copy doc to versioned directory -->
+		<mkdir dir="${web.download.versionprefix}-${DSTAMP}/${doc.directory}"/>
+		<copy todir="${web.download.versionprefix}-${DSTAMP}/${doc.directory}">
+			<fileset dir="${web.documentation.directory}"/>
+		</copy>
 	</target>
 	
 <!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/ant/out b/ant/out
deleted file mode 100644
index 234c307f..00000000
--- a/ant/out
+++ /dev/null
@@ -1,52 +0,0 @@
-Buildfile: build.xml
-
-usage:
-     [echo] 
-     [echo]       Supported targets (default=compileAll):
-     [echo]       -------------------------------------------------------------------------
-     [echo]       check      - checks if all needed binary and source libraries are
-     [echo]                    available.
-     [echo]       compile    - compile all project files.
-     [echo]       compileAll - 1. gets an actual version from the WSI library
-     [echo]                    2. and compiles all project files.
-     [echo]       javadoc    - build project javadoc files
-     [echo]       binaryDist - will create a complete binary distribution
-     [echo]       clean      - will clean up files, except the source files and the api
-     [echo]                    documentation
-     [echo]       run        - will start JavaEvA
-     [echo]       
-     [echo]       use 'ant -projecthelp' for further Main targets
-     [echo]     
-
-init:
-
-buildDirectories:
-
-check:
-
-binary.libraries.check:
-
-binary.libraries.test.SNNS.windows:
-
-binary.libraries.test.SNNS.unix:
-     [echo] WARNING: lib/linux/libSNNS_jkr.so not available.
-
-binary.libraries.test.WSI:
-     [echo] WARNING: wsi package not available at lib/wsi.jar.
-
-binary.libraries.test.JavaNNS:
-     [echo] WARNING: javanns package not available at lib/JavaNNS.jar.
-
-binary.libraries.test:
-
-compileInfo:
-     [echo] ANT_HOME is set to = c:\jakarta-ant-1.5.1
-     [echo] JAVA_HOME is set to = c:\j2sdk1.4.1
-     [echo] You are using JDK version 1.4
-     [echo] currently JDK version 1.3 is recomended!
-
-     [echo] use 'ant compileAll' - to compile all java sources (+ WSI).
-     [echo] use 'ant compile'    - to compile only the java sources (faster).
-
-compile:
-    [javac] Compiling 223 source files to Z:\work\JOpt\build