From ec2ae7b2f0dce0579feaa19a7cc270499f1525e1 Mon Sep 17 00:00:00 2001
From: cbonar <cbonar@localhost>
Date: Wed, 1 Feb 2012 01:45:09 +0100
Subject: [PATCH] + some targets are now extension-points # making of
 default(=source) and minified libs are now reusable macrodefs + targets to
 build libciform

---
 .hgignore              |  2 ++
 ciform/build.xml       | 26 ++++++++++------
 tools/build/ant-js.xml | 70 ++++++++++++++++++++++++++----------------
 3 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/.hgignore b/.hgignore
index a1ce201..1273728 100644
--- a/.hgignore
+++ b/.hgignore
@@ -35,3 +35,5 @@ tools/build/common.properties
 tools/apache-ivy-2.2.0
 tools/jsdoc_toolkit-2.4.0
 tools/yuicompressor-2.4.7
+minilib/build
+minilib/target
diff --git a/ciform/build.xml b/ciform/build.xml
index 0325b25..d245863 100644
--- a/ciform/build.xml
+++ b/ciform/build.xml
@@ -33,24 +33,30 @@
         </exec>
     </target>
 
-    <target name="build-lib" depends="validate" description="Builds the bigsource file to work with for the 'lib' artifact" >
+    <target name="build-biglib" depends="validate" description="Builds the bigsource file to work with for the 'lib' artifact" >
         <tempfile property="build.bigsource.js" destDir="${build.dir}" prefix="lib${ant.project.name}" suffix=".js" />
         <!-- TODO handle encoding (and eol?) -->
         <concat destfile="${build.bigsource.js}">
-            <fileset dir="${src.dir}">
-                <!-- order is important because of function dependencies -->
-                <include name="${lib.dir}/hex*.js" />
-                <include name="${lib.dir}/base64*.js" />
-                <include name="${lib.dir}/sha1*.js" />
-                <include name="${lib.dir}/rsa*.js" />
-                <include name="${src.dir}/minilib.js" />
-                <include name="${src.dir}/ciform.js" />
+            <!-- order is important because of function dependencies -->
+            <!-- TODO no direct reference to the directory where dependencies are stored -->
+            <fileset dir="${build.dir}/ivy/source">
+                <include name="hex*.js" />
+                <include name="base64*.js" />
+                <include name="sha1*.js" />
+                <include name="rsa*.js" />
+                <include name="minilib.js" />
             </fileset>
+            <fileset dir="${src.dir}" includes="*.js" />
         </concat>
         <echo message="Created : ${build.bigsource.js}" level="verbose" />
     </target>
 
-    <target name="nico" >
+    <target name="build-libdefault" extensionOf="package" depends="build-biglib" description="Builds the default .js.">
+        <make-default bigsource="${build.bigsource.js}" module="libciform" />
+    </target>
+
+    <target name="build-libmin" extensionOf="package" depends="build-biglib" description="Builds a minified version of the .js.">
+        <make-min bigsource="${build.bigsource.js}" module="libciform" />
     </target>
 
     <target name="resolve-dependencies" description="(internal) Builds an ordered list of dependent modules." >
diff --git a/tools/build/ant-js.xml b/tools/build/ant-js.xml
index fd79c46..620deb3 100644
--- a/tools/build/ant-js.xml
+++ b/tools/build/ant-js.xml
@@ -3,6 +3,7 @@
 
    To use it, projects must import this file into their own build.xml and define all variables.
 -->
+<!-- TODO define all base targets as extension-point and make javascript.* targets -->
 <project name="javascript" default="package" xmlns:ivy="antlib:org.apache.ivy.ant">
 
     <!--
@@ -31,6 +32,7 @@
 
     <!--
         Main targets : they are greatly inspired from the Maven build lifecycle
+        See http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html#Lifecycle_Reference
     -->
 
     <target name="validate" description="Validates the project is correct and all necessary information is available.">
@@ -40,7 +42,7 @@
         <mkdir dir="${target.dir}" />
     </target>
 
-    <target name="compile" depends="validate" description="Compiles the source code of the project.">
+    <extension-point name="compile" depends="validate" description="Compiles the source code of the project.">
         <!-- We use this target to copy all required files for the tests together in a consistent hierarchy -->
         <!--
         <copy file="${jsunit.coreJs}" todir="${jsunit.tmp}"/>
@@ -49,16 +51,11 @@
         </copy>
         -->
         <!-- nothing more to do -->
-    </target>
+    </extension-point>
 
-    <target name="test" depends="compile" description="Tests the compiled source code using a suitable unit testing framework. These tests should not require the code be packaged or deployed.">
-        <!-- nothing more to do -->
-    </target>
+    <extension-point name="test" depends="compile" description="Tests the compiled source code using a suitable unit testing framework. These tests should not require the code be packaged or deployed." />
 
-    <target name="package" depends="build-src, build-min, test" description="Takes the compiled code and package it in its distributable format, such as a JAR.">
-        <!-- TODO call a target "build-<conf>" for each Ivy configuration -->
-        <!-- nothing more to do -->
-    </target>
+    <extension-point name="package" depends="build-default, build-minified, test" description="Takes the compiled code and package it in its distributable format, such as a JAR." />
 
     <target name="integration-test" depends="package" description="Processes and deploys the package if necessary into an environment where integration tests can be run.">
 
@@ -87,19 +84,15 @@
         <!-- nothing more to do -->
     </target>
 
-    <target name="verify" depends="integration-test" description="Runs any checks to verify the package is valid and meets quality criteria.">
-        <!-- nothing more to do -->
-    </target>
+    <extension-point name="verify" depends="integration-test" description="Runs any checks to verify the package is valid and meets quality criteria." />
 
-    <target name="install" depends="build-src, build-min, test" description="Installs the package into the local repository, for use as a dependency in other projects locally.">
+    <target name="install" depends="build-default, build-minified, test" description="Installs the package into the local repository, for use as a dependency in other projects locally.">
         <!-- 'local' resolver is a default one bundled with Ivy -->
         <!-- 'artifactspattern' must match the name of the files this script builds -->
         <ivy:publish resolver="local" artifactspattern="${target.lib.dir}/[artifact]-[revision].[ext]" overwrite="true" forcedeliver="true" />
     </target>
 
-    <target name="deploy" depends="verify" description="Done in an integration or release environment, copies the final package to the remote repository for sharing with other developers and projects.">
-        <!-- nothing more to do -->
-    </target>
+    <extension-point name="deploy" depends="verify" description="Done in an integration or release environment, copies the final package to the remote repository for sharing with other developers and projects." />
 
     <target name="clean" description="Restores the initial state of the project, deleting any generated file.">
         <delete includeemptydirs="true" failonerror="false">
@@ -108,12 +101,14 @@
         </delete>
     </target>
 
+    <extension-point name="site" depends="site-doc" description="Generates site (developer) documentation for this project." />
+
 
     <!--
         Some more specific targets
     -->
 
-    <target name="site" depends="validate" description="Generates site (developer) documentation for this project.">
+    <target name="site-doc" depends="validate" description="Generates site (developer) documentation for this project.">
 
         <!-- Generates a report of dependencies -->
         <ivy:report todir="${target.dir}/doc/ivy"/>
@@ -130,7 +125,8 @@
             <arg value="--verbose" />
         </java>
 
-        <echo message="Done generating doc." />
+        <echo message="Done generating site." />
+
     </target>
 
     <!--
@@ -148,17 +144,37 @@
         <echo message="Created : ${build.bigsource.js}" level="verbose" />
     </target>
 
-    <target name="build-src" depends="build-bigsource" description="Builds the default .js.">
-        <copy file="${build.bigsource.js}" tofile="${target.lib.dir}/${ivy.module}-${ivy.revision}.js" />
-        <echo message="Copied : ${target.lib.dir}/${ivy.module}-${ivy.revision}.js" />
+    <macrodef name="make-default" description="Builds the default .js.">
+        <attribute name="bigsource" />
+        <attribute name="dir" default="${target.lib.dir}" />
+        <attribute name="module" default="${ivy.module}" />
+        <attribute name="revision" default="${ivy.revision}" />
+        <sequential>
+            <copy file="@{bigsource}" tofile="@{dir}/@{module}-@{revision}.js" />
+            <echo message="Copied : @{dir}/@{module}-@{revision}.js" />
+        </sequential>
+    </macrodef>
+
+    <macrodef name="make-min" description="Builds a minified version of the .js.">
+        <attribute name="bigsource" />
+        <attribute name="dir" default="${target.lib.dir}" />
+        <attribute name="module" default="${ivy.module}" />
+        <attribute name="revision" default="${ivy.revision}" />
+        <sequential>
+        <java jar="${yuicompressor.jar}" fork="true" output="@{dir}/@{module}-min-@{revision}.js" failonerror="true">
+            <arg line="--type js" />
+            <arg file="@{bigsource}"/>
+        </java>
+        <echo message="Minified : @{dir}/@{module}-min-@{revision}.js" />
+        </sequential>
+    </macrodef>
+
+    <target name="build-default" depends="build-bigsource" description="Builds the default .js.">
+        <make-default bigsource="${build.bigsource.js}" />
     </target>
 
-    <target name="build-min" depends="build-bigsource" description="Builds a minified version of the .js.">
-        <java jar="${yuicompressor.jar}" fork="true" output="${target.lib.dir}/${ivy.module}-min-${ivy.revision}.js" failonerror="true">
-            <arg line="--type js" />
-            <arg file="${build.bigsource.js}"/>
-        </java>
-        <echo message="Minified : ${target.lib.dir}/${ivy.module}-min-${ivy.revision}.js" />
+    <target name="build-minified" depends="build-bigsource" description="Builds a minified version of the .js.">
+        <make-min bigsource="${build.bigsource.js}" />
     </target>
 
     <target name="build-pom" depends="validate" description="Builds a Maven POM.">