summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
9355f04)
Re-add a jar file that imports all other LTTng java agents (JUL and
log4j) if they are available on the system.
This provides backwards compatibility with Java applications that have
CLASSPATH defined following UST 2.7 documentation.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
liblttng-ust-java/Makefile
liblttng-ust-java-agent/Makefile
liblttng-ust-java-agent/java/Makefile
liblttng-ust-java/Makefile
liblttng-ust-java-agent/Makefile
liblttng-ust-java-agent/java/Makefile
+ liblttng-ust-java-agent/java/liblttng-ust-agent/Makefile
liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile
liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile
-SUBDIRS = lttng-ust-agent-common
+SUBDIRS = lttng-ust-agent-common liblttng-ust-agent
if BUILD_JAVA_AGENT_WITH_JUL
SUBDIRS += lttng-ust-agent-jul
if BUILD_JAVA_AGENT_WITH_JUL
SUBDIRS += lttng-ust-agent-jul
--- /dev/null
+JAVAROOT = .
+
+jarfile_manifest = $(srcdir)/Manifest.txt
+jarfile = liblttng-ust-agent.jar
+
+jardir = $(datadir)/java
+
+dist_noinst_DATA = $(jarfile_manifest)
+
+jar_DATA = $(jarfile)
+
+$(jarfile):
+ $(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest)
--- /dev/null
+Name: org/lttng/ust/agent/all/
+Specification-Title: LTTng UST All Java Agents
+Specification-Version: 1.0.0
+Specification-Vendor: LTTng Project
+Implementation-Title: org.lttng.ust.agent
+Implementation-Version: 1.0.0
+Implementation-Vendor: LTTng Project
+Class-Path: lttng-ust-agent-jul.jar lttng-ust-agent-log4j.jar