Permalink
Browse files

Changed componentbuild infrastructure files to use relative paths

from "ant.file.[projectName]" as suggested by ANT Import docs,
when importing other infrastructure files instead of using
builddir, which wouldn't work when src area for a component
existed at a depth different from the yui src structure.

Regression tested with...

    yui2: calendar, grids
    yui3: json, attribute, console, widget

.. to cover lang, skins, modules, rollups
  • Loading branch information...
1 parent d3db9bf commit 9b5587f4e5f32cf8fb4fb35d16e96ca3f1625142 @sdesai sdesai committed Apr 6, 2010
View
6 componentbuild/2.x/bootstrap.xml
@@ -2,7 +2,9 @@
<project name="YuiDefaultProperties">
<property name="yui.version" value="2"/>
- <import file="${builddir}/shared/properties.xml" description="Properties common to yui2/yui3" />
- <import file="${targets}" description="Build Targets" />
+ <dirname property="bootstrap.basedir" file="${ant.file.YuiDefaultProperties}"/>
+
+ <import file="${bootstrap.basedir}/../shared/properties.xml" description="Properties common to yui2/yui3" />
+ <import file="${bootstrap.basedir}/${targets}" description="Build Targets" />
</project>
View
3 componentbuild/2.x/module.xml
@@ -2,7 +2,8 @@
<project name="YuiModuleTargets">
- <import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
+ <dirname property="module.basedir" file="${ant.file.YuiModuleTargets}"/>
+ <import file="${module.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore, buildskins" />
<target name="buildskins" depends="-buildskins" />
View
7 componentbuild/3.x/bootstrap.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YuiDefaultProperties">
-
<!-- Default Library Version Build -->
<property name="yui.version" value="3"/>
<property name="yui.variable" value="Y"/>
<property name="component.logger.regex" value="^.*?(?:logger|Y.log).*?(?:;|\).*;|(?:\r?\n.*?)*?\).*;).*;?.*?\r?\n" />
- <import file="${builddir}/shared/properties.xml" description="Properties common to yui2/yui3" />
+ <dirname property="bootstrap.basedir" file="${ant.file.YuiDefaultProperties}"/>
+
+ <import file="${bootstrap.basedir}/../shared/properties.xml" description="Properties common to yui2/yui3" />
+ <import file="${bootstrap.basedir}/${targets}" description="Build Targets" />
- <import file="${targets}" description="Build Targets" />
</project>
View
3 componentbuild/3.x/module.xml
@@ -2,7 +2,8 @@
<project name="YuiModuleTargets">
- <import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
+ <dirname property="module.basedir" file="${ant.file.YuiModuleTargets}"/>
+ <import file="${module.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore, -rollupjs, buildskins, buildlangs" />
<target name="buildskins" depends="-buildskins, -rollupcss" />
View
3 componentbuild/3.x/rollup.xml
@@ -2,7 +2,8 @@
<project name="YuiRollupTargets">
- <import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
+ <dirname property="rolluptargets.basedir" file="${ant.file.YuiRollupTargets}"/>
+ <import file="${rolluptargets.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildmodules" description="Create component.js"></target>
View
3 componentbuild/shared/cssmodule.xml
@@ -2,7 +2,8 @@
<project name="YuiCssModuleTargets">
- <import file="${builddir}/shared/targets.xml" description="Targets common to Rollup/Module" />
+ <dirname property="cssmodule.basedir" file="${ant.file.YuiCssModuleTargets}"/>
+ <import file="${cssmodule.basedir}/../shared/targets.xml" description="Targets common to Rollup/Module" />
<target name="build" depends="buildcore" />
View
2 componentbuild/shared/properties.xml
@@ -151,7 +151,7 @@
<istrue value="${component.rollup}"/>
</condition>
- <condition property="targets" value="${builddir}/shared/cssmodule.xml" else="${targetbase}.xml">
+ <condition property="targets" value="../shared/cssmodule.xml" else="${targetbase}.xml">
<isset property="component.cssfiles" />
</condition>
View
3 componentbuild/shared/targets.xml
@@ -21,7 +21,8 @@
<echo level="info"> global.build.component : ${global.build.component}</echo>
<echo level="info"> global.build.component.assets : ${global.build.component.assets}</echo>
- <import file="${builddir}/shared/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
+ <dirname property="targets.basedir" file="${ant.file.YuiSharedTargets}"/>
+ <import file="${targets.basedir}/macrolib.xml" description="Macrodef definitions - jslint, yuicompessor, registerversion" />
<target name="all" depends="local, deploy" description="Build and Deploy to Global Build Directory" />
<target name="local" depends="clean, init, build, minify, lint" description="Build and Deploy to Local Build Directory" />

0 comments on commit 9b5587f

Please sign in to comment.