- build files seperated (build / deployment)

- support for java2html for demos

git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@222 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c

java/build.xml

@@ -1,12 +1,8 @@
 <?xml version="1.0"?>
 <!-- ====================================================================== 
-     23.08.2006 08:03:24                                                        
-
      ch.ntb.usb 
      Ant tasks for ch.ntb.usb
 
-	 NOTE: for distribution, \\www-server\web must be mapped to W:
-
      schlaepfer                                                                
      ====================================================================== -->
 <project name="ch.ntb.usb" basedir="." default="javadoc">
@@ -31,6 +27,7 @@
 		<delete dir="${project.dir.bin}" />
 		<delete dir="${project.dir.doc}" />
 		<delete dir="${project.dir.lib}" />
+		<delete dir="${project.dir.demos}" />
 	</target>
 
 	<target name="compile" depends="clean" description="--> Compile Java files">
@@ -65,15 +62,4 @@
 			<fileset dir="${project.dir.src}" defaultexcludes="yes" />
 		</javadoc>
 	</target>
-
-	<target name="distribute" depends="jar, javadoc" description="--> Distribute to server">
-		<echo message="\\www-server\web must be mapped to W:" />
-		<echo message="copy jar file to server" />
-		<copy file="${project.dir.lib}/${project.jarfile}" todir="${project.server.dir.bin}" />
-		<echo message="copy javadoc to server" />
-		<copy todir="${project.server.dir.doc}">
-			<fileset dir="${project.dir.doc}" />
-		</copy>
-	</target>
-
 </project>

java/deployment.properties

@@ -0,0 +1,7 @@
+java2html.dir.lib=D:/Exchange/Download/java2html/java2html.jar
+java2html.dir.src=test/ch/ntb/usb/demo/
+
+project.server.dir=W:/inf/infoportalExternalDocs/projects/libusbJava
+project.server.dir.doc=${project.server.dir}/doc
+project.server.dir.bin=${project.server.dir}/bin
+project.server.dir.demos=${project.server.dir}/demos

java/deployment.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!-- ====================================================================== 
+     ch.ntb.usb 
+     Ant deployment tasks for ch.ntb.usb
+
+	 NOTE: for deployment, \\www-server\web must be mapped to W:
+
+     schlaepfer                                                                
+     ====================================================================== -->
+<project name="ch.ntb.usb.deployment" basedir=".">
+	<description>
+		Ant deployment tasks for ch.ntb.usb
+	</description>
+	
+	<import file="build.xml" />
+
+	<property file="deployment.properties" />
+
+	<taskdef name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" classpath="${java2html.dir.lib}" />
+	<target name="java2html">
+		<java2html srcdir="${java2html.dir.src}" destdir="${project.dir.demos}" includes="**/*.java" overwrite="true" style="eclipse" showFileName="true" />
+	</target>
+
+	<target name="distribute" depends="jar, javadoc, java2html" description="--> Distribute to server">
+		<echo message="\\www-server\web must be mapped to W:" />
+		<echo message="copy jar file to server" />
+		<copy file="${project.dir.lib}/${project.jarfile}" todir="${project.server.dir.bin}" />
+		<echo message="copy javadoc to server" />
+		<copy todir="${project.server.dir.doc}">
+			<fileset dir="${project.dir.doc}" />
+		</copy>
+		<echo message="copy html demo files to server" />
+		<copy todir="${project.server.dir.demos}">
+			<fileset dir="${project.dir.demos}" />
+		</copy>
+	</target>
+	
+</project>

java/project.properties

@@ -5,7 +5,6 @@ project.dir.src=src
 project.dir.bin=bin
 project.dir.lib=lib
 project.dir.doc=doc
+project.dir.demos=demos
 project.jarfile=${project.name}.jar
 project.manifest.mainclass=ch.ntb.usb.usbView.UsbView
-project.server.dir.doc=W:/inf/infoportalExternalDocs/projects/libusbJava/doc
-project.server.dir.bin=W:/inf/infoportalExternalDocs/projects/libusbJava/bin