From: Jani Laakso <jani.laakso@itmill.com>
Date: Wed, 25 Apr 2007 09:04:30 +0000 (+0000)
Subject: WAR now contains javadoc and themes directories. Provides easier deployment, no need... 
X-Git-Tag: 6.7.0.beta1~6410
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0bb9318850d9a0ec70d383a4b25a78bde016c03d;p=vaadin-framework.git

WAR now contains javadoc and themes directories. Provides easier deployment, no need to tweak server specific configuration to access javadocs through demos.

svn changeset:1341/svn branch:trunk
---

diff --git a/build/build.xml b/build/build.xml
index b1b156beb0..562681376b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -14,8 +14,8 @@
 		</zip>
 	</target>
 
-	<!-- As release, but no javadoc or docbook tasks -->
-	<target name="package-without-documentation" depends="clean-all,libs,themes,demo,package-docs,license" description="Build testing package without javadocs or manual">
+	<!-- As release, but no docbook tasks -->
+	<target name="package-without-manual" depends="clean-all,libs,themes,demo,package-docs,license" description="Build testing package without manual">
 		<zip zipfile="build/result/TESTING-${package-file-name}">
 			<fileset dir="build/result">
 				<patternset>
@@ -83,7 +83,7 @@
 				<include name="example/**/*" />
 			</fileset>
 		</copy>
-		
+
 		<fixcrlf srcdir="build/result/themes" includes="**/*.js **/*.css" eol="lf" eof="remove" />
 
 		<!-- Add unoptimized (not obfuscated) themes -->
@@ -198,7 +198,7 @@
 
 	<!-- Demo  - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-	<target name="demo" depends="libs,compile-java,themes">
+	<target name="demo" depends="libs,compile-java,themes,javadoc">
 		<echo>Building demo</echo>
 		<java2html srcdir="build/result/src/${toolkit-package}/demo" destdir="build/result/src/${toolkit-package}/demo" includes="**/*.java" style="eclipse" showLineNumbers="false" showFileName="true" showTableBorder="false" />
 		<!-- have to use "temp" dir for some reason here. Overwrite does not work, at least on Linux Eclipse 3.2.2 -->
@@ -264,6 +264,14 @@
 			<fileset dir="build/result">
 				<include name="src/${toolkit-package}/demo/**/*" />
 			</fileset>
+			<!-- All javadoc -->
+			<fileset dir="${output-dir}">
+				<include name="doc/api/**/*" />
+			</fileset>
+			<!-- Add theme (not optimized) -->
+			<fileset dir="${output-dir}/lib">
+				<include name="themes/**/*" />
+			</fileset>
 		</war>
 
 		<!-- Sources -->