From 82802f723dcf52c573c3b92b3330240331d83ac3 Mon Sep 17 00:00:00 2001 From: konsoletyper Date: Sun, 21 Sep 2014 21:38:28 +0400 Subject: [PATCH] Configuring shitty tycho --- teavm-chrome-rdp/pom.xml | 1 + teavm-classlib/pom.xml | 1 + teavm-core/pom.xml | 1 + .../teavm-eclipse-feature/feature.xml | 303 +++++++++++++++++- teavm-eclipse/teavm-eclipse-feature/pom.xml | 8 + .../META-INF/MANIFEST.MF | 6 +- teavm-eclipse/teavm-eclipse-plugin/pom.xml | 1 + .../teavm-eclipse-repository/pom.xml | 22 +- .../teavm-eclipse-updatesite/pom.xml | 11 +- teavm-platform/pom.xml | 1 + 10 files changed, 346 insertions(+), 9 deletions(-) diff --git a/teavm-chrome-rdp/pom.xml b/teavm-chrome-rdp/pom.xml index 2920df302..a6d041a97 100644 --- a/teavm-chrome-rdp/pom.xml +++ b/teavm-chrome-rdp/pom.xml @@ -98,6 +98,7 @@ true + 0.2.0.qualifier org.teavm.chromerdp teavm-chrome-rdp diff --git a/teavm-classlib/pom.xml b/teavm-classlib/pom.xml index 6fee604f8..244577cdd 100644 --- a/teavm-classlib/pom.xml +++ b/teavm-classlib/pom.xml @@ -60,6 +60,7 @@ true + 0.2.0.qualifier org.teavm.classlib.* teavm-classlib diff --git a/teavm-core/pom.xml b/teavm-core/pom.xml index 35170d7ea..126e3078b 100644 --- a/teavm-core/pom.xml +++ b/teavm-core/pom.xml @@ -68,6 +68,7 @@ true + 0.2.0.qualifier org.teavm.* teavm-core org.apache.commons.io;version="[1.4,2.5)",org.junit,org.objectweb.asm;version="[4.2,6)", diff --git a/teavm-eclipse/teavm-eclipse-feature/feature.xml b/teavm-eclipse/teavm-eclipse-feature/feature.xml index ee5b6b3ce..3fd025c26 100644 --- a/teavm-eclipse/teavm-eclipse-feature/feature.xml +++ b/teavm-eclipse/teavm-eclipse-feature/feature.xml @@ -227,7 +227,308 @@ arch="ia64,ia64_32,PA_RISC,ppc,sparc,x86,x86_64" download-size="0" install-size="0" - version="0.2.0.qualifier" + version="0.0.0" + unpack="false"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/teavm-eclipse/teavm-eclipse-feature/pom.xml b/teavm-eclipse/teavm-eclipse-feature/pom.xml index a2a8ad036..dc06d5d0b 100644 --- a/teavm-eclipse/teavm-eclipse-feature/pom.xml +++ b/teavm-eclipse/teavm-eclipse-feature/pom.xml @@ -27,4 +27,12 @@ 0.2.0-SNAPSHOT eclipse-feature + + + + teavm + ${project.baseUri}../teavm-eclipse-repository/target/repository + p2 + + \ No newline at end of file diff --git a/teavm-eclipse/teavm-eclipse-m2e-plugin/META-INF/MANIFEST.MF b/teavm-eclipse/teavm-eclipse-m2e-plugin/META-INF/MANIFEST.MF index 5f523a57c..aefb9d9c6 100644 --- a/teavm-eclipse/teavm-eclipse-m2e-plugin/META-INF/MANIFEST.MF +++ b/teavm-eclipse/teavm-eclipse-m2e-plugin/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Teavm-eclipse-m2e-plugin -Bundle-SymbolicName: org.teavm.eclipse.m2e;singleton:=true +Bundle-Name: TeaVM plugin for m2e +Bundle-SymbolicName: teavm-eclipse-m2-plugin;singleton:=true Bundle-Version: 0.2.0.qualifier Bundle-Vendor: Alexey Andreev Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Require-Bundle: org.teavm.eclipse;bundle-version="[0.2,0.3)", +Require-Bundle: teavm-eclipse-plugin;bundle-version="[0.2,0.3)", org.eclipse.m2e.core;bundle-version="[1.3,2)", org.eclipse.core.runtime;bundle-version="[3.8.0,4.0)", org.eclipse.m2e.maven.runtime;bundle-version="[1.3,2)", diff --git a/teavm-eclipse/teavm-eclipse-plugin/pom.xml b/teavm-eclipse/teavm-eclipse-plugin/pom.xml index 43a7f4551..bf7ed72df 100644 --- a/teavm-eclipse/teavm-eclipse-plugin/pom.xml +++ b/teavm-eclipse/teavm-eclipse-plugin/pom.xml @@ -25,6 +25,7 @@ teavm-eclipse-plugin eclipse-plugin + 0.2.0-SNAPSHOT diff --git a/teavm-eclipse/teavm-eclipse-repository/pom.xml b/teavm-eclipse/teavm-eclipse-repository/pom.xml index 6893067a7..774017fc1 100644 --- a/teavm-eclipse/teavm-eclipse-repository/pom.xml +++ b/teavm-eclipse/teavm-eclipse-repository/pom.xml @@ -47,19 +47,33 @@ + + javax.interceptor:javax.interceptor-api:1.2 + + + javax.enterprise:cdi-api:1.2 + + + javax.transaction:javax.transaction-api:1.2 + + + org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.1 + + + org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.1 + org.teavm:teavm-core:${project.version} - true org.teavm:teavm-classlib:${project.version} - true org.teavm:teavm-chrome-rdp:${project.version} - true - ch.qos.logback:logback-classic:1.1.2 + + ch.qos.logback:logback-classic:1.1.2 + diff --git a/teavm-eclipse/teavm-eclipse-updatesite/pom.xml b/teavm-eclipse/teavm-eclipse-updatesite/pom.xml index fb2c343d2..a2a750b6e 100644 --- a/teavm-eclipse/teavm-eclipse-updatesite/pom.xml +++ b/teavm-eclipse/teavm-eclipse-updatesite/pom.xml @@ -24,6 +24,15 @@ 0.2-SNAPSHOT teavm-eclipse-updatesite - eclipse-repository 0.2.0-SNAPSHOT + + eclipse-repository + + + + teavm + ${project.baseUri}../teavm-eclipse-repository/target/repository + p2 + + \ No newline at end of file diff --git a/teavm-platform/pom.xml b/teavm-platform/pom.xml index 0405a6cbb..d170dfcb4 100644 --- a/teavm-platform/pom.xml +++ b/teavm-platform/pom.xml @@ -50,6 +50,7 @@ true + 0.2.0.qualifier org.teavm.platform.* teavm-platform