From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Tue, 30 Jun 2015 22:29:38 +0000 (UTC)
Subject: [lttng-dev] [PATCH lttng-ust] Fix: running java examples out of
	tree
In-Reply-To: <1435699976-8809-1-git-send-email-mjeanson@efficios.com>
References: <1435699976-8809-1-git-send-email-mjeanson@efficios.com>
Message-ID: <1836832586.1530.1435703378334.JavaMail.zimbra@efficios.com>

merged into master and stable-2.6, thanks!

Mathieu

----- On Jun 30, 2015, at 5:32 PM, Michael Jeanson mjeanson at efficios.com wrote:

> ---
> doc/examples/java-jul/run   | 7 ++++++-
> doc/examples/java-log4j/run | 7 ++++++-
> 2 files changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/doc/examples/java-jul/run b/doc/examples/java-jul/run
> index 37a3cfd..6deb6fd 100755
> --- a/doc/examples/java-jul/run
> +++ b/doc/examples/java-jul/run
> @@ -8,6 +8,7 @@
> 
> DIR=`dirname $0`
> JARFILE="liblttng-ust-agent.jar"
> +JAVA_OPTIONS=""
> 
> cd $DIR
> 
> @@ -20,6 +21,10 @@ else
> 	#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 -
> diff --git a/doc/examples/java-log4j/run b/doc/examples/java-log4j/run
> index 9dca608..91f8f5d 100755
> --- a/doc/examples/java-log4j/run
> +++ b/doc/examples/java-log4j/run
> @@ -8,6 +8,7 @@
> 
> DIR=`dirname $0`
> JARFILE="liblttng-ust-agent.jar"
> +JAVA_OPTIONS=""
> 
> # If system classpath is empty, try to guess log4j location
> if [ "x$CLASSPATH" = "x" ]; then
> @@ -25,6 +26,10 @@ else
> 	#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 -
> --
> 1.9.1

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com