Commit 87ee2556 authored by Sven Gestegård Robertz's avatar Sven Gestegård Robertz
Browse files

Merge branch 'master' into 'master'

Master

Added OSGi metainfo to allow deployments to OSGi servers.

See merge request !1
parents 3ca451b1 1865bd6a
...@@ -17,15 +17,15 @@ all: labcomm.jar labcomm2014.jar labcomm2006.jar ...@@ -17,15 +17,15 @@ all: labcomm.jar labcomm2014.jar labcomm2006.jar
labcomm.jar: gen/JAVAC labcomm.jar: gen/JAVAC
echo $@ echo $@
cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class se/lth/control/labcomm2006/*.class cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm/*.class se/lth/control/labcomm2006/*.class
labcomm2014.jar: gen/JAVAC labcomm2014.jar: gen/JAVAC
echo $@ echo $@
cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm/*.class
labcomm2006.jar: gen/JAVAC labcomm2006.jar: gen/JAVAC
echo $@ echo $@
cd gen ; jar cf ../$@ se/lth/control/labcomm2006/*.class cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm2006/*.class
gen: gen:
mkdir gen mkdir gen
...@@ -38,5 +38,4 @@ gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control ...@@ -38,5 +38,4 @@ gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control
.PHONY: clean .PHONY: clean
clean: clean:
rm -rf labcomm.jar labcomm2006.jar labcomm2014.jar gen rm -rf labcomm.jar labcomm2006.jar labcomm2014.jar gen
Bundle-Description: Provides Labcomm to bundles
Bundle-ManifestVersion: 2
Bundle-Name: Labcomm OSGi
Bundle-SymbolicName: se.lth.control.labcomm
Bundle-Vendor: LTH
Bundle-Version: 1.0.0
Export-Package: se.lth.control.labcomm;version="1.0.0",se.lth.control.la
bcomm2006;version="1.0.0"
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