Support for CSS compression.

CreamCoderz · Jun 18, 2010 · 6cd8375 · 6cd8375
1 parent 018f7b5
commit 6cd8375
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/componentbuild/3.x/module.xml b/componentbuild/3.x/module.xml
@@ -95,7 +95,7 @@
 
     <target name="-concatskins" if="component.skins.exist">
         <concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
-        <yuicompress src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
+        <yuicompress type="css" src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
     </target>
 
     <target name="-rollupcss" if="rollupskins">

diff --git a/componentbuild/shared/cssmodule.xml b/componentbuild/shared/cssmodule.xml
@@ -12,7 +12,7 @@
     </target>
 
     <target name="minify">
-        <yuicompress src="${component.builddir}/${component}.css" dest="${component.builddir}/${component}-min.css" args="${yuicompressor.css.args.internal}" />
+        <yuicompress type="css" src="${component.builddir}/${component}.css" dest="${component.builddir}/${component}-min.css" args="${yuicompressor.css.args.internal}" />
     </target>
 
     <target name="lint">

diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
@@ -81,11 +81,19 @@
     <macrodef name="yuicompress">
         <attribute name="src" />
         <attribute name="dest" />
-        <attribute name="args" />
-
+        <attribute name="args" /> <!-- not used anymore -->
+        <attribute name="type" default="js"/>
         <sequential>
-            <echo level="info">Running yuicompressor [js] on @{src}</echo>
-            <jscompressor srcfile="@{src}" destfile="@{dest}" charset="${yuicompressor.js.charset}" verbose="${yuicompressor.js.verbose}"/>
+            <echo level="info">Running yuicompressor on @{src}</echo>
+            <if>
+                <equals arg1="@{type}" arg2="css"/>
+                <then>
+                    <csscompressor srcfile="@{src}" destfile="@{dest}" charset="${yuicompressor.css.charset}" verbose="${yuicompressor.css.verbose}"/>
+                </then>
+                <else>
+                    <jscompressor srcfile="@{src}" destfile="@{dest}" charset="${yuicompressor.js.charset}" verbose="${yuicompressor.js.verbose}"/>
+                </else>
+            </if>
         </sequential>
     </macrodef>