Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2013-04-05 15:52:25 +0000
committerHenrik Rentz-Reichert2013-04-05 15:52:25 +0000
commita70a37907d2727bb2b358786802c4294cd8e5b47 (patch)
tree616ccf8a25d7c043bf699b0bf4e48d01e6a8d60a
parentb81d2baedd6d0ea41f4a2b4d75a7a1d4f167bdc5 (diff)
downloadorg.eclipse.etrice-a70a37907d2727bb2b358786802c4294cd8e5b47.tar.gz
org.eclipse.etrice-a70a37907d2727bb2b358786802c4294cd8e5b47.tar.xz
org.eclipse.etrice-a70a37907d2727bb2b358786802c4294cd8e5b47.zip
[runtime.java, modellib.java, ui.runtime] bug 404989: Provide OSGi manifest for java runtime and modellib
https://bugs.eclipse.org/bugs/show_bug.cgi?id=404989
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zipbin688861 -> 689672 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zipbin691559 -> 682584 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zipbin45630 -> 46080 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zipbin3530305 -> 3531423 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zipbin3056151 -> 3021320 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zipbin47583 -> 48239 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zipbin2410419 -> 18750 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zipbin98395 -> 98395 bytes
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/.project11
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF11
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/.classpath1
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/.project11
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF12
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/build.properties4
14 files changed, 50 insertions, 0 deletions
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
index 006613567..506982b47 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip
index 028f5a34f..38eb33a6f 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.cpp.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
index 5b9aec094..c33e090ed 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
index 6b47b1de2..1b600cd80 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip
index a6870c6d7..ae3d872c0 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.cpp.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
index a3a94fe18..f421c237d 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
index c81b964ee..8a38957e3 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
index 27a7f4458..cdce5ca4a 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
Binary files differ
diff --git a/runtime/org.eclipse.etrice.modellib.java/.project b/runtime/org.eclipse.etrice.modellib.java/.project
index 444a3118d..747c84d8c 100644
--- a/runtime/org.eclipse.etrice.modellib.java/.project
+++ b/runtime/org.eclipse.etrice.modellib.java/.project
@@ -15,9 +15,20 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>
diff --git a/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..5868b3a38
--- /dev/null
+++ b/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: eTrice Java ModelLib
+Bundle-SymbolicName: org.eclipse.etrice.modellib.java
+Bundle-Version: 0.3.0.qualifier
+Export-Package: org.eclipse.etrice.modellib.Socket,
+ room.basic.service.logging,
+ room.basic.service.tcp,
+ room.basic.service.timing
+Bundle-Vendor: eTrice (Incubation)
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/runtime/org.eclipse.etrice.runtime.java/.classpath b/runtime/org.eclipse.etrice.runtime.java/.classpath
index fd214d1e2..75b516414 100644
--- a/runtime/org.eclipse.etrice.runtime.java/.classpath
+++ b/runtime/org.eclipse.etrice.runtime.java/.classpath
@@ -3,5 +3,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/runtime/org.eclipse.etrice.runtime.java/.project b/runtime/org.eclipse.etrice.runtime.java/.project
index cdf65d37b..5f7997f17 100644
--- a/runtime/org.eclipse.etrice.runtime.java/.project
+++ b/runtime/org.eclipse.etrice.runtime.java/.project
@@ -10,8 +10,19 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>
diff --git a/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..80f04729f
--- /dev/null
+++ b/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: eTrice Java Runtime
+Bundle-SymbolicName: org.eclipse.etrice.runtime.java
+Bundle-Version: 0.3.0.qualifier
+Export-Package: org.eclipse.etrice.runtime.java.config,
+ org.eclipse.etrice.runtime.java.debugging,
+ org.eclipse.etrice.runtime.java.etunit,
+ org.eclipse.etrice.runtime.java.messaging,
+ org.eclipse.etrice.runtime.java.modelbase
+Bundle-Vendor: eTrice (Incubation)
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/runtime/org.eclipse.etrice.runtime.java/build.properties b/runtime/org.eclipse.etrice.runtime.java/build.properties
new file mode 100644
index 000000000..2d6ac57da
--- /dev/null
+++ b/runtime/org.eclipse.etrice.runtime.java/build.properties
@@ -0,0 +1,4 @@
+source.. = src/,\
+ src-gen/
+bin.includes = META-INF/,\
+ .

Back to the top