diff options
| author | Doug Schaefer | 2010-10-08 14:53:15 +0000 |
|---|---|---|
| committer | Doug Schaefer | 2010-10-08 14:53:15 +0000 |
| commit | 45c5d683094fd0874d86e0f1899a7ca9d597d7fc (patch) | |
| tree | a37352fbe22e72a79c74580ff95828ebc0134d50 /releng/org.eclipse.cdt.releng | |
| parent | dba3e82dca354b56f869dcbf66d74ab07f6808f0 (diff) | |
| download | org.eclipse.cdt-45c5d683094fd0874d86e0f1899a7ca9d597d7fc.tar.gz org.eclipse.cdt-45c5d683094fd0874d86e0f1899a7ca9d597d7fc.tar.xz org.eclipse.cdt-45c5d683094fd0874d86e0f1899a7ca9d597d7fc.zip | |
Get rid of the Java 1.5 property. It's no longer needed now that we build on x86 linux.
Diffstat (limited to 'releng/org.eclipse.cdt.releng')
| -rw-r--r-- | releng/org.eclipse.cdt.releng/build.xml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml index 11412e9ed22..950f5b516c5 100644 --- a/releng/org.eclipse.cdt.releng/build.xml +++ b/releng/org.eclipse.cdt.releng/build.xml @@ -43,8 +43,6 @@ <property name="tagname" value="v${timestamp}"/> <property name="testReports" value="${zipsdir}/testReports"/> <property name="junit-report-output" value="${testReports}"/> - <!--property name="jvm1.5" value="/opt/public/common/ibm-java2-ppc-50/bin/java"/--> - <property name="jvm1.5" value="java"/> <condition property="onWindows"> <os family="windows"/> </condition> @@ -185,7 +183,7 @@ <target name="pack" depends="init" unless="hasErrors"> <echo message="Pack200" /> <property name="launcher" value="${basedir}/tools/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar"/> - <java jar="${launcher}" fork="true" timeout="10800000" jvm="${jvm1.5}" failonerror="true" maxmemory="768m" dir="${buildDirectory}/eclipse"> + <java jar="${launcher}" fork="true" timeout="10800000" failonerror="true" maxmemory="768m" dir="${buildDirectory}/eclipse"> <arg line="-application org.eclipse.update.core.siteOptimizer" /> <arg line="-jarProcessor"/> <arg line="-verbose"/> @@ -222,8 +220,7 @@ <echo message="Generate p2 Metadata" /> <property name="p2site" value="${zipsdir}/p2"/> <property name="launcher" value="${basedir}/tools/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar"/> - <!--java jar="${launcher}" fork="true" timeout="10800000" jvm="${jvm1.5}" failonerror="true" maxmemory="768m" error="${zipsdir}/p2errorlog.txt" dir="${buildDirectory}/eclipse" output="${zipsdir}/p2metadata.txt"--> - <java jar="${launcher}" fork="true" timeout="10800000" jvm="${jvm1.5}" failonerror="true" maxmemory="768m" dir="${buildDirectory}/eclipse"> + <java jar="${launcher}" fork="true" timeout="10800000" failonerror="true" maxmemory="768m" dir="${buildDirectory}/eclipse"> <arg line="-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator" /> <arg line="-updateSite ${p2site}"/> <arg line="-site file:${p2site}/site.xml"/> |