Fix: rename liblttng-ust-agent to lttng-ust-agent-all

Rename liblttng-ust-agent to lttng-ust-agent-all to respect the new
jar file naming scheme, but keep a symbolic link from liblttng-ust-agent
to lttng-ust-agent-all to keep backwards compatibility.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/configure.ac b/configure.ac
index 64ac088996fa948843e7a73a3510c955dfa3ed37..6c1023752d6fb2afb92f71899b12f80bb9955584 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -441,7 +441,7 @@ AC_CONFIG_FILES([
        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-all/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

diff --git a/liblttng-ust-java-agent/java/Makefile.am b/liblttng-ust-java-agent/java/Makefile.am
index bc40dc99e95edbf521d5c8299b1ed25218f4304d..1720d313e368452ff516a1d17e1034cc011b7adf 100644 (file)
--- a/liblttng-ust-java-agent/java/Makefile.am
+++ b/liblttng-ust-java-agent/java/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = lttng-ust-agent-common liblttng-ust-agent
+SUBDIRS = lttng-ust-agent-common lttng-ust-agent-all
 
 if BUILD_JAVA_AGENT_WITH_JUL
 SUBDIRS += lttng-ust-agent-jul

diff --git a/liblttng-ust-java-agent/java/liblttng-ust-agent/Makefile.am b/liblttng-ust-java-agent/java/liblttng-ust-agent/Makefile.am
deleted file mode 100644 (file)
index 23f5502..0000000
--- a/liblttng-ust-java-agent/java/liblttng-ust-agent/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-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)

diff --git a/liblttng-ust-java-agent/java/liblttng-ust-agent/Manifest.txt b/liblttng-ust-java-agent/java/liblttng-ust-agent/Manifest.txt
deleted file mode 100644 (file)
index 9612845..0000000
--- a/liblttng-ust-java-agent/java/liblttng-ust-agent/Manifest.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am
new file mode 100644 (file)
index 0000000..1dd3b86
--- /dev/null
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am
@@ -0,0 +1,24 @@
+JAVAROOT = .
+
+jarfile_manifest = $(srcdir)/Manifest.txt
+jarfile = lttng-ust-agent-all.jar
+
+# Compatibility symlink provided for applications expecting the agent
+# jar file installed by UST 2.7.
+jarfile_compat_symlink = liblttng-ust-agent.jar
+
+jardir = $(datadir)/java
+
+dist_noinst_DATA = $(jarfile_manifest)
+
+jar_DATA = $(jarfile)
+
+$(jarfile):
+       $(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) && rm -f $(jarfile_compat_symlink) && $(LN_S) $@ $(jarfile_compat_symlink)
+
+install-data-hook:
+       cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_compat_symlink) && $(LN_S) $(jarfile) $(jarfile_compat_symlink)
+
+uninstall-hook:
+       cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_compat_symlink)
+

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-all/Manifest.txt b/liblttng-ust-java-agent/java/lttng-ust-agent-all/Manifest.txt
new file mode 100644 (file)
index 0000000..fadf548
--- /dev/null
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-all/Manifest.txt
@@ -0,0 +1,8 @@
+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.all
+Implementation-Version: 1.0.0
+Implementation-Vendor: LTTng Project
+Class-Path: lttng-ust-agent-jul.jar lttng-ust-agent-log4j.jar