Merge pull request #146 from kdimatteo/master

roblarsen · roblarsen · commit 07ae7ccd8779 · 2013-02-25T20:19:07.000-08:00
LESS CSS Error Trapping, Upgrade LESS-rhino to 1.3.3 closes #140
diff --git a/build.xml b/build.xml
@@ -893,6 +893,15 @@
             <then>
                 <echo message="Processing LESS CSS..."/>
                 <lessjs input="${dir.intermediate}/${dir.css}/style-concat.css" output="${dir.intermediate}/${dir.css}/style-concat.css" />
+                <!-- load the generated LESS file and check if it contains errors -->
+                <loadfile property="generatedLESS" srcfile="${dir.intermediate}/${dir.css}/style-concat.css" />
+                <propertyregex property="errorLESS" input="${generatedLESS}" regexp="Error :" select="\1" casesensitive="true" />
+                <if>
+                    <equals arg1="${errorLESS}" arg2="\1" />
+                    <then>
+                        <fail message="LESS Compilation Error: ${generatedLESS}" />
+                    </then>
+                </if>
             </then>
             <else>
                 <echo message="NOT Processing LESS CSS"/>
diff --git a/config/default.properties b/config/default.properties
@@ -154,8 +154,8 @@ tool.rhino                  = rhino.jar
 tool.jslint                 = fulljslint.js
 tool.jshint                 = fulljshint.js
 tool.csslint                = csslint-rhino.js
-tool.lesscss								= less-rhino-1.3.0.js
-tool.jsdoc3									= jsdoc.js
+tool.lesscss				= less-rhino-1.3.3.js
+tool.jsdoc3					= jsdoc.js
 tool.optipng                = optipng-0.7.4-win32/optipng.exe
 tool.advpng                 = advancecomp-1.15/advpng.exe
 # Default Lint Utils Options
diff --git a/tools/less-rhino-1.3.3.js b/tools/less-rhino-1.3.3.js
