projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure.ac: move AC_PROG_SED() close to other AC_PROG_*()
[lttng-ust.git]
/
doc
/
examples
/
java-log4j
/
run
diff --git
a/doc/examples/java-log4j/run
b/doc/examples/java-log4j/run
index 9dca6087690d15bff9bd6b149a2f978762d726e0..997d0bdcd529bdf5181143d0be5a655f8e833383 100755
(executable)
--- a/
doc/examples/java-log4j/run
+++ b/
doc/examples/java-log4j/run
@@
-7,7
+7,9
@@
#
DIR=`dirname $0`
#
DIR=`dirname $0`
-JARFILE="liblttng-ust-agent.jar"
+JARFILE_COMMON="lttng-ust-agent-common.jar"
+JARFILE_LOG4J="lttng-ust-agent-log4j.jar"
+JAVA_OPTIONS=""
# If system classpath is empty, try to guess log4j location
if [ "x$CLASSPATH" = "x" ]; then
# If system classpath is empty, try to guess log4j location
if [ "x$CLASSPATH" = "x" ]; then
@@
-17,14
+19,20
@@
fi
cd $DIR
if [ -f "$DIR/.intree" ]; then
cd $DIR
if [ -f "$DIR/.intree" ]; then
- CLASSPATH="../../../liblttng-ust-java-agent/java/$JARFILE:$CLASSPATH"
+ CLASSPATH="$CLASSPATH:../../../liblttng-ust-java-agent/java/lttng-ust-agent-common/$JARFILE_COMMON"
+ CLASSPATH="$CLASSPATH:../../../liblttng-ust-java-agent/java/lttng-ust-agent-log4j/$JARFILE_LOG4J"
LIBPATH="../../../liblttng-ust-java-agent/jni/log4j/.libs"
else
LIBPATH="../../../liblttng-ust-java-agent/jni/log4j/.libs"
else
- CLASSPATH="/usr/local/share/java/$JARFILE:/usr/share/java/$JARFILE:$CLASSPATH"
+ CLASSPATH="$CLASSPATH:/usr/local/share/java/$JARFILE_COMMON:/usr/share/java/$JARFILE_COMMON"
+ CLASSPATH="$CLASSPATH:/usr/local/share/java/$JARFILE_LOG4J:/usr/share/java/$JARFILE_LOG4J"
# Use system defined java.library.path
#LIBPATH="/usr/local/lib:/usr/lib"
fi
# Use system defined java.library.path
#LIBPATH="/usr/local/lib:/usr/lib"
fi
-java -classpath "$CLASSPATH:." -Djava.library.path="$LIBPATH" Hello
+if [ "x$LIBPATH" != "x" ]; then
+ JAVA_OPTIONS="$JAVA_OPTIONS -Djava.library.path=$LIBPATH"
+fi
+
+java -classpath "$CLASSPATH:." $JAVA_OPTIONS Hello
cd -
cd -
This page took
0.023692 seconds
and
4
git commands to generate.