|
Lines 236-245
Link Here
|
| 236 |
<and><equals arg1="*" arg2="${arch}"/><os family="windows" /></and> |
236 |
<and><equals arg1="*" arg2="${arch}"/><os family="windows" /></and> |
| 237 |
</condition> |
237 |
</condition> |
| 238 |
|
238 |
|
|
|
239 |
<p2.director |
| 240 |
os="${p2.os}" ws="${p2.ws}" arch="${p2.arch}" |
| 241 |
flavor="${p2.flavor}" |
| 242 |
roaming="true" |
| 243 |
profile="${p2.director.profile}" |
| 244 |
metadataRepository="${p2.repo}" |
| 245 |
artifactRepository="${p2.repo}" |
| 246 |
destination="${p2.director.installPath}" |
| 247 |
bundlepool="${p2.director.bundlepool}" |
| 248 |
agentLocation="${p2.director.dataArea}"> |
| 249 |
|
| 250 |
<iu id="${p2.director.iu}" version="${p2.director.version}" /> |
| 251 |
</p2.director> |
| 252 |
|
| 253 |
<!-- |
| 239 |
<java jar="${equinoxLauncherJar}" fork="true" failonerror="false" resultproperty="p2.director.return.code" outputproperty="p2.director.java.output"> |
254 |
<java jar="${equinoxLauncherJar}" fork="true" failonerror="false" resultproperty="p2.director.return.code" outputproperty="p2.director.java.output"> |
| 240 |
<arg line="-application org.eclipse.equinox.p2.director.app.application" /> |
255 |
<arg line="-application org.eclipse.equinox.p2.director.app.application" /> |
| 241 |
<arg line="-nosplash" /> |
256 |
<arg line="-nosplash" /> |
| 242 |
<arg line="--launcher.suppressErrors" /> |
257 |
<arg line="- -launcher.suppressErrors" /> |
| 243 |
<arg line="-consoleLog" /> |
258 |
<arg line="-consoleLog" /> |
| 244 |
<arg line="-flavor ${p2.flavor}" /> |
259 |
<arg line="-flavor ${p2.flavor}" /> |
| 245 |
<arg value="-installIU" /> |
260 |
<arg value="-installIU" /> |
|
Lines 271-281
Link Here
|
| 271 |
<arg line="${p2.director.devMode}"/> |
286 |
<arg line="${p2.director.devMode}"/> |
| 272 |
<sysproperty key="osgi.configuration.area" value="${p2.director.configArea}" /> |
287 |
<sysproperty key="osgi.configuration.area" value="${p2.director.configArea}" /> |
| 273 |
</java> |
288 |
</java> |
|
|
289 |
--> |
| 274 |
<echo message="${p2.director.java.output}" /> |
290 |
<echo message="${p2.director.java.output}" /> |
| 275 |
<antcall target="logDirectorCall"/> |
291 |
<antcall target="logDirectorCall"/> |
| 276 |
<condition property="p2.director.error"> |
292 |
<!--<condition property="p2.director.error"> |
| 277 |
<isfailure code="${p2.director.return.code}" /> |
293 |
<isfailure code="${p2.director.return.code}" /> |
| 278 |
</condition> |
294 |
</condition> |
|
|
295 |
--> |
| 279 |
<fail if="p2.director.error" message="A Problem occured while running the director." /> |
296 |
<fail if="p2.director.error" message="A Problem occured while running the director." /> |
| 280 |
</target> |
297 |
</target> |
| 281 |
|
298 |
|
