Revive Eclipse plugin

This commit is contained in:
Alexey Andreev 2017-11-09 20:10:15 +03:00
parent f4c5b5073a
commit f401f24521
21 changed files with 105 additions and 58 deletions

View File

@ -325,12 +325,20 @@
<module>tools/idea</module> <module>tools/idea</module>
</modules> </modules>
</profile> </profile>
<profile> <profile>
<id>with-idea</id> <id>with-idea</id>
<modules> <modules>
<module>tools/idea</module> <module>tools/idea</module>
</modules> </modules>
</profile> </profile>
<profile>
<id>with-eclipse</id>
<modules>
<module>tools/eclipse</module>
</modules>
</profile>
<profile> <profile>
<id>sign-artifacts</id> <id>sign-artifacts</id>

View File

@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: TeaVM plugin for Eclipse Bundle-Name: TeaVM plugin for Eclipse
Bundle-SymbolicName: teavm-eclipse-core-plugin;singleton:=true Bundle-SymbolicName: teavm-eclipse-core-plugin;singleton:=true
Bundle-Version: 0.5.0.qualifier Bundle-Version: 0.6.0.qualifier
Bundle-Vendor: Alexey Andreev <konsoletyper@gmail.com> Bundle-Vendor: Alexey Andreev <konsoletyper@gmail.com>
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ClassPath: ., Bundle-ClassPath: .,
lib/asm-debug-all-5.0.4.jar, lib/asm-debug-all-5.0.3.jar,
lib/cdi-api-1.2.jar, lib/cdi-api-1.2.jar,
lib/commons-io-2.4.jar, lib/commons-io-2.4.jar,
lib/jackson-core-asl-1.9.13.jar, lib/jackson-core-asl-1.9.13.jar,
@ -36,10 +36,11 @@ Bundle-ClassPath: .,
lib/org.apache.aries.spifly.dynamic.bundle-1.0.1.jar, lib/org.apache.aries.spifly.dynamic.bundle-1.0.1.jar,
lib/org.apache.aries.spifly.weaver-internal-1.0.1.jar, lib/org.apache.aries.spifly.weaver-internal-1.0.1.jar,
lib/org.apache.aries.util-1.0.0.jar, lib/org.apache.aries.util-1.0.0.jar,
lib/slf4j-api-1.7.7.jar, lib/slf4j-api-1.7.6.jar,
lib/teavm-chrome-rdp-0.5.0-SNAPSHOT.jar, lib/teavm-chrome-rdp-0.6.0-SNAPSHOT.jar,
lib/teavm-core-0.5.0-SNAPSHOT.jar, lib/teavm-core-0.6.0-SNAPSHOT.jar,
lib/teavm-tooling-0.5.0-SNAPSHOT.jar, lib/teavm-interop-0.6.0-SNAPSHOT.jar,
lib/teavm-tooling-0.6.0-SNAPSHOT.jar,
lib/websocket-api-9.2.1.v20140609.jar, lib/websocket-api-9.2.1.v20140609.jar,
lib/websocket-client-9.2.1.v20140609.jar, lib/websocket-client-9.2.1.v20140609.jar,
lib/websocket-common-9.2.1.v20140609.jar, lib/websocket-common-9.2.1.v20140609.jar,
@ -47,28 +48,46 @@ Bundle-ClassPath: .,
lib/websocket-servlet-9.2.1.v20140609.jar, lib/websocket-servlet-9.2.1.v20140609.jar,
lib/hppc-0.6.1.jar lib/hppc-0.6.1.jar
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Export-Package: org.teavm.cache, Export-Package: org.teavm.ast,
org.teavm.ast.cache,
org.teavm.ast.decompilation,
org.teavm.ast.optimization,
org.teavm.backend.javascript,
org.teavm.backend.javascript.codegen,
org.teavm.backend.javascript.rendering,
org.teavm.backend.javascript.spi,
org.teavm.backend.wasm,
org.teavm.backend.wasm.binary,
org.teavm.backend.wasm.generate,
org.teavm.backend.wasm.intrinsics,
org.teavm.backend.wasm.model,
org.teavm.backend.wasm.model.expression,
org.teavm.backend.wasm.optimization,
org.teavm.backend.wasm.patches,
org.teavm.backend.wasm.render,
org.teavm.backend.wasm.transformation,
org.teavm.cache,
org.teavm.callgraph, org.teavm.callgraph,
org.teavm.common,
org.teavm.chromerdp, org.teavm.chromerdp,
org.teavm.chromerdp.data, org.teavm.chromerdp.data,
org.teavm.chromerdp.messages, org.teavm.chromerdp.messages,
org.teavm.codegen,
org.teavm.common,
org.teavm.debugging, org.teavm.debugging,
org.teavm.debugging.information, org.teavm.debugging.information,
org.teavm.debugging.javascript, org.teavm.debugging.javascript,
org.teavm.dependency, org.teavm.dependency,
org.teavm.diagnostics, org.teavm.diagnostics,
org.teavm.javascript,
org.teavm.javascript.ast,
org.teavm.javascript.spi,
org.teavm.model, org.teavm.model,
org.teavm.model.instructions, org.teavm.model.instructions,
org.teavm.model.util, org.teavm.model.util,
org.teavm.model.emit, org.teavm.model.emit,
org.teavm.optimization, org.teavm.model.lowlevel,
org.teavm.model.optimization,
org.teavm.model.text,
org.teavm.model.transformation,
org.teavm.parsing, org.teavm.parsing,
org.teavm.resource, org.teavm.parsing.resource,
org.teavm.runtime,
org.teavm.testing, org.teavm.testing,
org.teavm.tooling, org.teavm.tooling,
org.teavm.tooling.sources, org.teavm.tooling.sources,

View File

@ -3,7 +3,7 @@ output.. = target/
bin.includes = META-INF/,\ bin.includes = META-INF/,\
.,\ .,\
lib/,\ lib/,\
lib/asm-debug-all-5.0.4.jar,\ lib/asm-debug-all-5.0.3.jar,\
lib/cdi-api-1.2.jar,\ lib/cdi-api-1.2.jar,\
lib/commons-io-2.4.jar,\ lib/commons-io-2.4.jar,\
lib/jackson-core-asl-1.9.13.jar,\ lib/jackson-core-asl-1.9.13.jar,\
@ -33,10 +33,11 @@ bin.includes = META-INF/,\
lib/org.apache.aries.spifly.dynamic.bundle-1.0.1.jar,\ lib/org.apache.aries.spifly.dynamic.bundle-1.0.1.jar,\
lib/org.apache.aries.spifly.weaver-internal-1.0.1.jar,\ lib/org.apache.aries.spifly.weaver-internal-1.0.1.jar,\
lib/org.apache.aries.util-1.0.0.jar,\ lib/org.apache.aries.util-1.0.0.jar,\
lib/slf4j-api-1.7.7.jar,\ lib/slf4j-api-1.7.6.jar,\
lib/teavm-chrome-rdp-0.5.0-SNAPSHOT.jar,\ lib/teavm-chrome-rdp-0.6.0-SNAPSHOT.jar,\
lib/teavm-core-0.5.0-SNAPSHOT.jar,\ lib/teavm-core-0.6.0-SNAPSHOT.jar,\
lib/teavm-tooling-0.5.0-SNAPSHOT.jar,\ lib/teavm-interop-0.6.0-SNAPSHOT.jar,\
lib/teavm-tooling-0.6.0-SNAPSHOT.jar,\
lib/websocket-api-9.2.1.v20140609.jar,\ lib/websocket-api-9.2.1.v20140609.jar,\
lib/websocket-client-9.2.1.v20140609.jar,\ lib/websocket-client-9.2.1.v20140609.jar,\
lib/websocket-common-9.2.1.v20140609.jar,\ lib/websocket-common-9.2.1.v20140609.jar,\

View File

@ -19,7 +19,7 @@
<groupId>org.teavm</groupId> <groupId>org.teavm</groupId>
<artifactId>teavm-eclipse-core-deps</artifactId> <artifactId>teavm-eclipse-core-deps</artifactId>
<version><!-- update -->0.5.0-SNAPSHOT</version> <version><!-- update -->0.6.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>TeaVM dependencies for Eclipse plugin</name> <name>TeaVM dependencies for Eclipse plugin</name>

View File

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.teavm</groupId> <groupId>org.teavm</groupId>
<artifactId>teavm-eclipse</artifactId> <artifactId>teavm-eclipse</artifactId>
<version>0.5.0-SNAPSHOT</version> <version>0.6.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>teavm-eclipse-core-plugin</artifactId> <artifactId>teavm-eclipse-core-plugin</artifactId>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>

View File

@ -2,7 +2,7 @@
<feature <feature
id="teavm-eclipse-feature" id="teavm-eclipse-feature"
label="TeaVM Eclipse support" label="TeaVM Eclipse support"
version="0.5.0.qualifier" version="0.6.0.qualifier"
provider-name="Alexey Andreev &lt;konsoletyper@gmail.com&gt;"> provider-name="Alexey Andreev &lt;konsoletyper@gmail.com&gt;">
<description url="http://www.example.com/description"> <description url="http://www.example.com/description">
@ -233,14 +233,14 @@
id="teavm-eclipse-plugin" id="teavm-eclipse-plugin"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.5.0.qualifier" version="0.6.0.qualifier"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="teavm-eclipse-core-plugin" id="teavm-eclipse-core-plugin"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.5.0.qualifier" version="0.6.0.qualifier"
unpack="false"/> unpack="false"/>
</feature> </feature>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.teavm</groupId> <groupId>org.teavm</groupId>
<artifactId>teavm-eclipse</artifactId> <artifactId>teavm-eclipse</artifactId>
<version>0.5.0-SNAPSHOT</version> <version>0.6.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>teavm-eclipse-feature</artifactId> <artifactId>teavm-eclipse-feature</artifactId>

View File

@ -2,7 +2,7 @@
<feature <feature
id="teavm-eclipse-m2e-feature" id="teavm-eclipse-m2e-feature"
label="TeaVM maven configuration support" label="TeaVM maven configuration support"
version="0.5.0.qualifier" version="0.6.0.qualifier"
provider-name="Alexey Andreev &lt;konsoletyper@gmail.com&gt;"> provider-name="Alexey Andreev &lt;konsoletyper@gmail.com&gt;">
<description url="http://www.example.com/description"> <description url="http://www.example.com/description">

View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.teavm</groupId> <groupId>org.teavm</groupId>
<artifactId>teavm-eclipse</artifactId> <artifactId>teavm-eclipse</artifactId>
<version>0.5.0-SNAPSHOT</version> <version>0.6.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>teavm-eclipse-m2e-feature</artifactId> <artifactId>teavm-eclipse-m2e-feature</artifactId>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: TeaVM plugin for m2e Bundle-Name: TeaVM plugin for m2e
Bundle-SymbolicName: teavm-eclipse-m2e-plugin;singleton:=true Bundle-SymbolicName: teavm-eclipse-m2e-plugin;singleton:=true
Bundle-Version: 0.5.0.qualifier Bundle-Version: 0.6.0.qualifier
Bundle-Vendor: Alexey Andreev <konsoletyper@gmail.com> Bundle-Vendor: Alexey Andreev <konsoletyper@gmail.com>
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: teavm-eclipse-plugin;bundle-version="0.0.0", Require-Bundle: teavm-eclipse-plugin;bundle-version="0.0.0",

View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.teavm</groupId> <groupId>org.teavm</groupId>
<artifactId>teavm-eclipse</artifactId> <artifactId>teavm-eclipse</artifactId>
<version>0.5.0-SNAPSHOT</version> <version>0.6.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>teavm-eclipse-m2e-plugin</artifactId> <artifactId>teavm-eclipse-m2e-plugin</artifactId>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: TeaVM plugin for Eclipse Bundle-Name: TeaVM plugin for Eclipse
Bundle-SymbolicName: teavm-eclipse-plugin;singleton:=true Bundle-SymbolicName: teavm-eclipse-plugin;singleton:=true
Bundle-Version: 0.5.0.qualifier Bundle-Version: 0.6.0.qualifier
Bundle-Vendor: Alexey Andreev <konsoletyper@gmail.com> Bundle-Vendor: Alexey Andreev <konsoletyper@gmail.com>
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Activator: org.teavm.eclipse.TeaVMEclipsePlugin Bundle-Activator: org.teavm.eclipse.TeaVMEclipsePlugin
@ -25,27 +25,46 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0)",
teavm-eclipse-core-plugin;bundle-version="0.0.0" teavm-eclipse-core-plugin;bundle-version="0.0.0"
Export-Package: org.teavm.eclipse.debugger,org.teavm.eclipse Export-Package: org.teavm.eclipse.debugger,org.teavm.eclipse
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Import-Package: org.teavm.cache, Import-Package: org.teavm.ast,
org.teavm.ast.cache,
org.teavm.ast.decompilation,
org.teavm.ast.optimization,
org.teavm.backend.javascript,
org.teavm.backend.javascript.codegen,
org.teavm.backend.javascript.rendering,
org.teavm.backend.javascript.spi,
org.teavm.backend.wasm,
org.teavm.backend.wasm.binary,
org.teavm.backend.wasm.generate,
org.teavm.backend.wasm.intrinsics,
org.teavm.backend.wasm.model,
org.teavm.backend.wasm.model.expression,
org.teavm.backend.wasm.optimization,
org.teavm.backend.wasm.patches,
org.teavm.backend.wasm.render,
org.teavm.backend.wasm.transformation,
org.teavm.cache,
org.teavm.callgraph, org.teavm.callgraph,
org.teavm.common,
org.teavm.chromerdp, org.teavm.chromerdp,
org.teavm.chromerdp.data, org.teavm.chromerdp.data,
org.teavm.chromerdp.messages, org.teavm.chromerdp.messages,
org.teavm.codegen,
org.teavm.common,
org.teavm.debugging, org.teavm.debugging,
org.teavm.debugging.information, org.teavm.debugging.information,
org.teavm.debugging.javascript, org.teavm.debugging.javascript,
org.teavm.dependency, org.teavm.dependency,
org.teavm.diagnostics, org.teavm.diagnostics,
org.teavm.javascript,
org.teavm.javascript.ast,
org.teavm.javascript.spi,
org.teavm.model, org.teavm.model,
org.teavm.model.instructions, org.teavm.model.instructions,
org.teavm.model.util, org.teavm.model.util,
org.teavm.optimization, org.teavm.model.emit,
org.teavm.model.lowlevel,
org.teavm.model.optimization,
org.teavm.model.text,
org.teavm.model.transformation,
org.teavm.parsing, org.teavm.parsing,
org.teavm.resource, org.teavm.parsing.resource,
org.teavm.runtime,
org.teavm.testing, org.teavm.testing,
org.teavm.tooling, org.teavm.tooling,
org.teavm.tooling.sources, org.teavm.tooling.sources,

View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.teavm</groupId> <groupId>org.teavm</groupId>
<artifactId>teavm-eclipse</artifactId> <artifactId>teavm-eclipse</artifactId>
<version>0.5.0-SNAPSHOT</version> <version>0.6.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>teavm-eclipse-plugin</artifactId> <artifactId>teavm-eclipse-plugin</artifactId>

View File

@ -46,8 +46,8 @@ class TeaVMEclipseProgressListener implements TeaVMProgressListener {
case DEPENDENCY_CHECKING: case DEPENDENCY_CHECKING:
taskName = "Dependency checking"; taskName = "Dependency checking";
break; break;
case DEVIRTUALIZATION: case OPTIMIZATION:
taskName = "Applying devirtualization"; taskName = "Optimizing";
break; break;
case LINKING: case LINKING:
taskName = "Linking"; taskName = "Linking";

View File

@ -67,8 +67,8 @@ import org.teavm.diagnostics.ProblemTextConsumer;
import org.teavm.model.CallLocation; import org.teavm.model.CallLocation;
import org.teavm.model.ClassHolderTransformer; import org.teavm.model.ClassHolderTransformer;
import org.teavm.model.FieldReference; import org.teavm.model.FieldReference;
import org.teavm.model.InstructionLocation;
import org.teavm.model.MethodReference; import org.teavm.model.MethodReference;
import org.teavm.model.TextLocation;
import org.teavm.model.ValueType; import org.teavm.model.ValueType;
import org.teavm.tooling.ClassAlias; import org.teavm.tooling.ClassAlias;
import org.teavm.tooling.RuntimeCopyOperation; import org.teavm.tooling.RuntimeCopyOperation;
@ -351,7 +351,7 @@ public class TeaVMProjectBuilder extends IncrementalProjectBuilder {
return wasPut; return wasPut;
} }
private boolean putMarker(IResource resource, InstructionLocation location, MethodReference method, private boolean putMarker(IResource resource, TextLocation location, MethodReference method,
String text, TeaVMProfile profile, boolean force) throws CoreException { String text, TeaVMProfile profile, boolean force) throws CoreException {
Integer lineNumber = location != null ? location.getLine() : null; Integer lineNumber = location != null ? location.getLine() : null;
if (lineNumber == null) { if (lineNumber == null) {
@ -446,7 +446,7 @@ public class TeaVMProjectBuilder extends IncrementalProjectBuilder {
@Override public void appendMethod(MethodReference method) { @Override public void appendMethod(MethodReference method) {
sb.append(getFullMethodName(method)); sb.append(getFullMethodName(method));
} }
@Override public void appendLocation(InstructionLocation location) { @Override public void appendLocation(TextLocation location) {
sb.append(location); sb.append(location);
} }
@Override public void appendField(FieldReference field) { @Override public void appendField(FieldReference field) {

View File

@ -73,7 +73,7 @@ public class TeaVMDebugTarget extends PlatformObject implements IDebugTarget, IS
} }
@Override @Override
public void paused() { public void paused(Breakpoint breakpoint) {
fireEvent(new DebugEvent(TeaVMDebugTarget.this, DebugEvent.SUSPEND)); fireEvent(new DebugEvent(TeaVMDebugTarget.this, DebugEvent.SUSPEND));
thread.fireSuspendEvent(0); thread.fireSuspendEvent(0);
thread.fireChangeEvent(0); thread.fireChangeEvent(0);

View File

@ -39,7 +39,7 @@ public class TeaVMJSThread extends TeaVMThread {
fireEvent(new DebugEvent(TeaVMJSThread.this, DebugEvent.RESUME)); fireEvent(new DebugEvent(TeaVMJSThread.this, DebugEvent.RESUME));
} }
@Override @Override
public void paused() { public void paused(JavaScriptBreakpoint breakpoint) {
updateStackTrace(); updateStackTrace();
fireEvent(new DebugEvent(TeaVMJSThread.this, DebugEvent.SUSPEND)); fireEvent(new DebugEvent(TeaVMJSThread.this, DebugEvent.SUSPEND));
} }

View File

@ -36,7 +36,7 @@ public class TeaVMJavaThread extends TeaVMThread {
} }
@Override @Override
public void paused() { public void paused(Breakpoint breakpoint) {
updateStackTrace(); updateStackTrace();
fireEvent(new DebugEvent(TeaVMJavaThread.this, DebugEvent.SUSPEND)); fireEvent(new DebugEvent(TeaVMJavaThread.this, DebugEvent.SUSPEND));
} }

View File

@ -20,14 +20,14 @@
<groupId>org.teavm</groupId> <groupId>org.teavm</groupId>
<artifactId>teavm-eclipse</artifactId> <artifactId>teavm-eclipse</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>0.5.0-SNAPSHOT</version> <version>0.6.0-SNAPSHOT</version>
<name>TeaVM Eclipse integration</name> <name>TeaVM Eclipse integration</name>
<description>Aggregate project containing all plugins for integration TeaVM with Eclipse</description> <description>Aggregate project containing all plugins for integration TeaVM with Eclipse</description>
<properties> <properties>
<p2-repo.url>http://download.eclipse.org/releases/juno</p2-repo.url> <p2-repo.url>http://download.eclipse.org/releases/mars</p2-repo.url>
<tycho.version>0.21.0</tycho.version> <tycho.version>1.0.0</tycho.version>
</properties> </properties>
<modules> <modules>

View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<site> <site>
<feature id="teavm-eclipse-feature" version="0.0.0"> <feature id="teavm-eclipse-feature" version="0.0.0">
<category name="teavm-category"/> <category name="teavm-category"/>
</feature> </feature>
<feature id="teavm-eclipse-m2e-feature" version="0.0.0"> <feature id="teavm-eclipse-m2e-feature" version="0.0.0">
<category name="teavm-category"/> <category name="teavm-category"/>
</feature> </feature>
<category-def name="teavm-category" label="TeaVM"/> <category-def name="teavm-category" label="TeaVM"/>
</site> </site>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.teavm</groupId> <groupId>org.teavm</groupId>
<artifactId>teavm-eclipse</artifactId> <artifactId>teavm-eclipse</artifactId>
<version>0.5.0-SNAPSHOT</version> <version>0.6.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>teavm-eclipse-updatesite</artifactId> <artifactId>teavm-eclipse-updatesite</artifactId>