You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2015/07/06 01:45:19 UTC
[18/38] qpid-proton git commit: PROTON-881: build the reactor interop
test into the proton-j jar
PROTON-881: build the reactor interop test into the proton-j jar
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/9daab5f8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/9daab5f8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/9daab5f8
Branch: refs/heads/master
Commit: 9daab5f836aacca3e0efde9ceff321784e4356aa
Parents: a65760a
Author: Rafael Schloming <rh...@alum.mit.edu>
Authored: Thu May 7 04:25:53 2015 -0400
Committer: Rafael Schloming <rh...@alum.mit.edu>
Committed: Thu May 7 04:25:53 2015 -0400
----------------------------------------------------------------------
config.sh.in | 2 +-
proton-j/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/9daab5f8/config.sh.in
----------------------------------------------------------------------
diff --git a/config.sh.in b/config.sh.in
index 3d74916..4b60b2f 100755
--- a/config.sh.in
+++ b/config.sh.in
@@ -33,7 +33,7 @@ PERL_BINDINGS=$PROTON_BINDINGS/perl
COMMON_PYPATH=$PROTON_HOME/tests/python:$PROTON_HOME/proton-c/bindings/python
export PYTHONPATH=$COMMON_PYPATH:$PYTHON_BINDINGS
export JYTHONPATH=$COMMON_PYPATH:$PROTON_HOME/proton-j/src/main/resources:$PROTON_JARS
-export CLASSPATH=$PROTON_JARS:$PROTON_HOME/tests/target/test-classes
+export CLASSPATH=$PROTON_JARS
# PHP
if [ -d $PHP_BINDINGS ]; then
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/9daab5f8/proton-j/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-j/CMakeLists.txt b/proton-j/CMakeLists.txt
index d614196..b675464 100644
--- a/proton-j/CMakeLists.txt
+++ b/proton-j/CMakeLists.txt
@@ -20,7 +20,7 @@
include(UseJava)
include(ProtonUseJava)
set(CMAKE_JAVA_TARGET_VERSION ${PN_VERSION})
-file(GLOB_RECURSE SOURCES_ABS "src/main/java/*.java")
+file(GLOB_RECURSE SOURCES_ABS "src/main/java/*.java" "../tests/*/ProtonJInterop.java")
add_jar(proton-j ${SOURCES_ABS})
rebuild_jar(proton-j proton-j-${PN_VERSION}.jar)
set (JAVA_INSTALL_DIR ${SHARE_INSTALL_DIR}/java CACHE PATH "Installation directory for all JARs except those using JNI")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org