WARNING! Access to this system is limited to authorised users only.
Unauthorised users may be subject to prosecution.
Unauthorised access to this system is a criminal offence under Australian law (Federal Crimes Act 1914 Part VIA)
It is a criminal offence to:
(1) Obtain access to data without authority. -Penalty 2 years imprisonment.
(2) Damage, delete, alter or insert data without authority. -Penalty 10 years imprisonment.
User activity is monitored and recorded. Anyone using this system expressly consents to such monitoring and recording.

To protect your data, the CISO officer has suggested users to enable 2FA as soon as possible.
Currently 2.7% of users enabled 2FA.

Commit 4a4e4978 authored by John Zhang's avatar John Zhang
Browse files

Merge branch 'version-bump-eclipse' into 'master'

Version bump eclipse

See merge request !2
parents 7cc724dc 77fcf97a
Pipeline #2041 failed with stage
in 25 minutes and 27 seconds
......@@ -11,11 +11,11 @@
<property file="dacapo.properties"/>
<property name="bm-name" value="eclipse"/>
<property name="bm-version" value="3.5.1"/>
<property name="bm-drop" value="200909170800"/>
<property name="bm-url" value="http://archive.eclipse.org/eclipse/downloads/drops/R-${bm-version}-${bm-drop}"/>
<property name="bm-src" value="eclipse-SDK-${bm-version}-macosx-cocoa.tar.gz"/>
<property name="osgi-bootstrap-jar" value="org.eclipse.osgi_3.5.1.R35x_v20090827.jar"/>
<property name="bm-version" value="4.7.2"/>
<property name="bm-drop" value="201711300510"/>
<property name="bm-url" value="http://archive.eclipse.org/eclipse/downloads/drops4/R-${bm-version}-${bm-drop}"/>
<property name="bm-src" value="eclipse-SDK-${bm-version}-macosx-cocoa-x86_64.tar.gz"/>
<property name="osgi-bootstrap-jar" value="org.eclipse.osgi_3.12.50.v20170928-1321.jar"/>
<import file="../common.xml"/>
<property name="eclipse-top" value="${bm-build-dir}/eclipse"/>
......@@ -37,7 +37,14 @@
</antcall>
</target>
<target name="unpack" depends="untar"/>
<target name="moveEclipse">
<copy todir="${bm-build-dir}/eclipse/">
<fileset dir="${bm-build-dir}/Eclipse.app/Contents/Eclipse"/>
</copy>
<delete dir="${bm-build-dir}/Eclipse.app"/>
</target>
<target name="unpack" depends="untar, moveEclipse"/>
<target name="bm-build">
</target>
......@@ -49,20 +56,23 @@
<include name="eclipse-testing/eclipse-junit-tests-M*.zip"/>
</patternset>
</unzip>
<unzip dest="${bm-build-dir}/eclipse-testing/">
<fileset dir="${bm-build-dir}/eclipse-testing/">
<unzip dest="${bm-build-dir}/eclipse-testing/eclipse">
<fileset dir="${bm-build-dir}/eclipse-testing">
<include name="eclipse-junit-tests-M*.zip"/>
</fileset>
<patternset>
<include name="eclipse/plugins/org.eclipse.jdt.core.tests.performance*/${workspace-full}.zip"/>
<include name="plugins/org.eclipse.jdt.core.tests.binaries*"/>
</patternset>
</unzip>
<unzip dest="${bm-build-dir}/eclipse-testing/eclipse" >
<fileset dir="${bm-build-dir}/eclipse-testing/eclipse/plugins"/>
</unzip>
<unzip dest="${bm-build-dir}/eclipse-testing/workspace">
<fileset dir="${bm-build-dir}/eclipse-testing/eclipse">
<include name="**/${workspace-full}.zip"/>
</fileset>
</unzip>
<!--Create two complimentary zips for default and large workspaces-->
<!-- Create two complimentary zips for default and large workspaces -->
<zip destfile="${bm-build-dir}/${workspace-default}.zip" basedir="${bm-build-dir}/eclipse-testing/workspace">
<patternset includesfile="${bm-files}/bundles-default.lst"/>
</zip>
......@@ -83,17 +93,14 @@
<!-- build the eclipse plugin, which is necessary to fire up eclipse from within our harness -->
<target name="plugin" depends="unpack">
<exec executable="${ant.home}/bin/ant" dir="${bm-files}/plugin" failonerror="yes">
<arg line="clean"/>
<arg line="-Dplugin.destination=${bm-build-dir}/eclipse/plugins/"/>
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
<exec executable="${ant.home}/bin/ant" dir="${bm-files}/plugin" failonerror="yes">
<arg line="build.update.jar"/>
<arg line="-Dplugin.destination=${bm-build-dir}/eclipse/plugins/"/>
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
<patch patchfile="${bm-files}/eclipse.patch" dir="${bm-build-dir}" strip="1"/>
<ant antfile="build.xml" dir="${bm-files}/plugin" inheritall="false">
<property name="plugin.destination" location="${bm-build-dir}/eclipse/plugins/"/>
<target name="clean"/>
<target name="build.update.jar"/>
</ant>
<!-- add our bundle to the configurator metadata -->
<patch patchfile="${bm-files}/eclipse.patch" dir="${bm-build-dir}" strip="0"/>
</target>
<!-- Create the eclipse data file -->
......@@ -108,7 +115,6 @@
<fileset dir="${bm-build-dir}" includesfile="${bm-files}/bundles-stub-required.lst"/>
</touch>
-->
<unzip dest="${bm-build-dir}/" src="${bm-data}/dummyjre.zip"/>
<!-- Install the test data -->
<zip destfile="${bm-dat}/${bm-name}.zip" basedir="${bm-build-dir}" excludes="eclipse/plugins/**">
......
eclipse/plugins/com.ibm.icu_4.0.1.v20090822.jar
eclipse/plugins/com.ibm.icu_58.2.0.v20170418-1837.jar
eclipse/plugins/org.dacapo.eclipse_1.0.0.jar
eclipse/plugins/org.eclipse.core.commands_3.5.0.I20090525-2000.jar
eclipse/plugins/org.eclipse.core.contenttype_3.4.1.R35x_v20090826-0451.jar
eclipse/plugins/org.eclipse.core.expressions_3.4.100.v20090429-1800.jar
eclipse/plugins/org.eclipse.core.filesystem_1.2.0.v20090507.jar
eclipse/plugins/org.eclipse.core.jobs_3.4.100.v20090429-1800.jar
eclipse/plugins/org.eclipse.core.resources_3.5.1.R35x_v20090826-0451.jar
eclipse/plugins/org.eclipse.core.runtime_3.5.0.v20090525.jar
eclipse/plugins/org.eclipse.core.variables_3.2.200.v20090521.jar
eclipse/plugins/org.eclipse.debug.core_3.5.0.v20090526-1600.jar
eclipse/plugins/org.eclipse.equinox.app_1.2.0.v20090520-1800.jar
eclipse/plugins/org.eclipse.equinox.common_3.5.1.R35x_v20090807-1100.jar
eclipse/plugins/org.eclipse.equinox.preferences_3.2.300.v20090520-1800.jar
eclipse/plugins/org.eclipse.equinox.registry_3.4.100.v20090520-1800.jar
eclipse/plugins/org.eclipse.equinox.simpleconfigurator_1.0.101.R35x_v20090807-1100.jar
eclipse/plugins/org.eclipse.jdt.core_3.5.1.v_972_R35x.jar
eclipse/plugins/org.eclipse.jdt.launching_3.5.0.v20090527.jar
eclipse/plugins/org.eclipse.osgi_3.5.1.R35x_v20090827.jar
eclipse/plugins/org.eclipse.text_3.5.0.v20090513-2000.jar
eclipse/plugins/org.eclipse.jdt.debug_3.5.0.v20090526/**
eclipse/plugins/org.eclipse.core.commands_3.9.0.v20170530-1048.jar
eclipse/plugins/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar
eclipse/plugins/org.eclipse.core.expressions_3.6.0.v20170207-1037.jar
eclipse/plugins/org.eclipse.core.filesystem_1.7.0.v20170406-1337.jar
eclipse/plugins/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar
eclipse/plugins/org.eclipse.core.resources_3.12.0.v20170417-1558.jar
eclipse/plugins/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar
eclipse/plugins/org.eclipse.core.variables_3.4.0.v20170113-2056.jar
eclipse/plugins/org.eclipse.debug.core_3.11.0.v20170605-1534.jar
eclipse/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar
eclipse/plugins/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar
eclipse/plugins/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar
eclipse/plugins/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar
eclipse/plugins/org.eclipse.equinox.simpleconfigurator_1.2.0.v20170110-1705.jar
eclipse/plugins/org.eclipse.jdt.core_3.13.100.v20171123-1049.jar
eclipse/plugins/org.eclipse.jdt.launching_3.9.51.v20171114-1018.jar
eclipse/plugins/org.eclipse.osgi_3.12.50.v20170928-1321.jar
eclipse/plugins/org.eclipse.text_3.6.100.v20170203-0814.jar
eclipse/plugins/org.eclipse.jdt.debug_3.11.50.v20170920-1717/**
eclipse/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar
eclipse/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar
eclipse/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar
eclipse/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar
eclipse/plugins/org.eclipse.equinox.frameworkadmin_1.0.100.v20090520-1905.jar
eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox_1.0.100.v20090520-1905.jar
eclipse/plugins/org.eclipse.equinox.p2.artifact.repository_1.0.101.R35x_v20090721.jar
eclipse/plugins/org.eclipse.equinox.p2.core_1.0.101.R35x_v20090819.jar
eclipse/plugins/org.eclipse.equinox.p2.director_1.0.100.v20090520-1905.jar
eclipse/plugins/org.eclipse.equinox.p2.directorywatcher_1.0.100.v20090525.jar
eclipse/plugins/org.eclipse.equinox.p2.engine_1.0.101.R35x_v20090825.jar
eclipse/plugins/org.eclipse.equinox.p2.extensionlocation_1.0.100.v20090520-1905.jar
eclipse/plugins/org.eclipse.equinox.p2.garbagecollector_1.0.100.v20090520-1905.jar
eclipse/plugins/org.eclipse.equinox.p2.jarprocessor_1.0.100.v20090520-1905.jar
eclipse/plugins/org.eclipse.equinox.p2.metadata_1.0.100.v20090525.jar
eclipse/plugins/org.eclipse.equinox.p2.metadata.repository_1.0.101.R35x_v20090812.jar
eclipse/plugins/org.eclipse.equinox.p2.publisher_1.0.0.v20090527-1812.jar
eclipse/plugins/org.eclipse.equinox.p2.repository_1.0.1.v20090901-1041.jar
eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_1.0.101.R35x_20090820-1821.jar
eclipse/plugins/org.eclipse.equinox.security_1.0.100.v20090520-1800.jar
eclipse/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_1.0.100.v20090520-1905.jar
eclipse/plugins/org.eclipse.equinox.util_1.0.100.v20090520-1800.jar
eclipse/plugins/org.eclipse.osgi.services_3.2.0.v20090520-1800.jar
eclipse/plugins/org.sat4j.core_2.1.0.v20090520.jar
eclipse/plugins/org.sat4j.pb_2.1.0.v20090520.jar
eclipse/plugins/org.eclipse.ecf_3.8.0.v20170104-0657.jar
eclipse/plugins/org.eclipse.ecf.filetransfer_5.0.0.v20160817-1024.jar
eclipse/plugins/org.eclipse.ecf.identity_3.8.0.v20161203-2153.jar
eclipse/plugins/org.eclipse.ecf.provider.filetransfer_3.2.300.v20161203-1840.jar
eclipse/plugins/org.eclipse.equinox.frameworkadmin_2.0.300.v20160504-1450.jar
eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox_1.0.800.v20170524-1345.jar
eclipse/plugins/org.eclipse.equinox.p2.artifact.repository_1.1.650.v20170928-1405.jar
eclipse/plugins/org.eclipse.equinox.p2.core_2.4.101.v20170906-1259.jar
eclipse/plugins/org.eclipse.equinox.p2.director_2.3.300.v20160504-1450.jar
eclipse/plugins/org.eclipse.equinox.p2.directorywatcher_1.1.100.v20150423-1455.jar
eclipse/plugins/org.eclipse.equinox.p2.engine_2.5.0.v20170319-2002.jar
eclipse/plugins/org.eclipse.equinox.p2.extensionlocation_1.2.300.v20160419-0834.jar
eclipse/plugins/org.eclipse.equinox.p2.extensionlocation_1.2.300.v20160419-0834.jar
eclipse/plugins/org.eclipse.equinox.p2.jarprocessor_1.0.500.v20160504-1450.jar
eclipse/plugins/org.eclipse.equinox.p2.metadata_2.3.200.v20170511-1106.jar
eclipse/plugins/org.eclipse.equinox.p2.metadata.repository_1.2.401.v20170906-1259.jar
eclipse/plugins/org.eclipse.equinox.p2.publisher_1.4.200.v20170511-1216.jar
eclipse/plugins/org.eclipse.equinox.p2.repository_2.3.301.v20170906-1259.jar
eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.501.v20170906-1259.jar
eclipse/plugins/org.eclipse.equinox.security_1.2.300.v20170505-1235.jar
eclipse/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.300.v20170515-0721.jar
eclipse/plugins/org.eclipse.equinox.util_1.0.500.v20130404-1337.jar
eclipse/plugins/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar
eclipse/plugins/org.sat4j.core_2.3.5.v201308161310.jar
eclipse/plugins/org.sat4j.pb_2.3.5.v201404071733.jar
......@@ -22,7 +22,7 @@ description
author "Eclipse Foundation",
license "Eclipse Public License",
url "http://www.eclipse.org/",
version "3.5.1",
version "4.7.2",
threads "Externally single-threaded. Internally multi-threaded.",
repeats "Single iteration, performs multiple distinct Eclipse tasks";
diff -ur eclipse-clean/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
--- a/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info 2009-09-18 04:42:09.000000000 +1000
+++ b/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info 2009-10-11 00:31:21.000000000 +1100
@@ -11,6 +11,7 @@
org.apache.jasper,5.5.17.v200903231320,plugins/org.apache.jasper_5.5.17.v200903231320.jar,4,false
org.apache.lucene,1.9.1.v20080530-1600,plugins/org.apache.lucene_1.9.1.v20080530-1600.jar,4,false
org.apache.lucene.analysis,1.9.1.v20080530-1600,plugins/org.apache.lucene.analysis_1.9.1.v20080530-1600.jar,4,false
--- eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info 2018-01-31 14:30:13.459622940 +1100
+++ ../bundles.info 2018-01-31 14:27:46.000000000 +1100
@@ -27,6 +27,7 @@
org.apache.lucene.core,6.1.0.v20170814-1820,plugins/org.apache.lucene.core_6.1.0.v20170814-1820.jar,4,false
org.apache.lucene.misc,6.1.0.v20161115-1612,plugins/org.apache.lucene.misc_6.1.0.v20161115-1612.jar,4,false
org.apiguardian,1.0.0.v20170910-2246,plugins/org.apiguardian_1.0.0.v20170910-2246.jar,4,false
+org.dacapo.eclipse,1.0.0,plugins/org.dacapo.eclipse_1.0.0.jar,4,false
org.eclipse.ant.core,3.2.100.v20090817_r351,plugins/org.eclipse.ant.core_3.2.100.v20090817_r351.jar,4,false
org.eclipse.ant.ui,3.4.1.v20090901_r351,plugins/org.eclipse.ant.ui_3.4.1.v20090901_r351.jar,4,false
org.eclipse.compare,3.5.0.I20090514-0808,plugins/org.eclipse.compare_3.5.0.I20090514-0808.jar,4,false
org.eclipse.ant.core,3.5.0.v20170509-2149,plugins/org.eclipse.ant.core_3.5.0.v20170509-2149.jar,4,false
org.eclipse.ant.launching,1.2.1.v20171108-0853,plugins/org.eclipse.ant.launching_1.2.1.v20171108-0853.jar,4,false
org.eclipse.ant.ui,3.7.0.v20170412-1054,plugins/org.eclipse.ant.ui_3.7.0.v20170412-1054.jar,4,false
......@@ -23,7 +23,7 @@ public class Eclipse extends Benchmark {
static final String WKSP_DIRECTORY_RELATIVE_TO_SCRATCH = "workspace";
static final String PLUGIN_ID = "org.dacapo.eclipse.Harness";
static final String OSGI_BOOTSTRAP_JAR = "eclipse" + File.separator + "plugins" + File.separator + "org.eclipse.osgi_3.5.1.R35x_v20090827.jar";
static final String OSGI_BOOTSTRAP_JAR = "eclipse" + File.separator + "plugins" + File.separator + "org.eclipse.osgi_3.12.50.v20170928-1321.jar";
static String oldJavaHome = null;
static Eclipse eclipse;
......@@ -95,8 +95,6 @@ public class Eclipse extends Benchmark {
System.setProperty("osgi.install.area", "file:" + fileInScratch("eclipse/"));
System.setProperty("osgi.noShutdown", "true");
System.setProperty("osgi.framework", "file:" + fileInScratch(OSGI_BOOTSTRAP_JAR));
String current_working_dir = System.getProperty("user.dir");
System.setProperty("dacapo.local.jre", current_working_dir + "/" + fileInScratch("jre/lib/rt.jar"));
setJavaHomeIfRequired();
String[] args = new String[4];
......
......@@ -18,9 +18,9 @@
<property name="compilerArg" value=""/>
<property name="javacSource" value="1.3"/>
<property name="javacTarget" value="1.2"/>
<condition property="dir_bootclasspath" value="${java.home}/../Classes">
<!--condition property="dir_bootclasspath" value="${java.home}/../Classes">
<os family="mac"/>
</condition>
</condition-->
<property name="dir_bootclasspath" value="${java.home}/lib"/>
<path id="path_bootclasspath">
<fileset dir="${dir_bootclasspath}">
......@@ -66,7 +66,6 @@
<target name="properties" if="eclipse.running">
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
</target>
<target name="build.update.jar" depends="init" description="Build the plug-in: org.dacapo.eclipse for an update site.">
......@@ -84,33 +83,35 @@
<delete dir="${build.result.folder}/@dot"/>
<mkdir dir="${build.result.folder}/@dot"/>
<path id="@dot.classpath">
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.runtime_3.5.0.v20090525.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.osgi_3.5.1.R35x_v20090827.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.equinox.common_3.5.1.R35x_v20090807-1100.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.jobs_3.4.100.v20090429-1800.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20090429-1800/runtime_registry_compatibility.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20090429-1800"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.equinox.registry_3.4.100.v20090520-1800.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.equinox.preferences_3.2.300.v20090520-1800.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.contenttype_3.4.1.R35x_v20090826-0451.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.100.v20090413.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.equinox.app_1.2.0.v20090520-1800.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.osgi.services_3.2.0.v20090520-1800.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/javax.servlet_2.5.0.v200806031605.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.jdt.core_3.5.1.v_972_R35x.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.jdt.compiler.apt_1.0.201.R35x_v20090825-1530.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.jdt.compiler.tool_1.0.100.v_972_R35x.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.resources_3.5.1.R35x_v20090826-0451.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.resources.compatibility_3.4.0.v20090505.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.ant.core_3.2.100.v20090817_r351.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.variables_3.2.200.v20090521.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.expressions_3.4.100.v20090429-1800.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.filesystem_1.2.0.v20090507.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.filesystem.macosx_1.1.0.v20090112.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.text_3.5.0.v20090513-2000.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/com.ibm.icu_4.0.1.v20090822.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.commands_3.5.0.I20090525-2000.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.team.core_3.5.0.I20090527-0620.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.osgi_3.12.50.v20170928-1321.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar"/>
<!--pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20090429-1800/runtime_registry_compatibility.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20090429-1800"/-->
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/javax.servlet_3.1.0.v201410161800.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.jdt.launching_3.9.51.v20171114-1018.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.jdt.core_3.13.100.v20171123-1049.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.jdt.compiler.apt_1.3.60.v20171129-1553.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.jdt.compiler.tool_1.2.51.v20171122-1403.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.resources_3.12.0.v20170417-1558.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.equinox.simpleconfigurator_1.2.0.v20170110-1705.jar"/>
<!--pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.resources.compatibility_3.4.0.v20090505.jar"/-->
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.ant.core_3.5.0.v20170509-2149.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.variables_3.4.0.v20170113-2056.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.debug.core_3.11.0.v20170605-1534.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.expressions_3.6.0.v20170207-1037.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.filesystem_1.7.0.v20170406-1337.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.filesystem.macosx_1.3.0.v20140124-1940.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.text_3.6.100.v20170203-0814.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/com.ibm.icu_58.2.0.v20170418-1837.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.core.commands_3.9.0.v20170530-1048.jar"/>
<pathelement path="${basedir}/../build/eclipse/plugins/org.eclipse.team.core_3.8.100.v20170516-0820.jar"/>
</path>
<!-- compile the source code -->
<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" >
......
......@@ -347,29 +347,23 @@ public abstract class FullSourceWorkspaceTests {
}
}
// Create lib entries for the JDKs
String jreLibPath = JavaCore.getClasspathVariable("JRE_LIB").toOSString();
String tempPath = System.getProperty("dacapo.local.jre");
String[] jdkLibs = Util.getJavaClassLibs();
int jdkLibsLength = jdkLibs.length;
IClasspathEntry[] jdkEntries = new IClasspathEntry[jdkLibsLength + 1];
IClasspathEntry[] jdkEntries = new IClasspathEntry[jdkLibsLength];
int jdkEntriesCount = 0;
for (int i = 0; i < jdkLibsLength; i++) {
if (!jdkLibs[i].equals(jreLibPath)) { // do not include JRE_LIB in
// additional JDK entries
jdkEntries[jdkEntriesCount++] = JavaCore.newLibraryEntry(new Path(jdkLibs[i]), null, null);
}
}
jdkEntries[jdkEntriesCount++] = JavaCore.newLibraryEntry(new Path(tempPath), null, null);
// Set classpaths (workaround bug 73253 Project references not set on
// project open)
ALL_PROJECTS = JavaCore.create(workspaceRoot).getJavaProjects();
int projectsLength = ALL_PROJECTS.length;
for (int i = 0; i < projectsLength; i++) {
String projectName = ALL_PROJECTS[i].getElementName();
if (BIG_PROJECT_NAME.equals(projectName))
......@@ -390,7 +384,6 @@ public abstract class FullSourceWorkspaceTests {
} catch (CoreException jme) {
// skip name collision as it means that JRE lib were already set on the
// classpath
System.out.println("errors in here");
if (jme.getStatus().getCode() != IJavaModelStatusConstants.NAME_COLLISION) {
throw jme;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment