Merge fixes

Author: Nicholas C. Zakas

CHANGELOG

@@ -1,3 +1,8 @@
+November 15, 2011 - v0.8.5
+
+* Updated parser (fixes #206 and fixes #209) (Nicholas C. Zakas)
+* Removed extra file (Nicholas C. Zakas)
+
 October 25, 2011 - v0.8.1
 
 * Updated parser and fixed CLI errors (fixes #203 and fixes #205) (Nicholas C. Zakas)

README.md

@@ -16,4 +16,6 @@ CSSLint is a tool to help point out problems with your CSS code. It does basic s
 1. Ben Barber (Compatible Vendor Prefix Rule)
 1. Eric Wendelin, http://eriwen.com (Output formatters)
 1. Kasper Garnaes, http://reload.dk (Checkstyle XML format)
-1. Gord Tanner, http://www.tinyhippos.com (CLI quiet option)
+1. Gord Tanner, http://www.tinyhippos.com (CLI quiet option)
+1. Hans-Peter Buniat, https://github.com/hpbuniat (Duplicate background image rule)
+1. Dino Chiesa, https://github.com/DinoChiesa (Windows Script Host CLI)

build.xml

@@ -1,7 +1,7 @@
 <project name="csslint" default="build.all">
 
     <!-- version number -->
-    <property name="csslint.version" value="0.8.1" />
+    <property name="csslint.version" value="0.8.5" />
 
     <!-- the directories containing the source files -->
     <property name="src.dir" value="./src" />
@@ -30,6 +30,7 @@
     <property name="worker.build.file" value="csslint-worker.js"/>
     <property name="tests.build.file" value="csslint-tests.js"/>
     <property name="rhino.build.file" value="csslint-rhino.js"/>
+    <property name="wsh.build.file" value="csslint-wsh.js"/>
 
     <!-- embeddable license -->
     <loadfile property="license.text" srcfile="LICENSE" />   
@@ -85,7 +86,7 @@
     <target name="lint">       
         <fileset dir="${src.dir}" includes="**/*.js" id="jsfiles.raw"/>
         <pathconvert pathsep=" " property="jsfiles.clean" refid="jsfiles.raw" />
-        <exec executable="java">
+        <exec executable="java" failonerror="true">
             <arg line="-jar"/>
             <arg path="${lib.dir}/js.jar"/>
             <arg path="${lib.dir}/jshint.js" />        
@@ -204,6 +205,14 @@
         </concat>
     </target>    
 
+    <!-- build for WSH CLI integration -->
+    <target name="build.wsh" depends="build.core">
+        <concat destfile="${build.dir}/${wsh.build.file}" fixlastline="true">
+            <filelist dir="${build.dir}" files="${core.build.file}" />
+            <filelist dir="${src.dir}/cli" files="common.js,wsh.js" />
+        </concat>
+    </target>    
+    
     <!-- Create a release with version number embedded -->
     <target name="release" depends="test,build.all,changelog.update">
         <delete dir="${release.dir}" />
@@ -228,6 +237,6 @@
     </target>
 
     <!-- Build all files -->
-    <target name="build.all" depends="clean,build.core,build.worker,build.node,build.tests,build.rhino"/>
+    <target name="build.all" depends="clean,build.core,build.worker,build.node,build.tests,build.rhino,build.wsh"/>
 
 </project>

demos/demo.css

@@ -8,7 +8,7 @@
 @namespace svg "http://www.w3.org/2000/svg";
 
 li.inline #foo {
-  background: url("something.png");
+  background: rgba(234, 212, 200, 0.5) url("something.png");
   display: inline;
   padding-left: 3px;
   padding-right: 7px;
@@ -40,4 +40,4 @@ li.last.first {
     font-size: 2em;
     content: counter(page);
   }
-}
+}