[jsword-svn] r2296 - in trunk: bibledesktop-web jsword-web

[dmsmith at crosswire.org]

Author: dmsmith
Date: 2013-03-10 17:27:59 -0700 (Sun, 10 Mar 2013)
New Revision: 2296

Modified:
   trunk/bibledesktop-web/build.xml
   trunk/jsword-web/build.xml
Log:
build improvements

Modified: trunk/bibledesktop-web/build.xml
===================================================================
--- trunk/bibledesktop-web/build.xml	2013-03-10 22:36:29 UTC (rev 2295)
+++ trunk/bibledesktop-web/build.xml	2013-03-11 00:27:59 UTC (rev 2296)
@@ -14,24 +14,48 @@
 
 	<!--=======================================================================-->
 	<target name="package.extra" description="Build an unpacked war file">
-		<mkdir dir="${website.bd.dir}" />
-		<xslt basedir="${src.main.web.dir}" extension=".html" style="${src.main.web.dir}/template.xsl" destdir="${website.bd.dir}">
+		<mkdir dir="${dest.install.web.dir}" />
+		<xslt basedir="${src.main.web.dir}" extension=".html" style="${src.main.web.dir}/template.xsl" destdir="${dest.install.web.dir}">
 			<outputproperty name="method" value="html" />
 			<outputproperty name="omit-xml-declaration" value="yes" />
 			<include name="**/*.html" />
 			<xmlcatalog refid="commonDTDs" />
 		</xslt>
-		<copy todir="${website.bd.dir}">
+		<copy todir="${dest.install.web.dir}">
 			<fileset dir="${src.main.web.dir}">
 				<exclude name="*.jsp" />
 				<exclude name="*.html" />
 				<exclude name="*.xsl" />
 			</fileset>
 		</copy>
-		<mkdir dir="${website.bd.dir}/WEB-INF/classes" />
-		<mkdir dir="${website.bd.dir}/WEB-INF/lib" />
+		<mkdir dir="${dest.install.web.dir}/WEB-INF/classes" />
+		<mkdir dir="${dest.install.web.dir}/WEB-INF/lib" />
 	</target>
 
+	<target name="install.extra"
+			description="Create extra project packaging">
+		<copy todir="${website.bd.dir}">
+			<fileset dir="${dest.install.web.dir}">
+				<exclude name="*-bin.tar.gz" />
+				<exclude name="*-doc.tar.gz" />
+				<exclude name="*-src.tar.gz" />
+				<exclude name="*-bin.zip" />
+				<exclude name="*-doc.zip" />
+				<exclude name="*-src.zip" />
+			</fileset>
+		</copy>
+		<copy todir="${package.bd.dir}">
+			<fileset dir="${dest.install.web.dir}">
+				<include name="*-bin.tar.gz" />
+				<include name="*-doc.tar.gz" />
+				<include name="*-src.tar.gz" />
+				<include name="*-bin.zip" />
+				<include name="*-doc.zip" />
+				<include name="*-src.zip" />
+			</fileset>
+		</copy>
+	</target>
+
 	<!--=======================================================================
 	  == Override targets that should do nothing
 	  =======================================================================-->

Modified: trunk/jsword-web/build.xml
===================================================================
--- trunk/jsword-web/build.xml	2013-03-10 22:36:29 UTC (rev 2295)
+++ trunk/jsword-web/build.xml	2013-03-11 00:27:59 UTC (rev 2296)
@@ -49,6 +49,30 @@
 		</jar>
 	</target>
 
+	<target name="install.extra"
+			description="Create extra project packaging">
+		<copy todir="${jsword.bd.dir}">
+			<fileset dir="${dest.install.web.dir}">
+				<exclude name="*-bin.tar.gz" />
+				<exclude name="*-doc.tar.gz" />
+				<exclude name="*-src.tar.gz" />
+				<exclude name="*-bin.zip" />
+				<exclude name="*-doc.zip" />
+				<exclude name="*-src.zip" />
+			</fileset>
+		</copy>
+		<copy todir="${jsword.bd.dir}">
+			<fileset dir="${dest.install.web.dir}">
+				<include name="*-bin.tar.gz" />
+				<include name="*-doc.tar.gz" />
+				<include name="*-src.tar.gz" />
+				<include name="*-bin.zip" />
+				<include name="*-doc.zip" />
+				<include name="*-src.zip" />
+			</fileset>
+		</copy>
+	</target>
+
 	<target name="package.extra" description="Build an unpacked war file">
 		<mkdir dir="${dest.install.web.dir}"/>
 		<xslt basedir="${src.main.web.dir}" extension=".html" style="${src.main.web.dir}/template.xsl" destdir="${dest.install.web.dir}">