Copy DOAP file to build/site, same place as the HTML-s. Simplified Ant build.
diff --git a/build.xml b/build.xml
index 2f2b795..d4268ad 100644
--- a/build.xml
+++ b/build.xml
@@ -18,7 +18,7 @@
under the License.
-->
-<project name="FreeMarker Site" default="pack" basedir="."
+<project name="FreeMarker Site" default="site" basedir="."
xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:docgen="http://freemarker.org/docgen"
>
@@ -44,9 +44,9 @@
<target name="site">
<!-- Ensure that we have an empty build/site directory: -->
- <mkdir dir="build/docgen"/>
+ <mkdir dir="build/site"/>
<delete includeEmptyDirs="true">
- <fileset dir="build/docgen">
+ <fileset dir="build/site">
<include name="*/**"/>
</fileset>
</delete>
@@ -59,33 +59,18 @@
/>
<docgen:transform
- srcdir="src/main/docgen" destdir="build/docgen"
+ srcdir="src/main/docgen" destdir="build/site"
offline="@{offline}"
/>
- </target>
-
- <target name="doap">
- <copy file="doap.rdf" todir="build" />
+
+ <!-- Copy project meta-data file: -->
+ <copy file="doap.rdf" todir="build/site" />
</target>
<target name="clean">
<delete dir="build"/>
</target>
- <target name="all" depends="clean, site, doap"/>
-
- <target name="pack" depends="site">
- <tar tarfile="build/site.tar" basedir="build/docgen"/>
- <mkdir dir="build/artifacts" />
- <gzip zipfile="build/artifacts/site.tar.gz" src="build/site.tar"/>
- <delete file="build/site.tar"/>
- </target>
-
- <target name="artifacts" depends="pack"
- description="Creates the artifacts for Ivy."
- />
-
-
<!-- ================================================================== -->
<!-- Dependency management (keep it exactly identical for all projects) -->
<!-- ================================================================== -->
@@ -131,43 +116,6 @@
<delete dir=".ivy" />
</target>
- <target name="publish-override" depends="artifacts"
- description="Ivy-publishes THIS project locally as an override"
- >
- <ivy:resolve />
- <ivy:publish
- pubrevision="${moduleBranch}-branch-head"
- overwrite="true" forcedeliver="true"
- resolver="freemarker-devel-local-override"
- >
- <artifacts pattern="build/artifacts/[artifact].[ext]" />
- </ivy:publish>
- <echo>-------------------------------------------------------</echo>
- <echo>*** Don't forget to `ant unpublish-override` later! ***</echo>
- </target>
-
- <target name="unpublish-override"
- description="Undoes publish-override (made in THIS project)"
- >
- <delete dir="${user.home}/.ivy2/freemarker-devel-local-override/${moduleOrg}/${moduleName}" />
- <delete dir="${user.home}/.ivy2/freemarker-devel-local-override-cache/${moduleOrg}/${moduleName}" />
- </target>
-
- <target name="unpublish-override-all"
- description="Undoes publish-override-s made in ALL projects"
- >
- <delete dir="${user.home}/.ivy2/freemarker-devel-local-override" />
- <delete dir="${user.home}/.ivy2/freemarker-devel-local-override-cache" />
- </target>
-
- <target name="uninstall"
- description="Deletes external files created by FreeMarker developement"
- >
- <delete dir="${user.home}/.ivy2/freemarker-devel-cache" />
- <delete dir="${user.home}/.ivy2/freemarker-devel-local-override" />
- <delete dir="${user.home}/.ivy2/freemarker-devel-local-override-cache " />
- </target>
-
<target name="report-deps"
description="Creates a HTML document that summarizes the dependencies."
>
@@ -176,23 +124,4 @@
<ivy:report todir="build/deps-report" />
</target>
- <!--
- This meant to be called on the Continuous Integration server, so the
- integration builds appear in the freemarker.apache.org public Ivy repository.
- The artifacts must be already built.
- -->
- <target name="server-publish-last-build"
- description="(For the Continuous Integration server only)"
- >
- <delete dir="build/dummy-server-ivy-repo" />
- <ivy:resolve />
- <ivy:publish
- pubrevision="${moduleBranch}-branch-head"
- overwrite="true" forcedeliver="true"
- resolver="server-publishing-target"
- >
- <artifacts pattern="build/artifacts/[artifact].[ext]" />
- </ivy:publish>
- </target>
-
</project>
