You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2017/01/03 19:13:01 UTC
[1/2] qpid-interop-test git commit: HACK disable rhea install (not
running with admin privs)
Repository: qpid-interop-test
Updated Branches:
refs/heads/private-crolke-lite-client-dev [created] 132c64c95
HACK disable rhea install (not running with admin privs)
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/19207a0b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/19207a0b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/19207a0b
Branch: refs/heads/private-crolke-lite-client-dev
Commit: 19207a0b867aa2f5d3d3540cb2172b92f0a0960e
Parents: a178957
Author: Chuck Rolke <cr...@redhat.com>
Authored: Tue Jan 3 09:41:51 2017 -0500
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Tue Jan 3 09:41:56 2017 -0500
----------------------------------------------------------------------
CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/19207a0b/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 830d737..b752e9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,8 +51,8 @@ install(CODE "execute_process(COMMAND chmod +x Receiver.py
WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages/qpid_interop_test/shims/qpid-proton-python/jms_messages_test/)")
# Install Rhea client dependencies
-install(CODE "execute_process(COMMAND npm install node-uuid
- WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages/qpid_interop_test/shims/rhea-js/)")
-install(CODE "execute_process(COMMAND npm link rhea
- WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages/qpid_interop_test/shims/rhea-js/)")
+# install(CODE "execute_process(COMMAND npm install node-uuid
+# WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages/qpid_interop_test/shims/rhea-js/)")
+# install(CODE "execute_process(COMMAND npm link rhea
+# WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages/qpid_interop_test/shims/rhea-js/)")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-interop-test git commit: Add cmake logic to build AMQP.Net
Lite under mono
Posted by ch...@apache.org.
Add cmake logic to build AMQP.Net Lite under mono
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/132c64c9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/132c64c9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/132c64c9
Branch: refs/heads/private-crolke-lite-client-dev
Commit: 132c64c95f238a2836f7e77bf5f0c199fac4019e
Parents: 19207a0
Author: Chuck Rolke <cr...@redhat.com>
Authored: Tue Jan 3 14:11:46 2017 -0500
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Tue Jan 3 14:11:46 2017 -0500
----------------------------------------------------------------------
CMakeLists.txt | 1 +
shims/amqpnetlite/src/CMakeLists.txt | 44 +++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/132c64c9/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b752e9a..efef270 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,7 @@ cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
set(PROTON_INSTALL_DIR "/usr/local/qpid-proton" CACHE PATH "Proton install directory")
add_subdirectory(shims/qpid-proton-cpp/src)
+add_subdirectory(shims/amqpnetlite/src)
# Build Java code
install(CODE "execute_process(COMMAND mvn -DskipTests install
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/132c64c9/shims/amqpnetlite/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/shims/amqpnetlite/src/CMakeLists.txt b/shims/amqpnetlite/src/CMakeLists.txt
new file mode 100644
index 0000000..3c81c10
--- /dev/null
+++ b/shims/amqpnetlite/src/CMakeLists.txt
@@ -0,0 +1,44 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+project (qpid-interop-test-amqpnetlite-shims)
+
+cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
+
+# Set AMQPNETLITE build or not based on installed mono version
+set(lite_default ON)
+
+find_program(PROG_MONO mono)
+
+if (PROG_MONO-NOTFOUND)
+ set(lite_default OFF)
+else ()
+ # mono found. Check version
+ execute_process(COMMAND mono --version OUTPUT_VARIABLE ov)
+ string(REPLACE " " ";" ov_list ${ov})
+ list(GET ov_list 4 mono_ver)
+ if(mono_ver VERSION_LESS "4.2.4")
+ message(STATUS "AMQP.Net Lite requires mono minimum version 4.2.4. Version ${mono_ver} detected.")
+ set(lite_default OFF)
+ endif ()
+endif ()
+
+option(BUILD_AMQPNETLITE "Build AMQP.Net Lite shim under mono" ${lite_default})
+
+message(STATUS "BUILD_AMQPNETLITE = ${BUILD_AMQPNETLITE}")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org