Permalink
Browse files

Try and make multi-skin support 1.7 compatible

  • Loading branch information...
1 parent 057e455 commit 5c6b1664c0dea0ed27af0f555e6aee99d3c6200a @sdesai sdesai committed Jun 29, 2011
Showing with 3 additions and 3 deletions.
  1. +3 −3 componentbuild/3.x/module.xml
@@ -69,10 +69,10 @@
<dirset dir="${component.assets.base}/skins/" includes="*"/>
</path>
<sequential>
- <local name="skin.name"/>
<basename property="skin.name" file="@{skin.dir}"/>
<echo level="info">Fixing CRLF for Skin files for @{skin.dir} :: ${skin.name}</echo>
<fixcrlf srcdir="${component.builddir}/assets/skins/${skin.name}" includes="${component}.css" eol="${buildfiles.eol}" />
+ <var name="skin.name" unset="true" />
</sequential>
</for>
<!--fixcrlf srcdir="${component.builddir}/assets/skins/sam" includes="${component}.css" eol="${buildfiles.eol}" /-->
@@ -111,11 +111,11 @@
<dirset dir="${component.assets.base}/skins/" includes="*"/>
</path>
<sequential>
- <local name="skin.name"/>
<basename property="skin.name" file="@{skin.dir}"/>
<echo level="info">Concating Skin files for @{skin.dir} :: ${skin.name}</echo>
<concatsource destfile="${component.builddir}/assets/skins/${skin.name}/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/${skin.name}/${component}-skin.css" />
<yuicompress type="css" src="${component.builddir}/assets/skins/${skin.name}/${component}.css" dest="${component.builddir}/assets/skins/${skin.name}/${component}.css" args="${yuicompressor.css.args.internal}" />
+ <var name="skin.name" unset="true" />
</sequential>
</for>
@@ -130,12 +130,12 @@
<dirset dir="${component.assets.base}/skins/" includes="*"/>
</path>
<sequential>
- <local name="skin.name"/>
<basename property="skin.name" file="@{skin.dir}"/>
<echo level="info">Concating Skin files for @{skin.dir} :: ${skin.name}</echo>
<concat destfile="${rollup.builddir}/assets/skins/${skin.name}/${rollup.component}.css" append="true" fixlastline="true">
<filelist dir="${component.builddir}/assets/skins/${skin.name}" files="${component}.css" />
</concat>
+ <var name="skin.name" unset="true" />
</sequential>
</for>
<!--concat destfile="${rollup.builddir}/assets/skins/sam/${rollup.component}.css" append="true" fixlastline="true">

0 comments on commit 5c6b166

Please sign in to comment.