Commit 04619d3d authored by Anders Blomdell's avatar Anders Blomdell
Browse files

Java OSGI cleanups.

parent a08fbb3a
......@@ -20,31 +20,38 @@ MODULES=Constant \
all: labcomm.jar labcomm2014.jar labcomm2006.jar
labcomm.jar: gen/JAVAC
labcomm.jar: gen/JAVAC osgi-manifest-all.txt
echo $@
cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm/*.class se/lth/control/labcomm2006/*.class
cd gen ; jar cfm ../$@ ../osgi-manifest-all.txt \
se/lth/control/labcomm/*.class \
se/lth/control/labcomm2006/*.class
labcomm2014.jar: gen/JAVAC
labcomm2014.jar: gen/JAVAC osgi-manifest-2014.txt
echo $@
cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm/*.class
cd gen ; jar cfm ../$@ ../osgi-manifest-2014.txt \
se/lth/control/labcomm/*.class
labcomm2006.jar: gen/JAVAC
labcomm2006.jar: gen/JAVAC osgi-manifest-2006.txt
echo $@
cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm2006/*.class
cd gen ; jar cfm ../$@ ../osgi-manifest-2006.txt \
se/lth/control/labcomm2006/*.class
gen:
mkdir gen
gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control/labcomm2006/%.java) Makefile | gen
javac -cp ../../compiler/labcomm_compiler.jar -d gen $(filter %.java, $^)
gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) \
$(MODULES:%=se/lth/control/labcomm2006/%.java) \
Makefile | gen
javac -cp ../../compiler/labcomm_compiler.jar -d gen \
$(filter %.java, $^)
touch $@
.PHONY: clean
clean:
rm -rf labcomm.jar labcomm2006.jar labcomm2014.jar gen
rm -rf gen
.PHONY: distclean
distclean:
rm -rf labcomm.jar labcomm2006.jar labcomm2014.jar
distclean: clean
Bundle-Description: Provides Labcomm to bundles
Bundle-ManifestVersion: 2
Bundle-Name: Labcomm OSGi
Bundle-SymbolicName: se.lth.control.labcomm
Bundle-SymbolicName: se.lth.control.labcomm2006
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"
Export-Package: se.lth.control.labcomm2006;version="1.0.0"
Bundle-Description: Provides Labcomm 2014 to bundles
Bundle-ManifestVersion: 2
Bundle-Name: Labcomm OSGi
Bundle-SymbolicName: se.lth.control.labcomm2014
Bundle-Vendor: LTH
Bundle-Version: 1.0.0
Export-Package: se.lth.control.labcomm;version="1.0.0"
Bundle-Description: Provides Labcomm 2006/2014 to bundles
Bundle-ManifestVersion: 2
Bundle-Name: Labcomm OSGi
Bundle-SymbolicName: se.lth.control.labcomm-all
Bundle-Vendor: LTH
Bundle-Version: 1.0.0
Export-Package: se.lth.control.labcomm2006;version="1.0.0",
se.lth.control.labcomm;version="1.0.0"
Supports Markdown
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