Skip to contentSkip to conversation

Fix: Use env CLASSPATH when building log4j example

PATCH Mathieu Desnoyers 1 participant 1 message Jun 25, 2015 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Mathieu Desnoyers

author Applied
#1 lore raw

merged, thanks!

Mathieu

Quoted 68 lines · ----- On Jun 25, 2015, at 7:00 PM, Michael Jeanson [email protected] wrote:

The location of the log4j jar file is specified during configure with the CLASSPATH envvar, reuse it when building the example.

---
doc/examples/java-log4j/Makefile | 10 +++++++---
doc/examples/java-log4j/run | 10 +++++++---

2 files changed, 14 insertions(+), 6 deletions(-)
doc/examples/java-log4j/Makefile +0 -0
index 4b59964..2c629c3 100644
@@ -20,7 +20,11 @@ JFLAGS = -g
 
 # Default JUL jar name.

JARFILE=liblttng-ust-agent.jar

doc/examples/java-log4j/Makefile +5 -1
-LOG4J=/usr/share/java/log4j.jar
+
+# If system classpath is empty, try to guess log4j location
+ifeq "$(CLASSPATH)" ""
+	CLASSPATH="/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar"
+endif

# Check if the top level makefile overrides the JUL Jar file name. ifneq "$(JAVA_JARFILE_OVERRIDE)" ""

doc/examples/java-log4j/Makefile +0 -0
@@ -29,9 +33,9 @@ endif
 
 # Check if the top level makefile overrides the JUL classpath.

ifeq "$(JAVA_CLASSPATH_OVERRIDE)" ""

doc/examples/java-log4j/Makefile +1 -1
-	CLASSPATH=/usr/local/share/java/$(JARFILE):/usr/share/java/$(JARFILE):$(LOG4J)
+
	CLASSPATH:=/usr/local/share/java/$(JARFILE):/usr/share/java/$(JARFILE):$(CLASSPATH)

else

doc/examples/java-log4j/Makefile +1 -1
-	CLASSPATH=$(JAVA_CLASSPATH_OVERRIDE)/$(JARFILE):$(LOG4J)
+	CLASSPATH:=$(JAVA_CLASSPATH_OVERRIDE)/$(JARFILE):$(CLASSPATH)

endif

JC = javac -classpath "$(CLASSPATH):."

doc/examples/java-log4j/run +0 -0
index 5e3cbeb..9dca608 100755
@@ -8,15 +8,19 @@
 

DIR=dirname $0
JARFILE="liblttng-ust-agent.jar"

doc/examples/java-log4j/run +5 -1
-LOG4J="/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar"
+
+# If system classpath is empty, try to guess log4j location
+if [ "x$CLASSPATH" = "x" ]; then
+	CLASSPATH="/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar"
+fi

cd $DIR

if [ -f "$DIR/.intree" ]; then

doc/examples/java-log4j/run +1 -1
-	CLASSPATH="../../../liblttng-ust-java-agent/java/$JARFILE:$LOG4J"
+	CLASSPATH="../../../liblttng-ust-java-agent/java/$JARFILE:$CLASSPATH"
	LIBPATH="../../../liblttng-ust-java-agent/jni/log4j/.libs"

else

doc/examples/java-log4j/run +1 -1
-	CLASSPATH="/usr/local/share/java/$JARFILE:/usr/share/java/$JARFILE:$LOG4J"
+	CLASSPATH="/usr/local/share/java/$JARFILE:/usr/share/java/$JARFILE:$CLASSPATH"
	# Use system defined java.library.path
	#LIBPATH="/usr/local/lib:/usr/lib"

fi
--
1.9.1

Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com