Permalink
Browse files

Updated 3.x component build infrastructure in prep for 2.x cleanup, n…

…ew dir structure - pulled out reusable properties/targets
  • Loading branch information...
1 parent 895a1f2 commit 0d044e798783a070d3c7195413ee31947ce374ba @sdesai sdesai committed Dec 30, 2008
@@ -1,78 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiDefaultProperties">
- <taskdef resource="antcontrib.properties">
- <classpath>
- <pathelement location="${builddir}/lib/ant-contrib/ant-contrib-1.0b3-modified.jar" />
- </classpath>
- </taskdef>
-
- <dirname property="buildfile.dir" file="${ant.file}" />
-
- <property name="builddir" location="../../../builder/componentbuild" />
- <property name="srcdir" location="../.." />
-
<!-- Default Library Version Build -->
<property name="yui.version" value="3"/>
<property name="yui.variable" value="Y"/>
- <property name="buildfiles.eol" value="lf"/>
-
- <!-- Supporting Tools -->
- <property name="jsmin.jar" location="${builddir}/lib/jsmin/jsmin.jar" />
- <property name="rhino.jar" location="${builddir}/lib/rhino/js.jar" />
- <property name="jslintconsole.js" location="${builddir}/lib/jslint/jslint-console.js" />
- <property name="jslintsrc.js" location="${builddir}/lib/jslint/fulljslint.js" />
- <property name="yuicompressor.jar" location="${builddir}/lib/yuicompressor/yuicompressor-2.4.jar" />
- <property name="yuicompressor.args" value="-v --disable-optimizations --preserve-semi --line-break 6000" />
-
- <!-- Top Level Directories (e.g. 3.x/build, 3.x/src) -->
- <property name="global.build.base" location="${srcdir}/build" />
- <property name="global.build.component" location="${global.build.base}/${component}" />
- <property name="global.build.component.assets" location="${global.build.component}/assets" />
-
- <!-- Component Defaults -->
- <property name="component.module" value="${component}" />
- <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.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.rollup" value="false"/>
-
- <available file="${component.skins.base}" type="dir" property="component.skins.exist"/>
- <available file="${component.assets.base}" type="dir" property="component.assets.exist"/>
-
- <condition property="component.builddir" value="${component.basedir}/build_rollup_tmp" else="${component.basedir}/build_tmp">
- <istrue value="${component.rollup}"/>
- </condition>
-
- <property name="workingdir" location="${component.builddir}/ant" />
-
- <condition property="component.basefilename" value="${component}-${component.releasetype}" else="${component}">
- <isset property="component.releasetype"/>
- </condition>
-
- <!-- Default Logger Regex values if not provided -->
<property name="component.logger.regex" value="^.*?(?:logger|Y.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
- <property name="component.logger.regex.replace" value="" />
- <property name="component.logger.regex.flags" value="mg" />
- <property name="component.logger.regex.byline" value="false" />
- <!-- Rollup Support -->
- <property name="component.rollup.target" value="all"/>
-
- <condition property="rollup.skins.exist">
- <and>
- <istrue value="${component.rollup}" />
- <istrue value="${component.skins.exist}" />
- </and>
- </condition>
+ <import file="${builddir}/shared/properties.xml" description="Properties common to yui2/yui3" />
<condition property="targetdefs" value="rollup.xml" else="module.xml">
<istrue value="${component.rollup}"/>
</condition>
<import file="${targetdefs}" description="Build Targets" />
-</project>
+</project>
@@ -2,7 +2,7 @@
<project name="YuiModuleTargets">
- <import file="common.xml" description="Targets common to Rollup/Module" />
+ <import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="corebuild, -rollupjs, skinsbuild" />
<target name="skinsbuild" depends="-skinsbuild, -rollupcss" />
@@ -2,7 +2,7 @@
<project name="YuiRollupTargets">
- <import file="common.xml" description="Targets common to Rollup/Module" />
+ <import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildmodules" description="Create component.js"></target>
@@ -34,4 +34,4 @@
<addrollup module="${component.module}" file="${component.builddir}/${component.basefilename}-debug.js" details="${component.details.hash}" />
</target>
-->
-</project>
+</project>
Oops, something went wrong.

0 comments on commit 0d044e7

Please sign in to comment.