Author: nickboldt Date: 2011-11-24 10:37:41 -0500 (Thu, 24 Nov 2011) New Revision: 36619 Modified: trunk/build/aggregate/build.xml Log: can now inherit associate.properties from parent folder (eg., site/sources/ could pull properties from site/ folder) Modified: trunk/build/aggregate/build.xml =================================================================== --- trunk/build/aggregate/build.xml 2011-11-24 15:14:11 UTC (rev 36618) +++ trunk/build/aggregate/build.xml 2011-11-24 15:37:41 UTC (rev 36619) @@ -31,10 +31,11 @@ <condition property="associate.properties" value="${output.dir}/associate.properties"> <available file="${output.dir}/associate.properties" type="file" /> </condition> - <condition property="associate.properties" value="associate.properties"> - <available file="associate.properties" type="file" /> + <condition property="associate.properties" value="${output.dir}/../associate.properties"> + <available file="${output.dir}/../associate.properties" type="file" /> </condition> <property file="${associate.properties}" /> + <echo level="verbose">Loaded associate sites from ${associate.properties}</echo> <property name="web.content.files" value="index.html, web/*.css, README*, *directory.xml" /> <target name="init">