Fix: Shorthand option -cp not supported in all version of Java

Signed-off-by: Christian Babeux <christian.babeux@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/doc/examples/java-jul/Makefile b/doc/examples/java-jul/Makefile
index a45719d197448ef34dfd3082af4238974a2082cf..1431b60bf716c56c7fd8e4d1e2db808891fd28ed 100644 (file)
--- 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 b8342f7004db1a7202a26fca48211a48c5328711..1beac853f3e9cd59cdbc40887df81e11dbfc070d 100755 (executable)
--- 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 e174e3182d91a582c2a03ae5590d55a0737c2cea..4b5996422c6f3768f184033fecf8f1f04997ea8c 100644 (file)
--- 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 3a84f594b1484b3402bd8929bf64b59ab75bb0fa..128725f1e2eda38bfbebcc83c89e770d7aa0a48e 100755 (executable)
--- 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 f9344bb049f30c18123ce239d57aa8e35a3513ce..bcf6abec8c5f9af9f5e61cea3da58d54bae5bbab 100644 (file)
--- 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 fee9b7d28b79b2f2567e91c57124b7c3ac9d65b1..baada571bf8d75ae3219fd362a62fef7e48e9b8b 100644 (file)
--- 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