You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2017/07/07 16:57:23 UTC
qpid-interop-test git commit: QPIDIT-86: Fixed problem with
get-proj-ver script
Repository: qpid-interop-test
Updated Branches:
refs/heads/master 038994d19 -> bddf69106
QPIDIT-86: Fixed problem with get-proj-ver script
Project: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/commit/bddf6910
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/bddf6910
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/bddf6910
Branch: refs/heads/master
Commit: bddf691068a9cdb95612870788832dd4f9b44199
Parents: 038994d
Author: Kim van der Riet <kp...@apache.org>
Authored: Fri Jul 7 12:57:03 2017 -0400
Committer: Kim van der Riet <kp...@apache.org>
Committed: Fri Jul 7 12:57:03 2017 -0400
----------------------------------------------------------------------
get-proj-ver | 2 +-
shims/qpid-jms/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/bddf6910/get-proj-ver
----------------------------------------------------------------------
diff --git a/get-proj-ver b/get-proj-ver
index 4c46213..4252081 100755
--- a/get-proj-ver
+++ b/get-proj-ver
@@ -4,7 +4,7 @@ use strict;
use warnings;
use XML::XPath;
-my $root = XML::XPath->new(filename => 'pom.xml');
+my $root = XML::XPath->new(filename => $ARGV[0]);
for my $node ($root->find('//project/version/text()')->get_nodelist) {
print($node->getData, "\n");
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/bddf6910/shims/qpid-jms/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/shims/qpid-jms/CMakeLists.txt b/shims/qpid-jms/CMakeLists.txt
index 5ab0fe3..2427ced 100644
--- a/shims/qpid-jms/CMakeLists.txt
+++ b/shims/qpid-jms/CMakeLists.txt
@@ -32,7 +32,7 @@ add_custom_target(blah ALL mvn -DskipTests package
set(JMS_INSTALL_ROOT ${CMAKE_INSTALL_PREFIX}/libexec/qpid_interop_test/shims/qpid-jms)
# Find the version string from the pom.xml file (as this in included in the jar file name)
-execute_process(COMMAND ${CMAKE_SOURCE_DIR}/get-proj-ver
+execute_process(COMMAND ${CMAKE_SOURCE_DIR}/get-proj-ver ${CMAKE_SOURCE_DIR}/pom.xml
OUTPUT_VARIABLE QPID_JMS_SHIM_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
message(STATUS "Qpid JMS shim version: ${QPID_JMS_SHIM_VERSION}")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org