Permalink
Browse files

Modified support for css/assets folders to reflect new combined folder

  • Loading branch information...
1 parent 7352d83 commit c1962592e643f8b416d74f981c0d6b8a13b0c68b @sdesai sdesai committed Jan 14, 2009
@@ -44,7 +44,7 @@
</target>
<target name="-concatskins" if="component.skins.exist">
- <concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.skins.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
+ <concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
<yuicompress src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
</target>
@@ -54,7 +54,7 @@
</target>
<target name="-concatskins" if="component.skins.exist">
- <concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.skins.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
+ <concatsource destfile="${component.builddir}/assets/skins/sam/${component}.css" sourcedir="${component.assets.base}" sourcefiles="${component}-core.css, skins/sam/${component}-skin.css" />
<yuicompress src="${component.builddir}/assets/skins/sam/${component}.css" dest="${component.builddir}/assets/skins/sam/${component}.css" args="${yuicompressor.css.args.internal}" />
</target>
@@ -47,12 +47,19 @@
<property name="component.basedir" location="${buildfile.dir}" />
<property name="component.srcdir" value="${component.basedir}" />
<property name="component.jsfiles.base" value="${component.srcdir}/js" />
+
+ <property name="component.assets.flatten" value="true" />
<property name="component.assets.base" value="${component.srcdir}/assets" />
- <property name="component.skins.base" location="${component.srcdir}/css" />
- <property name="component.skins.files" value="*.png, *.gif, *.jpg"/>
- <property name="component.assets.files" value="**/*.*"/>
+ <property name="component.assets.files" value="**/*" />
+
+ <property name="component.assets.legacy.flatten" value="true" />
+ <property name="component.assets.legacy.base" value="${component.assets.base}/legacy" />
+ <property name="component.assets.legacy.files" value="**/*" />
- <available file="${component.skins.base}/${component}-core.css" type="file" property="component.skins.exist"/>
+ <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"/>
<available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
<condition property="component.basefilename" value="${component}-${component.releasetype}" else="${component}">
@@ -65,6 +72,12 @@
<property name="component.logger.regex.flags" value="mg" />
<property name="component.logger.regex.byline" value="false" />
+ <!-- Default csscontext support: Adds a csscontext in front of every rule in a CSS file -->
+ <property name="component.csscontext.regex" value="CSSCONTEXT_TODO" />
+ <property name="component.csscontext.regex.replace" value="CSSCONTEXT_TODO" />
+ <property name="component.csscontext.regex.flags" value="mg" />
+ <property name="component.csscontext.regex.byline" value="false" />
+
<!-- Rollup Support -->
<property name="component.rollup" value="false"/>
<property name="component.rollup.target" value="all"/>
@@ -62,26 +62,33 @@
</target>
<target name="deployassets" if="component.assets.exist">
- <copy todir="${global.build.component.assets}" flatten="true" preservelastmodified="true">
- <fileset dir="${component.assets.base}" includes="${component.assets.files}" />
+ <copy todir="${global.build.component.assets}" flatten="${component.assets.flatten}" preservelastmodified="true">
+ <fileset dir="${component.assets.base}" includes="${component.assets.files}" excludes="skins/, legacy/" />
+ </copy>
+
+ <copy todir="${global.build.component.assets}" flatten="${component.assets.legacy.flatten}" preservelastmodified="true" failonerror="false">
+ <fileset dir="${component.assets.legacy.base}" includes="${component.assets.legacy.files}" excludes="skins/" />
</copy>
</target>
<target name="deployskins" if="component.skins.exist">
- <copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
- <fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
- </copy>
+ <!--
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
- <fileset dir="${component.skins.base}/skins/sam" includes="${component}-skin.css" />
+ <fileset dir="${component.assets.base}/skins/sam" includes="${component}-skin.css" />
</copy>
<copy todir="${global.build.component.assets}" preservelastmodified="true">
- <fileset dir="${component.skins.base}" includes="${component}-core.css, ${component}.css" />
+ <fileset dir="${component.assets.base}" includes="${component}-core.css" />
+ </copy>
+ -->
+
+ <copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
+ <fileset dir="${component.builddir}/assets/skins/sam" includes="${component}.css" />
</copy>
<copy todir="${global.build.component.assets}/skins/sam" preservelastmodified="true">
- <fileset dir="${component.skins.base}/skins/sam" includes="**/*.*" excludes="**/*.css" />
+ <fileset dir="${component.assets.skins.base}/sam" includes="${component.assets.skins.files}" />
</copy>
</target>

0 comments on commit c196259

Please sign in to comment.