Merged into master, stable-2.6, and adapted for stable-2.5. Thanks!
Mathieu ----- Original Message ----- > From: "Christian Babeux" <[email protected]> > To: [email protected] > Cc: "mathieu desnoyers" <[email protected]>, "Christian Babeux" > <[email protected]> > Sent: Friday, November 28, 2014 4:39:50 PM > Subject: [PATCH lttng-ust] Fix: Shorthand option -cp not supported in all > version of Java > > Signed-off-by: Christian Babeux <[email protected]> > --- > doc/examples/java-jul/Makefile | 2 +- > doc/examples/java-jul/run | 2 +- > doc/examples/java-log4j/Makefile | 2 +- > doc/examples/java-log4j/run | 2 +- > liblttng-ust-java-agent/java/Makefile.am | 4 ++-- > liblttng-ust-java/Makefile.am | 2 +- > 6 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/doc/examples/java-jul/Makefile b/doc/examples/java-jul/Makefile > index a45719d..1431b60 100644 > --- a/doc/examples/java-jul/Makefile > +++ b/doc/examples/java-jul/Makefile > @@ -32,7 +32,7 @@ else > endif > > JFLAGS = -g > -JC = javac -cp "$(CLASSPATH):." > +JC = javac -classpath "$(CLASSPATH):." > .SUFFIXES: .java .class > .java.class: > $(JC) $(JFLAGS) $*.java > diff --git a/doc/examples/java-jul/run b/doc/examples/java-jul/run > index b8342f7..1beac85 100755 > --- a/doc/examples/java-jul/run > +++ b/doc/examples/java-jul/run > @@ -19,6 +19,6 @@ else > LIBPATH="/usr/local/lib:/usr/lib" > fi > > -java -cp "$CLASSPATH:." -Djava.library.path="$LIBPATH" Hello > +java -classpath "$CLASSPATH:." -Djava.library.path="$LIBPATH" Hello > > cd - > diff --git a/doc/examples/java-log4j/Makefile > b/doc/examples/java-log4j/Makefile > index e174e31..4b59964 100644 > --- a/doc/examples/java-log4j/Makefile > +++ b/doc/examples/java-log4j/Makefile > @@ -34,7 +34,7 @@ else > CLASSPATH=$(JAVA_CLASSPATH_OVERRIDE)/$(JARFILE):$(LOG4J) > endif > > -JC = javac -cp "$(CLASSPATH):." > +JC = javac -classpath "$(CLASSPATH):." > .SUFFIXES: .java .class > .java.class: > $(JC) $(JFLAGS) $*.java > diff --git a/doc/examples/java-log4j/run b/doc/examples/java-log4j/run > index 3a84f59..128725f 100755 > --- a/doc/examples/java-log4j/run > +++ b/doc/examples/java-log4j/run > @@ -20,6 +20,6 @@ else > LIBPATH="/usr/local/lib:/usr/lib" > fi > > -java -cp "$CLASSPATH:." Hello > +java -classpath "$CLASSPATH:." Hello > > cd - > diff --git a/liblttng-ust-java-agent/java/Makefile.am > b/liblttng-ust-java-agent/java/Makefile.am > index f9344bb..bcf6abe 100644 > --- a/liblttng-ust-java-agent/java/Makefile.am > +++ b/liblttng-ust-java-agent/java/Makefile.am > @@ -53,11 +53,11 @@ $(jarfile_old): classnoinst.stamp > $(pkgpath)/jul/*.class $(pkgpath_old)/*.class > > jul-jni-header.stamp: $(dist_noinst_JAVA) > - $(JAVAH) -cp $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) > org.lttng.ust.agent.jul.LTTngLogHandler && \ > + $(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) > org.lttng.ust.agent.jul.LTTngLogHandler && \ > echo "JUL JNI header generated" > jul-jni-header.stamp > > log4j-jni-header.stamp: $(dist_noinst_JAVA) > - $(JAVAH) -cp $(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) > org.lttng.ust.agent.log4j.LTTngLogAppender && \ > + $(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(log4jjniout) > $(JAVAHFLAGS) > org.lttng.ust.agent.log4j.LTTngLogAppender && \ > echo "Log4j JNI header generated" > log4j-jni-header.stamp > > all-local: $(stamp) > diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am > index fee9b7d..baada57 100644 > --- a/liblttng-ust-java/Makefile.am > +++ b/liblttng-ust-java/Makefile.am > @@ -20,7 +20,7 @@ $(jarfile): classnoinst.stamp > org_lttng_ust_LTTngUst.h: jni-header.stamp > > jni-header.stamp: $(dist_noinst_JAVA) > - $(JAVAH) -cp $(srcdir) $(JAVAHFLAGS) org.lttng.ust.LTTngUst && \ > + $(JAVAH) -classpath $(srcdir) $(JAVAHFLAGS) org.lttng.ust.LTTngUst && \ > echo "JNI header generated" > jni-header.stamp > > all-local: org_lttng_ust_LTTngUst.h > -- > 2.1.1 > > -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
