Skip to content

Commit 812c274

Browse files
committed
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.
1 parent 0c3e56d commit 812c274

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

build/build.xml

+15-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<property description="Google Closure" name="closure-jar" value="${build.dir}/google-compiler-20091218.jar" />
4343
<property description="YUI Compressor" name="yuicompressor-jar" value="${build.dir}/yuicompressor-2.4.2.jar" />
4444

45-
<target name="deploy-release" depends="clean, docs-download, copy, minify, replace-version, prepend-header, zip" description="Release builder">
45+
<target name="deploy-release" depends="clean, copy, minify, replace-version, prepend-header, zip" description="Release builder">
4646
</target>
4747

4848
<target name="replace-version">
@@ -196,10 +196,22 @@
196196
<mapper type="glob" from="*.css" to="${dist.dir}/themes/base/minified/*.min.css" />
197197
<targetfile/>
198198
</apply>
199-
199+
200+
<replaceregexp match=".css" replace=".min.css" flags="g">
201+
<fileset dir="${dist.dir}/themes/base/minified/">
202+
<include name="*.base.min.css"/>
203+
<include name="*.all.min.css"/>
204+
</fileset>
205+
</replaceregexp>
206+
207+
<!-- make a copy of all theme images to ensure that relative paths in minified css files work -->
208+
<copy todir="${dist.dir}/themes/base/minified/images" >
209+
<fileset dir="${ui.dir}/themes/base/images" />
210+
</copy>
211+
200212
<echo message="Minified ui/ built." />
201213
</target>
202-
214+
203215
<target description="Copy needed folders" name="copy">
204216
<echo message="Copying files" />
205217
<mkdir dir="${dist.dir}" />

0 commit comments

Comments
 (0)