|
Lines 65-73
Link Here
|
| 65 |
</or> |
65 |
</or> |
| 66 |
</and> |
66 |
</and> |
| 67 |
</condition> |
67 |
</condition> |
| 68 |
<condition property="build.libgnomeproxy"> |
|
|
| 69 |
<equals arg1="${buildArch}" arg2="x86" /> |
| 70 |
</condition> |
| 71 |
|
68 |
|
| 72 |
<target name="setLib64Dir" if="setLib64"> |
69 |
<target name="setLib64Dir" if="setLib64"> |
| 73 |
<property name="libDir" value="lib64" /> |
70 |
<property name="libDir" value="lib64" /> |
|
Lines 247-253
Link Here
|
| 247 |
<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" /> |
244 |
<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" /> |
| 248 |
<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" /> |
245 |
<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" /> |
| 249 |
<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" /> |
246 |
<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" /> |
| 250 |
<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" /> |
|
|
| 251 |
<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" /> |
247 |
<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" /> |
| 252 |
<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" /> |
248 |
<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" /> |
| 253 |
<!-- end eclipse-build-only patches --> |
249 |
<!-- end eclipse-build-only patches --> |
|
Lines 339-351
Link Here
|
| 339 |
<echo file="testsbuild-stamp" /> |
335 |
<echo file="testsbuild-stamp" /> |
| 340 |
</target> |
336 |
</target> |
| 341 |
|
337 |
|
| 342 |
<target name="compile.libgnomeproxy" if="build.libgnomeproxy"> |
|
|
| 343 |
<!-- build libgnomeproxy --> |
| 344 |
<exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux" executable="make" failonerror="true" /> |
| 345 |
<copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.linux.${buildArch}/" /> |
| 346 |
<move file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.${buildArch}/" /> |
| 347 |
</target> |
| 348 |
|
| 349 |
<target name="compilelibs" unless="compilelibs.complete"> |
338 |
<target name="compilelibs" unless="compilelibs.complete"> |
| 350 |
<delete verbose="true"> |
339 |
<delete verbose="true"> |
| 351 |
<fileset dir="${buildDirectory}/features/org.eclipse.equinox.executable"> |
340 |
<fileset dir="${buildDirectory}/features/org.eclipse.equinox.executable"> |
|
Lines 355-361
Link Here
|
| 355 |
<include name="**/*.so" /> |
344 |
<include name="**/*.so" /> |
| 356 |
</fileset> |
345 |
</fileset> |
| 357 |
</delete> |
346 |
</delete> |
| 358 |
<ant antfile="build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" /> |
|
|
| 359 |
|
347 |
|
| 360 |
<property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" /> |
348 |
<property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" /> |
| 361 |
<exec dir="${launcherlibs}/library/gtk/" executable="sh" failonerror="true"> |
349 |
<exec dir="${launcherlibs}/library/gtk/" executable="sh" failonerror="true"> |
|
Lines 375-382
Link Here
|
| 375 |
<exec dir="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" /> |
363 |
<exec dir="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" /> |
| 376 |
<move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.linux.${buildArch}/os/linux/${buildArch}"> |
364 |
<move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.linux.${buildArch}/os/linux/${buildArch}"> |
| 377 |
</move> |
365 |
</move> |
| 378 |
<!-- build libgnomeproxy --> |
|
|
| 379 |
<antcall target="compile.libgnomeproxy" /> |
| 380 |
<!-- build libupdate --> |
366 |
<!-- build libupdate --> |
| 381 |
<ant dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src" antfile="build.xml" /> |
367 |
<ant dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src" antfile="build.xml" /> |
| 382 |
|
368 |
|
