|
Lines 128-134
Link Here
|
| 128 |
<property name="repo" value="${buildDirectory}/repo" /> |
128 |
<property name="repo" value="${buildDirectory}/repo" /> |
| 129 |
<mkdir dir="${repo}" /> |
129 |
<mkdir dir="${repo}" /> |
| 130 |
<property name="p2.flavor" value="tooling" /> |
130 |
<property name="p2.flavor" value="tooling" /> |
| 131 |
<property name="p2.agent.version" value="1.0.100.${buildId}" /> |
131 |
<property name="p2.agent.version" value="1.0.100.${buildId}" /> |
| 132 |
</target> |
132 |
</target> |
| 133 |
|
133 |
|
| 134 |
<target name="build" depends="init"> |
134 |
<target name="build" depends="init"> |
|
Lines 733-775
Link Here
|
| 733 |
p2.generator.root.version |
733 |
p2.generator.root.version |
| 734 |
p2.repo |
734 |
p2.repo |
| 735 |
--> |
735 |
--> |
| 736 |
|
736 |
|
| 737 |
|
|
|
| 738 |
<target name="run.director"> |
737 |
<target name="run.director"> |
| 739 |
<delete dir="${base.builder}/configuration/.settings" includeemptydirs="true" failonerror="false" /> |
738 |
<ant antfile="${eclipse.pdebuild.scripts}/genericTargets.xml" target="runDirector" inheritAll="true"> |
| 740 |
<property name="p2.director.configArea" value="${osgi.configuration.area}" /> |
739 |
<property name="p2.repo" value="file:${p2.repo}" /> |
| 741 |
<java jar="${base.builder}/plugins/org.eclipse.equinox.launcher.jar" fork="true" jvm="${java15-home}/bin/java" failonerror="false" dir="${base.builder}" timeout="900000" output="${directorlog}" resultproperty="directorcode"> |
740 |
<property name="p2.director.iu" value="${p2.director.installIU}" /> |
| 742 |
<arg line="-vm ${java15-home}/bin/java" /> |
741 |
<property name="p2.director.installPath" value="${p2.director.install.path}" /> |
| 743 |
<arg line="-application org.eclipse.equinox.p2.director.app.application" /> |
742 |
<property name="os" value="p2.os" /> |
| 744 |
<arg line="-nosplash" /> |
743 |
<property name="ws" value="p2.ws" /> |
| 745 |
<arg line="--launcher.suppressErrors" /> |
744 |
<property name="arch" value="p2.arch" /> |
| 746 |
<arg line="-consoleLog" /> |
745 |
<property name="p2.director.log" value="${directorlog}" /> |
| 747 |
<arg line="-flavor ${p2.flavor}" /> |
746 |
<property name="equinoxLauncherJar" value="${base.builder}/plugins/org.eclipse.equinox.launcher.jar" /> |
| 748 |
<arg line="-installIU ${p2.director.installIU}" /> |
747 |
</ant> |
| 749 |
<arg line="-version ${p2.director.version}" /> |
|
|
| 750 |
<arg line="-p2.os ${p2.os}" /> |
| 751 |
<arg line="-p2.ws ${p2.ws}" /> |
| 752 |
<arg line="-p2.arch ${p2.arch}" /> |
| 753 |
<arg line="-roaming" /> |
| 754 |
<arg line="-profile ${p2.director.profile}" /> |
| 755 |
<arg line="${p2.director.extraArgs}" /> |
| 756 |
<arg line="-metadataRepository file:${p2.repo}" /> |
| 757 |
<arg line="-artifactRepository file:${p2.repo}" /> |
| 758 |
<arg line="-metadataRepositoryName ${p2.repo.name}" /> |
| 759 |
<arg line="-artifactRepositoryName ${p2.repo.name}" /> |
| 760 |
<arg line="-destination ${p2.director.install.path}" /> |
| 761 |
<arg line="-bundlepool ${p2.director.install.path}" /> |
| 762 |
<arg line="-vmargs" /> |
| 763 |
<arg line="-Declipse.p2.data.area=${p2.director.install.path}/p2" /> |
| 764 |
<arg line="-Declipse.p2.MD5Check=false" /> |
| 765 |
<arg line="-Declipse.p2.profile=profile" /> |
| 766 |
<sysproperty key="osgi.configuration.area" value="${p2.director.configArea}" /> |
| 767 |
</java> |
| 768 |
<echo message="director ${p2.director.install.path}" file="${directorlog}" append="true" /> |
748 |
<echo message="director ${p2.director.install.path}" file="${directorlog}" append="true" /> |
| 769 |
<echo message="${directorcode}" file="${directorlog}" append="true" /> |
749 |
<echo message="${directorcode}" file="${directorlog}" append="true" /> |
| 770 |
</target> |
750 |
</target> |
| 771 |
|
751 |
|
| 772 |
|
752 |
|
|
|
753 |
|
| 754 |
|
| 755 |
|
| 773 |
<target name="zip.install"> |
756 |
<target name="zip.install"> |
| 774 |
|
757 |
|
| 775 |
<property name="output.dir" value="${equinoxPostingDirectory}/${buildLabel}" /> |
758 |
<property name="output.dir" value="${equinoxPostingDirectory}/${buildLabel}" /> |
