Author: nickboldt Date: 2012-10-16 16:12:29 -0400 (Tue, 16 Oct 2012) New Revision: 44537 Modified: trunk/build/aggregate/build.xml Log: use {update.site.source.dir} instead of {project.build.directory}/site so we're targeting the correct folder; simplify if check Modified: trunk/build/aggregate/build.xml =================================================================== --- trunk/build/aggregate/build.xml 2012-10-16 20:12:22 UTC (rev 44536) +++ trunk/build/aggregate/build.xml 2012-10-16 20:12:29 UTC (rev 44537) @@ -488,7 +488,7 @@ <if> <available file="${project.build.directory}/category.xml" type="file"/> <then> - <move file="${project.build.directory}/category.xml" tofile="${project.build.directory}/site/category.xml" /> + <move file="${project.build.directory}/category.xml" tofile="${update.site.source.dir}/category.xml" /> </then> </if> <!-- support eclipse-repository (new) and eclipse-update-site (old): rename central.site-1.1.0-SNAPSHOT.zip to site_assembly.zip to be compatible with publish.sh script --> @@ -503,21 +503,15 @@ <if> <not> - <or> - <and> <!-- Old school eclipse-update-site --> - <available file="${project.build.directory}/site" type="dir" /> - <available file="${project.build.directory}/site_assembly.zip" type="file" /> - </and> - <and> <!-- eclipse-repository --> - <available file="${project.build.directory}/repository" type="dir"/> - <available file="${project.build.directory}/site_assembly.zip" type="file" /> - </and> - </or> + <and> + <available file="${update.site.source.dir}" type="dir" /> + <available file="${project.build.directory}/site_assembly.zip" type="file" /> + </and> </not> <then> <fail> -- -Could not find ${project.build.directory}/site and one of ${project.build.directory}/site_assembly.zip or ${project.build.directory}/*.zip +Could not find ${update.site.source.dir} and one of ${project.build.directory}/site_assembly.zip Cannot adjust an update site w/o first building it! -- Using maven: mvn3 clean install -U -B -fae -q -e