From 44ec97a40230de19613551517d53b09edb62ead1 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Fri, 22 Jun 2018 21:53:02 +0700
Subject: [PATCH] Refactor release-deploy

---
 build.xml | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/build.xml b/build.xml
index 72d4344d..8c780790 100644
--- a/build.xml
+++ b/build.xml
@@ -772,17 +772,6 @@
 	</target>
 
 
-	<target name="website-docs" depends="revision">
-		<javadoc destdir="${dir.dist}/website/docs" linksource="yes" access="public" classpathref="lib.classpath" encoding="UTF-8" charset="UTF-8" windowtitle="${application.name}" noindex="yes" nohelp="yes" notree="yes" nodeprecated="yes" nonavbar="yes">
-			<fileset dir="${dir.source}" includesfile="${dir.website}/docs/includes.fileset" />
-			<doctitle>${application.name} ${application.version}</doctitle>
-			<bottom>${application.name} ${application.version} (r${revision}) built on ${tstamp.date}</bottom>
-			<link href="http://docs.oracle.com/javase/${jre.version}/docs/api/" />
-			<link href="http://docs.groovy-lang.org/latest/html/api/" />
-		</javadoc>
-	</target>
-
-
 	<target name="revision" depends="init">
 		<exec executable="git" outputproperty="revision" failonerror="true">
 			<arg line="rev-list --count master" />
@@ -871,7 +860,7 @@
 	</target>
 
 
-	<target name="deploy-website" description="Upload website resources" depends="revision">
+	<target name="deploy-website" depends="revision" description="Upload website resources">
 		<!-- copy image resources -->
 		<copy todir="${dir.dist}/website/resources" preservelastmodified="yes" verbose="yes" flatten="true">
 			<fileset dir="${dir.source}/net/filebot/resources">
@@ -882,9 +871,6 @@
 		<!-- copy static website resources -->
 		<copy todir="${dir.dist}/website" preservelastmodified="yes" verbose="yes">
 			<fileset dir="${dir.website}">
-				<include name=".htaccess" />
-				<include name="*.html" />
-				<include name="*.php" />
 				<include name="*.json" />
 				<include name="*.xml" />
 				<include name="*.css" />
@@ -913,6 +899,17 @@
 	</target>
 
 
+	<target name="website-docs" depends="revision" description="Generate API documentation">
+		<javadoc destdir="${dir.dist}/website/docs" linksource="yes" access="public" classpathref="lib.classpath" encoding="UTF-8" charset="UTF-8" windowtitle="${application.name}" noindex="yes" nohelp="yes" notree="yes" nodeprecated="yes" nonavbar="yes">
+			<fileset dir="${dir.source}" includesfile="${dir.website}/docs/includes.fileset" />
+			<doctitle>${application.name} ${application.version}</doctitle>
+			<bottom>${application.name} ${application.version} (r${revision}) built on ${tstamp.date}</bottom>
+			<link href="http://docs.oracle.com/javase/${jre.version}/docs/api/" />
+			<link href="http://docs.groovy-lang.org/latest/html/api/" />
+		</javadoc>
+	</target>
+
+
 	<target name="eclipse-properties-builder">
 		<exec executable="git" outputproperty="revision" failonerror="true">
 			<arg line="rev-list --count master" />