merged r2190 to trunk

This commit is contained in:
Richard Worth 2009-03-03 13:26:01 +00:00
parent f5f0e95a30
commit 514a26390d

View File

@ -25,6 +25,7 @@
<property name="build.dir" value="build" />
<property name="ui.dir" value="../" />
<property name="src.dir" value="${ui.dir}/ui/" />
<property name="theme.dir" value="${ui.dir}/themes/base/" />
<property name="docs.dir" value="${ui.dir}/docs/" />
<property name="min.folder" value="${dist.dir}/ui/minified" />
@ -89,6 +90,13 @@
</concat>
<echo message="Concatenated built." />
<concat destfile="${dist.dir}/themes/base/${concatenated}.css">
<fileset dir="${theme.dir}/" includes="ui.core.css" />
<fileset dir="${theme.dir}/" includes="ui.*.css" excludes="ui.all.css, ui.core.css, ui.base.cs, ui.theme.css" />
<fileset dir="${theme.dir}/" includes="ui.theme.css" />
</concat>
<echo message="Concatenated theme." />
<mkdir dir="${dist.dir}/ui/i18n/" />
<delete file="${dist.dir}/ui/i18n/${concatenated.i18n}.js" />