This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, upstream-3.6 has been updated via d57ae342b6d4013ff6ef79c155d8fd56c338b702 (commit) from 2695d071a39ba0c6801b723e0e3e69b0cad6a1b6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 7 +++++++ build.xml | 14 ++++++++++++-- pdebuild.xml | 4 ++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0381055..49a4875 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-07-27 Andrew Overholt <overh...@redhat.com> + + Bug #320328 + + * pdebuild.xml: Use ${label} instead of hard-coding "3.5.0". + * build.xml: Use PDE Build of built SDK to build SDK tests. + 2010-07-19 Andrew Overholt <overh...@redhat.com> Bug #319110 diff --git a/build.xml b/build.xml index 0c44879..72c775c 100644 --- a/build.xml +++ b/build.xml @@ -395,12 +395,22 @@ --> <target name="buildTests" depends="provision.sdk,applyTestPatches" unless="testsbuild.complete"> + <property name="eclipse.pdebuild.scripts" value="${basedir}/bootstrap/plugins/org.eclipse.pde.build/scripts" /> + + <path id="pdebuilddir.id"> + <dirset dir="${buildDirectory}/installation/plugins"> + <include name="org.eclipse.pde.build_*"/> + </dirset> + </path> + + <property name="pdebuilddir" refid="pdebuilddir.id"/> + <!-- Test framework --> <exec executable="${buildDirectory}/installation/eclipse"> <arg line="-nosplash " /> <arg line="-consolelog " /> <arg line="-application org.eclipse.ant.core.antRunner " /> - <arg line="-buildfile ${eclipse.pdebuild.scripts}/build.xml" /> + <arg line="-buildfile ${pdebuilddir}/scripts/build.xml" /> <arg line="-propertyfile ${basedir}/build.properties " /> <arg line="-DbuildDirectory=${testsBuildDirectory} " /> <arg line="-Dtype=feature -Did=org.eclipse.test " /> @@ -413,7 +423,7 @@ <arg line="-nosplash " /> <arg line="-consolelog " /> <arg line="-application org.eclipse.ant.core.antRunner " /> - <arg line="-buildfile ${eclipse.pdebuild.scripts}/build.xml" /> + <arg line="-buildfile ${pdebuilddir}/scripts/build.xml" /> <arg line="-propertyfile ${basedir}/build.properties " /> <arg line="-DbuildDirectory=${testsBuildDirectory} " /> <arg line="-Dtype=feature -Did=org.eclipse.sdk.tests " /> diff --git a/pdebuild.xml b/pdebuild.xml index d585267..87f0584 100644 --- a/pdebuild.xml +++ b/pdebuild.xml @@ -351,9 +351,9 @@ </delete> <!-- osgi can only be found if _ is in name --> <symlink action="delete" - link="bootstrap/plugins/org.eclipse.osgi_3.5.0.jar" + link="bootstrap/plugins/org.eclipse.osgi_${label}.jar" failonerror="false" /> - <symlink link="bootstrap/plugins/org.eclipse.osgi_3.5.0.jar" + <symlink link="bootstrap/plugins/org.eclipse.osgi_${label}.jar" resource="org.eclipse.osgi.jar" overwrite="true" /> </target> hooks/post-receive -- eclipse - Powerful IDE written in java - Debian package. _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits