diff options
Diffstat (limited to 'build/build.xml')
| -rw-r--r-- | build/build.xml | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index 96a828a11..568cc9c92 100644 --- a/build/build.xml +++ b/build/build.xml @@ -196,10 +196,22 @@ <mapper type="glob" from="*.css" to="${dist.dir}/themes/base/minified/*.min.css" /> <targetfile/> </apply> - + + <replaceregexp match=".css" replace=".min.css" flags="g"> + <fileset dir="${dist.dir}/themes/base/minified/"> + <include name="*.base.min.css"/> + <include name="*.all.min.css"/> + </fileset> + </replaceregexp> + + <!-- make a copy of all theme images to ensure that relative paths in minified css files work --> + <copy todir="${dist.dir}/themes/base/minified/images" > + <fileset dir="${ui.dir}/themes/base/images" /> + </copy> + <echo message="Minified ui/ built." /> </target> - + <target description="Copy needed folders" name="copy"> <echo message="Copying files" /> <mkdir dir="${dist.dir}" /> @@ -359,7 +371,7 @@ <path><fileset dir="${cdndist.dir}" includes="**/" excludes="**/*.MD5" /></path> <sequential> <!-- @{file} is an absolute path, use that ugly regexes to make it relative --> - <propertyregex override="yes" property="relativepath" input="@{file}" regexp=".+?googlecdn[\\/](.+)$" replace="\1"/> + <propertyregex override="yes" property="relativepath" input="@{file}" regexp=".+?cdn[\\/](.+)$" replace="\1"/> <propertyregex override="yes" property="relativepath" input="${relativepath}" regexp="\\" replace="/" global="true" /> <concat destfile="${cdndist.dir}/MANIFEST" append="yes">${relativepath} </concat> <concat destfile="${cdndist.dir}/MANIFEST" append="yes"><file file="@{file}.MD5" /></concat> |