qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kp...@apache.org
Subject qpid-interop-test git commit: QPIDIT-86: Provided custom script for parsing pom file for project version that works on older distros (xpath was problematic)
Date Fri, 07 Jul 2017 16:42:28 GMT
Repository: qpid-interop-test
Updated Branches:
  refs/heads/master 4bb501561 -> 038994d19


QPIDIT-86: Provided custom script for parsing pom file for project version that works on older
distros (xpath was problematic)


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/038994d1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/038994d1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/038994d1

Branch: refs/heads/master
Commit: 038994d199318930eac1e84c79db94e8a6547183
Parents: 4bb5015
Author: Kim van der Riet <kpvdr@apache.org>
Authored: Fri Jul 7 12:42:11 2017 -0400
Committer: Kim van der Riet <kpvdr@apache.org>
Committed: Fri Jul 7 12:42:11 2017 -0400

----------------------------------------------------------------------
 get-proj-ver                  | 10 ++++++++++
 shims/qpid-jms/CMakeLists.txt |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/038994d1/get-proj-ver
----------------------------------------------------------------------
diff --git a/get-proj-ver b/get-proj-ver
new file mode 100755
index 0000000..4c46213
--- /dev/null
+++ b/get-proj-ver
@@ -0,0 +1,10 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use XML::XPath;
+
+my $root = XML::XPath->new(filename => 'pom.xml');
+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/038994d1/shims/qpid-jms/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/shims/qpid-jms/CMakeLists.txt b/shims/qpid-jms/CMakeLists.txt
index e5839a7..5ab0fe3 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 xpath -q -e "//project/version/text()" ${CMAKE_SOURCE_DIR}/pom.xml
+execute_process(COMMAND ${CMAKE_SOURCE_DIR}/get-proj-ver
                 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


Mime
View raw message