# some configuration fixes

.hgignore

@@ -32,3 +32,6 @@ tools/php-5.3.9-Win32-VC9-x86
 tools/PhpDocumentor-1.4.4
 minilib/lib
 tools/build/common.properties
+tools/apache-ivy-2.2.0
+tools/jsdoc_toolkit-2.4.0
+tools/yuicompressor-2.4.7

ciform/ivy.xml

@@ -7,14 +7,14 @@
         </description>
     </info>
     <configurations>
-      <conf name="source"/>
+      <conf name="source" description="The library in clear, meaning visible source code and comments." />
-      <conf name="minified"/>
+      <conf name="minified" description="An obfuscated, size-reduced version of the script. Use to speed up loading time in final environment. " />
     </configurations>
     <publications>
-      <artifact name="ciform" type="js" conf="source"/>
+      <!-- ciform core library -->
-      <artifact name="ciform-min" type="js" conf="minified"/>
+      <artifact name="ciform" type="js" />
-      <artifact name="libciform" type="js" conf="source"/>
+      <!-- ciform and all dependencies in a single artifact -->
-      <artifact name="libciform-min" type="js" conf="minified"/>
+      <artifact name="libciform" type="js" />
     </publications>
     <dependencies>
       <dependency org="nicobo" name="minilib" rev="latest.integration" conf="*->source" />

crypto/rsa/ivy.xml

@@ -8,10 +8,8 @@
         </description>
     </info>
     <configurations>
-      <!-- The source script as plain text, including all inner informations and comments. -->
+      <conf name="source" description="The library in clear, meaning visible source code and comments." />
-      <conf name="source"/>
+      <conf name="minified" description="An obfuscated, size-reduced version of the script. Use to speed up loading time in final environment. " />
-      <!-- An obfuscated, size-reduced version of the script. Use to speed up loading time in final environment. -->
-      <conf name="minified"/>
     </configurations>
     <publications>
         <artifact name="rsa" type="js" conf="source"/>

minilib/build.properties

@@ -17,9 +17,6 @@
 #
 ########################################
 
-basedir=.
-tools.dir=../tools
-
 # Where the source files are : here Maven-style
 src.dir=${basedir}/src/main/js
 
@@ -29,5 +26,8 @@ build.dir=${basedir}/build
 # Where the generated files are going
 target.dir=${basedir}/target
 
-# set to common properties file
+# A directory where all external tools can be found
+tools.dir=${basedir}/../tools
+
+# Global properties file
 common.properties=${tools.dir}/build/common.properties

minilib/ivy.xml

@@ -7,8 +7,8 @@
         </description>
     </info>
     <configurations>
-      <conf name="source"/>
+      <conf name="source" description="The library in clear, meaning visible source code and comments." />
-      <conf name="minified"/>
+      <conf name="minified" description="An obfuscated, size-reduced version of the script. Use to speed up loading time in final environment. " />
     </configurations>
     <publications>
       <artifact name="minilib" type="js"/>

tools/build/ant-js.xml

@@ -55,7 +55,7 @@
         <!-- nothing more to do -->
     </target>
 
-    <target name="package" depends="build-src, build-min, test, doc" description="Takes the compiled code and package it in its distributable format, such as a JAR.">
+    <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>
@@ -113,7 +113,7 @@
         Some more specific targets
     -->
 
-    <target name="doc" depends="validate" description="Generates developer documentation.">
+    <target name="site" depends="validate" description="Generates site (developer) documentation for this project.">
 
         <!-- Generates a report of dependencies -->
         <ivy:report todir="${target.dir}/doc/ivy"/>