You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2017/11/07 19:26:45 UTC
[03/10] qpid-proton git commit: PROTON-1064: [ruby] use separate
directory for gem build
PROTON-1064: [ruby] use separate directory for gem build
Copying ruby sources into the root binary directory for the gem build creates
confusion since this directory is on the RUBYLIB path for generated SWIG code.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/bca7fd17
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/bca7fd17
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/bca7fd17
Branch: refs/heads/master
Commit: bca7fd17a4d4156a5b8a7c124cae6a595114b75e
Parents: 82681ad
Author: Alan Conway <ac...@redhat.com>
Authored: Mon Nov 6 10:30:27 2017 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Tue Nov 7 13:31:51 2017 -0500
----------------------------------------------------------------------
proton-c/bindings/ruby/CMakeLists.txt | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bca7fd17/proton-c/bindings/ruby/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/ruby/CMakeLists.txt b/proton-c/bindings/ruby/CMakeLists.txt
index 5ceb7f0..93364e2 100644
--- a/proton-c/bindings/ruby/CMakeLists.txt
+++ b/proton-c/bindings/ruby/CMakeLists.txt
@@ -51,14 +51,16 @@ find_program(GEM_EXE gem DOC "Program to build and install ruby gem packages")
mark_as_advanced(GEM_EXE)
if (GEM_EXE)
# Copy source and generated files to the build tree so we can build the gem in one place
- configure_file(${src}/qpid_proton.gemspec.in ${bin}/qpid_proton.gemspec)
+ configure_file(${src}/qpid_proton.gemspec.in ${bin}/gem/qpid_proton.gemspec)
add_custom_command(
OUTPUT ${bin}/qpid_proton-${PN_VERSION}.gem
- COMMAND ${CMAKE_COMMAND} -E copy_directory ${src} ${bin}
- COMMAND ${CMAKE_COMMAND} -E copy ${bin}/rubyRUBY_wrap.c ${bin}/ext/cproton/cproton.c
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${src} ${bin}/gem
+ COMMAND ${CMAKE_COMMAND} -E copy ${bin}/rubyRUBY_wrap.c ${bin}/gem/ext/cproton/cproton.c
COMMAND ${GEM_EXE} build qpid_proton.gemspec
- DEPENDS ${RUBY_SRC} ${src}/LICENSE ${src}/TODO ${src}/ChangeLog cproton-ruby
- WORKING_DIRECTORY ${bin})
+ COMMAND ${CMAKE_COMMAND} -E copy ${bin}/gem/qpid_proton-${PN_VERSION}.gem ${bin}
+ WORKING_DIRECTORY ${bin}/gem
+ DEPENDS ${RUBY_SRC} ${src}/LICENSE ${src}/TODO ${src}/ChangeLog cproton-ruby ${bin}/rubyRUBY_wrap.c
+ )
add_custom_target(ruby-gem ALL DEPENDS ${bin}/qpid_proton-${PN_VERSION}.gem )
endif ()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org