Permalink
Browse files

Build: Replace filename references in base/all.min.css. Fixes #6634 -…

… minified css does not @include minified css files.

Also make a copy of images to fix relative paths.
  • Loading branch information...
1 parent 0c3e56d commit 812c274a3376c4fee4d9705628a629d185bc86a9 @jzaefferer jzaefferer committed Nov 19, 2010
Showing with 15 additions and 3 deletions.
  1. +15 −3 build/build.xml
View
@@ -42,7 +42,7 @@
<property description="Google Closure" name="closure-jar" value="${build.dir}/google-compiler-20091218.jar" />
<property description="YUI Compressor" name="yuicompressor-jar" value="${build.dir}/yuicompressor-2.4.2.jar" />
- <target name="deploy-release" depends="clean, docs-download, copy, minify, replace-version, prepend-header, zip" description="Release builder">
+ <target name="deploy-release" depends="clean, copy, minify, replace-version, prepend-header, zip" description="Release builder">
</target>
<target name="replace-version">
@@ -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}" />

0 comments on commit 812c274

Please sign in to comment.