From a7a5dbb36c7896e238f01442c9ef898e2738364c Mon Sep 17 00:00:00 2001 From: Sven Gestegard Robertz <sven.robertz@cs.lth.se> Date: Thu, 19 Feb 2015 12:13:43 +0100 Subject: [PATCH] removed addition of OSGi manifest from jar files --- lib/java/Makefile | 16 +++++++--------- lib/java/osgi-manifest-2006.txt | 7 ------- lib/java/osgi-manifest-2014.txt | 7 ------- lib/java/osgi-manifest-all.txt | 8 -------- 4 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 lib/java/osgi-manifest-2006.txt delete mode 100644 lib/java/osgi-manifest-2014.txt delete mode 100644 lib/java/osgi-manifest-all.txt diff --git a/lib/java/Makefile b/lib/java/Makefile index c6a483d..cfed416 100644 --- a/lib/java/Makefile +++ b/lib/java/Makefile @@ -20,21 +20,19 @@ MODULES=Constant \ all: labcomm.jar labcomm2014.jar labcomm2006.jar -labcomm.jar: gen/JAVAC osgi-manifest-all.txt +labcomm.jar: gen/JAVAC echo $@ - cd gen ; jar cfm ../$@ ../osgi-manifest-all.txt \ + cd gen ; jar cfm ../$@ \ se/lth/control/labcomm/*.class \ se/lth/control/labcomm2006/*.class -labcomm2014.jar: gen/JAVAC osgi-manifest-2014.txt +labcomm2014.jar: gen/JAVAC echo $@ - cd gen ; jar cfm ../$@ ../osgi-manifest-2014.txt \ - se/lth/control/labcomm/*.class + cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class -labcomm2006.jar: gen/JAVAC osgi-manifest-2006.txt +labcomm2006.jar: gen/JAVAC echo $@ - cd gen ; jar cfm ../$@ ../osgi-manifest-2006.txt \ - se/lth/control/labcomm2006/*.class + cd gen ; jar cf ../$@ se/lth/control/labcomm2006/*.class gen: mkdir gen @@ -43,7 +41,7 @@ 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, $^) + $(filter %.java, $^) touch $@ diff --git a/lib/java/osgi-manifest-2006.txt b/lib/java/osgi-manifest-2006.txt deleted file mode 100644 index 4ef6bda..0000000 --- a/lib/java/osgi-manifest-2006.txt +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-Description: Provides Labcomm to bundles -Bundle-ManifestVersion: 2 -Bundle-Name: Labcomm OSGi -Bundle-SymbolicName: se.lth.control.labcomm2006 -Bundle-Vendor: LTH -Bundle-Version: 1.0.0 -Export-Package: se.lth.control.labcomm2006;version="1.0.0" diff --git a/lib/java/osgi-manifest-2014.txt b/lib/java/osgi-manifest-2014.txt deleted file mode 100644 index 53d3954..0000000 --- a/lib/java/osgi-manifest-2014.txt +++ /dev/null @@ -1,7 +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" diff --git a/lib/java/osgi-manifest-all.txt b/lib/java/osgi-manifest-all.txt deleted file mode 100644 index 4a691e7..0000000 --- a/lib/java/osgi-manifest-all.txt +++ /dev/null @@ -1,8 +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" -- GitLab