Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed 3.x rollup support for skin css

  • Loading branch information...
commit 7840dd727c88f48741f938df8ac0e789b224566b 1 parent 9c20ade
Satyen Desai authored
View
2  componentbuild/3.x/module.xml
@@ -58,7 +58,7 @@
<yuicompress src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
</target>
- <target name="-rollupcss" if="rollup.skins.exist">
+ <target name="-rollupcss" if="rollupskins">
<echo level="info">Rolling up ${component}.css into ${rollup.component}.css</echo>
<concat destfile="${rollup.builddir}/assets/skins/sam/${rollup.component}.css" append="true" fixlastline="true">
<filelist dir="${component.builddir}/assets/skins/sam" files="${component}.css" />
View
25 componentbuild/shared/properties.xml
@@ -64,7 +64,21 @@
<property name="component.assets.skins.base" value="${component.assets.base}/skins" />
<property name="component.assets.skins.files" value="**/*" />
- <available file="${component.assets.base}/skins" type="dir" property="component.skins.exist"/>
+ <condition property="component.skins.exist">
+ <and>
+ <available file="${component.assets.base}/${component}-core.css" type="file" />
+ <available file="${component.assets.base}/skins" type="dir" />
+ </and>
+ </condition>
+
+ <!-- component is part of a rollup build, so rollup skins to parent -->
+ <condition property="rollupskins">
+ <and>
+ <istrue value="${rollup}" />
+ <istrue value="${component.skins.exist}" />
+ </and>
+ </condition>
+
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<!--
@@ -92,10 +106,17 @@
<condition property="rollup.skins.exist">
<and>
<istrue value="${component.rollup}" />
- <istrue value="${component.skins.exist}" />
+ <available file="${component.assets.base}/skins" type="dir" />
</and>
</condition>
+ <condition property="skins.exist">
+ <or>
+ <istrue value="${rollup.skins.exist}" />
+ <istrue value="${component.skins.exist}" />
+ </or>
+ </condition>
+
<!-- The temporary working directory used by the build process -->
<property name="workingdir" location="${component.builddir}/ant" />
View
2  componentbuild/shared/targets.xml
@@ -70,7 +70,7 @@
</copy>
</target>
- <target name="deployskins" if="component.skins.exist">
+ <target name="deployskins" if="skins.exist">
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
<fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
Please sign in to comment.
Something went wrong with that request. Please try again.