Merge branch 'master' into width-100

Author: stubbornella

CHANGELOG

@@ -5,6 +5,12 @@ Next (not yet released)
 * Made license comment important in build files (fixes #46)
 * Code cleanup (pull #70)
 * Cleanup of whitespace (pull #74)
+* Standardization of CLI interface (pull #81)
+* Switched display-property-grouping to allow padding, margin-left, and margin-right for display: inline (fixes #3)
+* Changed messaging for float rule (fixes #26)
+* border:none with width/height is okay (fixes #45)
+* Updated web worker to accept JSON-encoded input
+* Allow turning on/off rules in web interface and CLIs (fixes #77)
 
 June 18, 2011 - v0.2.0
 

build.xml

@@ -1,5 +1,8 @@
 <project name="csslint" default="all">
 
+    <!-- version number -->
+    <property name="csslint.version" value="0.2.0" />
+
     <!-- the directories containing the source files -->
     <property name="src.dir" value="./src" />
     <property name="npm.dir" value="./npm" />
@@ -21,6 +24,13 @@
 
     <loadfile property="license.text" srcfile="LICENSE" />   
 
+    <!-- get a timestamp -->
+    <tstamp>
+      <format property="RIGHT_NOW"
+              pattern="d-MMMM-yyyy hh:mm:ss"
+              locale="en,US"/>
+    </tstamp>
+    
     <!-- clean -->
     <target name="clean">
         <delete dir="${build.dir}" />
@@ -32,6 +42,7 @@
             <header trimleading="yes">/*! 
             ${license.text}
             */
+            /* Build time: ${RIGHT_NOW} */
             var CSSLint = (function(){
             </header>
             <fileset dir="${lib.dir}" includes="*.js" />
@@ -52,6 +63,7 @@
             <header trimleading="yes">/*!
             ${license.text}
             */
+            /* Build time: ${RIGHT_NOW} */
             </header>
             <fileset dir="${lib.dir}" includes="*.js" />
             <filelist dir="${src.dir}/core" files="CSSLint.js" />
@@ -69,6 +81,7 @@
             <header trimleading="yes">/*!
             ${license.text}
             */
+            /* Build time: ${RIGHT_NOW} */
             </header>
             <fileset dir="${lib.dir}" includes="*.js" />
             <filelist dir="${src.dir}/core" files="CSSLint.js" />
@@ -82,7 +95,10 @@
        <mkdir dir="${build.npm.dir}"/>
        <mkdir dir="${build.npm.dir}/lib"/>
        <copy file="${npm.dir}/package.json" todir="${build.npm.dir}"/>
-       <copy file="${src.dir}/node/cli.js" todir="${build.npm.dir}"/>
+       <concat destfile="${build.npm.dir}/cli.js" fixlastline="true">
+           <header trimleading="yes">#!/usr/bin/env node</header>
+           <filelist dir="${src.dir}/cli" files="util.js,node.js" />
+       </concat>
        <copy file="${build.dir}/${node.build.file}" todir="${build.npm.dir}/lib"/>
 
     </target>
@@ -94,16 +110,20 @@
         </concat>        
     </target>   
 
-
     <!-- build for rhino CLI integration -->
     <target name="build.rhino" depends="build.core">
         <concat destfile="${build.dir}/${rhino.build.file}" fixlastline="true">
             <filelist dir="${build.dir}" files="${core.build.file}" />
-            <filelist dir="${src.dir}/rhino" files="cli.js" />
+            <filelist dir="${src.dir}/cli" files="util.js,rhino.js" />
         </concat>
-    </target>
-    
+    </target>    
 
+    <!-- Update version number in files -->
+    <target name="release" depends="all">
+        <replaceregexp match="@VERSION@" replace="${csslint.version}" flags="g" byline="true">
+            <fileset dir="${build.dir}" includes="**/*.js"/>
+        </replaceregexp>    
+    </target>
 
     <!-- Build all files -->
     <target name="all" depends="clean,build.core,build.worker,build.node,build.tests,build.rhino"/>