From 1432c81e807ff869532922bb951026e93dacb9cd Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 11 Apr 2016 20:32:55 -0400 Subject: [PATCH] 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 --- configure.ac | 2 +- liblttng-ust-java-agent/java/Makefile.am | 2 +- .../java/liblttng-ust-agent/Makefile.am | 13 ---------- .../java/lttng-ust-agent-all/Makefile.am | 24 +++++++++++++++++++ .../Manifest.txt | 2 +- 5 files changed, 27 insertions(+), 16 deletions(-) delete mode 100644 liblttng-ust-java-agent/java/liblttng-ust-agent/Makefile.am create mode 100644 liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am rename liblttng-ust-java-agent/java/{liblttng-ust-agent => lttng-ust-agent-all}/Manifest.txt (85%) diff --git a/configure.ac b/configure.ac index 64ac0889..6c102375 100644 --- 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 bc40dc99..1720d313 100644 --- 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 index 23f5502d..00000000 --- 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/lttng-ust-agent-all/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am new file mode 100644 index 00000000..1dd3b86d --- /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/liblttng-ust-agent/Manifest.txt b/liblttng-ust-java-agent/java/lttng-ust-agent-all/Manifest.txt similarity index 85% rename from liblttng-ust-java-agent/java/liblttng-ust-agent/Manifest.txt rename to liblttng-ust-java-agent/java/lttng-ust-agent-all/Manifest.txt index 9612845e..fadf548d 100644 --- a/liblttng-ust-java-agent/java/liblttng-ust-agent/Manifest.txt +++ b/liblttng-ust-java-agent/java/lttng-ust-agent-all/Manifest.txt @@ -2,7 +2,7 @@ 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-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 -- 2.34.1