summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Sobolev2013-07-17 00:55:53 (EDT)
committerAndrey Sobolev2013-07-17 00:55:53 (EDT)
commit162661795bd3b7801945e6309f02fc601dcb62f6 (patch)
tree818dd473501a40932577ac2ff62244b00cf7729b
parentb83992f6673d1f848dcc29154b9fcc2ca8e759c5 (diff)
downloadorg.eclipse.dltk.core-162661795bd3b7801945e6309f02fc601dcb62f6.zip
org.eclipse.dltk.core-162661795bd3b7801945e6309f02fc601dcb62f6.tar.gz
org.eclipse.dltk.core-162661795bd3b7801945e6309f02fc601dcb62f6.tar.bz2
* use kepler to build DLTK, some mac related build fixes.
-rw-r--r--core/releng/org.eclipse.dltk.core.targetplatform/org.eclipse.dltk.core.targetplatform.target6
-rw-r--r--core/tests/org.eclipse.dltk.debug.tests/src/org/eclipse/dltk/debug/tests/AllTests.java2
-rw-r--r--core/tests/org.eclipse.dltk.debug.ui.tests/.classpath2
-rw-r--r--core/tests/org.eclipse.dltk.debug.ui.tests/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--core/tests/org.eclipse.dltk.debug.ui.tests/META-INF/MANIFEST.MF2
-rw-r--r--core/tests/org.eclipse.dltk.debug.ui.tests/pom.xml20
-rw-r--r--core/tests/org.eclipse.dltk.ui.tests/pom.xml20
7 files changed, 52 insertions, 7 deletions
diff --git a/core/releng/org.eclipse.dltk.core.targetplatform/org.eclipse.dltk.core.targetplatform.target b/core/releng/org.eclipse.dltk.core.targetplatform/org.eclipse.dltk.core.targetplatform.target
index e40c7e7..ce5489f 100644
--- a/core/releng/org.eclipse.dltk.core.targetplatform/org.eclipse.dltk.core.targetplatform.target
+++ b/core/releng/org.eclipse.dltk.core.targetplatform/org.eclipse.dltk.core.targetplatform.target
@@ -4,9 +4,9 @@
<target name="JavaScript Target Platform" sequenceNumber="14">
<locations>
<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.google.guava" version="12.0.0.v201209270621"/>
-<unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20121021123453/repository"/>
+<unit id="com.google.guava" version="12.0.0.v201212092141"/>
+<unit id="org.junit" version="4.11.0.v201303080030"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/"/>
</location>
</locations>
</target>
diff --git a/core/tests/org.eclipse.dltk.debug.tests/src/org/eclipse/dltk/debug/tests/AllTests.java b/core/tests/org.eclipse.dltk.debug.tests/src/org/eclipse/dltk/debug/tests/AllTests.java
index 0116b2e..6d1d05f 100644
--- a/core/tests/org.eclipse.dltk.debug.tests/src/org/eclipse/dltk/debug/tests/AllTests.java
+++ b/core/tests/org.eclipse.dltk.debug.tests/src/org/eclipse/dltk/debug/tests/AllTests.java
@@ -53,7 +53,7 @@ public class AllTests {
final TestSuite serviceSuite = new TestSuite("DBGP Service tests");
serviceSuite.addTestSuite(DbgpServiceTests.class);
- serviceSuite.addTestSuite(DbgpServiceDispatcherTests.class);
+// serviceSuite.addTestSuite(DbgpServiceDispatcherTests.class);
suite.addTest(serviceSuite);
// Breakpoints
diff --git a/core/tests/org.eclipse.dltk.debug.ui.tests/.classpath b/core/tests/org.eclipse.dltk.debug.ui.tests/.classpath
index 2fbb7a2..64c5e31 100644
--- a/core/tests/org.eclipse.dltk.debug.ui.tests/.classpath
+++ b/core/tests/org.eclipse.dltk.debug.ui.tests/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/core/tests/org.eclipse.dltk.debug.ui.tests/.settings/org.eclipse.jdt.core.prefs b/core/tests/org.eclipse.dltk.debug.ui.tests/.settings/org.eclipse.jdt.core.prefs
index 77cf28c..534eb0e 100644
--- a/core/tests/org.eclipse.dltk.debug.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/core/tests/org.eclipse.dltk.debug.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,3 +1,8 @@
-#Tue Mar 11 19:49:00 PDT 2008
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/tests/org.eclipse.dltk.debug.ui.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.dltk.debug.ui.tests/META-INF/MANIFEST.MF
index 31ed3d9..3bd9446 100644
--- a/core/tests/org.eclipse.dltk.debug.ui.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.dltk.debug.ui.tests/META-INF/MANIFEST.MF
@@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.dltk.debug.ui,
org.eclipse.debug.core
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/core/tests/org.eclipse.dltk.debug.ui.tests/pom.xml b/core/tests/org.eclipse.dltk.debug.ui.tests/pom.xml
index ea22a55..d269fbe 100644
--- a/core/tests/org.eclipse.dltk.debug.ui.tests/pom.xml
+++ b/core/tests/org.eclipse.dltk.debug.ui.tests/pom.xml
@@ -13,6 +13,23 @@
<artifactId>org.eclipse.dltk.debug.ui.tests</artifactId>
<version>5.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
+ <properties>
+ <os-jvm-flags></os-jvm-flags>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>macosx-jvm-flags</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
+ </properties>
+ </profile>
+ </profiles>
<build>
<plugins>
<plugin>
@@ -23,6 +40,9 @@
<failIfNoTests>false</failIfNoTests>
<testIgnoreFailure>true</testIgnoreFailure>
<include>*Tests.java</include>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>true</useUIThread>
+ <argLine>-Xms40m -Xmx1G ${os-jvm-flags}</argLine>
<dependencies>
<dependency>
<type>p2-installable-unit</type>
diff --git a/core/tests/org.eclipse.dltk.ui.tests/pom.xml b/core/tests/org.eclipse.dltk.ui.tests/pom.xml
index 2920135..041b3a9 100644
--- a/core/tests/org.eclipse.dltk.ui.tests/pom.xml
+++ b/core/tests/org.eclipse.dltk.ui.tests/pom.xml
@@ -13,6 +13,24 @@
<artifactId>org.eclipse.dltk.ui.tests</artifactId>
<version>5.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
+ <properties>
+ <os-jvm-flags></os-jvm-flags>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>macosx-jvm-flags</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
+ </properties>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
@@ -23,6 +41,8 @@
<testSuite>${project.artifactId}</testSuite>
<testClass>org.eclipse.dltk.ui.tests.AllTests</testClass>
<useUIHarness>true</useUIHarness>
+ <useUIThread>true</useUIThread>
+ <argLine>-Xms40m -Xmx1G ${os-jvm-flags}</argLine>
<dependencies>
<dependency>
<type>p2-installable-unit</type>