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

Merge branch 'master' of gitlab.control.lth.se:anders_blomdell/labcomm

parents b99024d4 87ee2556
......@@ -17,15 +17,15 @@ all: labcomm.jar labcomm2014.jar labcomm2006.jar
labcomm.jar: gen/JAVAC
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
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
echo $@
cd gen ; jar cf ../$@ se/lth/control/labcomm2006/*.class
cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm2006/*.class
gen:
mkdir gen
......@@ -38,5 +38,4 @@ gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control
.PHONY: 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