diff --git a/releng.wtpbuilder/scripts/dependency/build.xml b/releng.wtpbuilder/scripts/dependency/build.xml index 870abc3e24343228503fe2566126ca3cebfd9125..f5ea15a4aeaafa65e5e12642fc4d3688e796a0c0 100644 --- a/releng.wtpbuilder/scripts/dependency/build.xml +++ b/releng.wtpbuilder/scripts/dependency/build.xml @@ -245,6 +245,7 @@ <replace file="${buildDirectory}/dependency.${groupId}.xml" value="${dependency.properties}"> <replacetoken>@dependencyProperties@</replacetoken> </replace> + <ant antfile="${buildDirectory}/dependency.${groupId}.xml" target="installRepo"> <property name="install.destination" value="${install.destination}" /> <!-- hard code for right now --> diff --git a/releng.wtpbuilder/scripts/dependency/template.xml b/releng.wtpbuilder/scripts/dependency/template.xml index 83ca83844754522887b7a59a1044acec9ed12f46..76b710b1233ffbf35bd893010227a289893630da 100644 --- a/releng.wtpbuilder/scripts/dependency/template.xml +++ b/releng.wtpbuilder/scripts/dependency/template.xml @@ -51,10 +51,15 @@ value="${@dependencyGroupId@name}" /> <property name="dependency.description" - value="${@dependencyGroupId@url}" /> + value="${@dependencyGroupId@descriptions}" /> <property name="dependency.url" value="${@dependencyGroupId@url}" /> + + <property + name="dependency.tobeinstalledfeaturegroups" + value="${@dependencyGroupId@tobeinstalledfeaturegroups}" /> + <property name="local.cache.dir" value="." /> @@ -227,10 +232,10 @@ https://bugs.eclipse.org/bugs/show_bug.cgi?id=283968 --> <echo message="install repo for groupId: ${groupId}" /> - + <property name="tobeinstalledrepo" value="${testRoot}/repos/${groupId}" /> <mkdir dir="${testRoot}/repos/${groupId}" /> <exec dir="." executable="unzip"> - <arg line="-o -qq ${local.cache.dir}/${dependency.file} -d ${testRoot}/repos/${groupId}" /> + <arg line="-o -qq ${local.cache.dir}/${dependency.file} -d ${tobeinstalledrepo}" /> </exec> <!-- <unzip @@ -239,7 +244,74 @@ overwrite="true" /> --> - + <java + taskname="p2Director Install" + fork="true" + resultProperty="p2DirectorInstallResult" + failonerror="true" + timeout="3600" + dir="${testRoot}" + jvm="${env.JAVA_6_HOME}/bin/java" + classname="org.eclipse.equinox.launcher.Main"> + <classpath> + <fileset + dir="${testRoot}/eclipse/plugins"> + <include + name="org.eclipse.equinox.launcher_*.jar"/> + </fileset> + </classpath> + <jvmarg + value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/> + <arg + value="-nosplash"/> + <arg + value="-debug"/> + <arg + value="-consolelog"/> + <arg + value="-data"/> + <arg + value="${testRoot}/p2DirectorInstall"/> + <arg + value="-application"/> + <arg + value="org.eclipse.equinox.p2.director"/> + <arg + value="-destination"/> + <arg + value="${testRoot}/eclipse"/> + <arg + value="-profile"/> + <arg + value="SDKProfile"/> + <arg + value="-repository"/> + <arg + value="${tobeinstalledrepo}"/> + + + <arg + value="-installIU"/> + <arg + value="${tobeInstalledfeaturegroups}"/> + + + + <!-- make sure our forked env has a DISPLAY --> + <env + key="DISPLAY" + value="${env.DISPLAY}"/> + <redirector + output="${testRoot}/results/fullOutput.txt" + error="${testRoot}/results/fullErrorLog.txt"/> + <arg + value="-vmArgs"/> + <arg + value="-Declipse.p2.data.area=${testRoot}/eclipse/p2"/> + </java> + <echo + message="p2DirectorInstallResult: ${p2DirectorInstallResult}"/> +