You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by mc...@apache.org on 2012/11/27 19:07:54 UTC
svn commit: r1414294 - in /qpid/trunk/qpid/cpp: ./ bindings/qmf/
bindings/qmf/python/ bindings/qmf/ruby/ bindings/qmf2/
bindings/qmf2/python/ bindings/qmf2/ruby/ bindings/qpid/
bindings/qpid/perl/ bindings/qpid/python/ bindings/qpid/ruby/ include/qmf/
...
Author: mcpierce
Date: Tue Nov 27 18:07:49 2012
New Revision: 1414294
URL: http://svn.apache.org/viewvc?rev=1414294&view=rev
Log:
QPID-4207 : Relocated all swig .i files to the include directory.
Updated the build systems to use the new locations. Updated all other .i
files to not use relative paths when referencing them.
Added:
qpid/trunk/qpid/cpp/include/qmf/qmf2.i
- copied, changed from r1414291, qpid/trunk/qpid/cpp/bindings/qmf2/qmf2.i
qpid/trunk/qpid/cpp/include/qmf/qmfengine.i
- copied, changed from r1414291, qpid/trunk/qpid/cpp/bindings/qmf/qmfengine.i
qpid/trunk/qpid/cpp/include/qpid/qpid.i
- copied, changed from r1414291, qpid/trunk/qpid/cpp/bindings/qpid/qpid.i
Removed:
qpid/trunk/qpid/cpp/bindings/qmf/qmfengine.i
qpid/trunk/qpid/cpp/bindings/qmf2/qmf2.i
qpid/trunk/qpid/cpp/bindings/qpid/qpid.i
Modified:
qpid/trunk/qpid/cpp/CMakeLists.txt
qpid/trunk/qpid/cpp/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf/python/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf/python/python.i
qpid/trunk/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf/ruby/ruby.i
qpid/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf2/python/python.i
qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf2/ruby/ruby.i
qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am
qpid/trunk/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qpid/perl/perl.i
qpid/trunk/qpid/cpp/bindings/qpid/python/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qpid/python/Makefile.am
qpid/trunk/qpid/cpp/bindings/qpid/python/python.i
qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qpid/ruby/Makefile.am
qpid/trunk/qpid/cpp/bindings/qpid/ruby/ruby.i
Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Tue Nov 27 18:07:49 2012
@@ -68,6 +68,15 @@ set (QPIDD_CONF_FILE ${QPIDD_CONF_PATH}
"Name of the Qpid broker configuration file")
install(FILES LICENSE NOTICE DESTINATION ${QPID_INSTALL_DOCDIR})
+install(FILES xml/cluster.xml
+ bindings/swig_perl_typemaps.i
+ bindings/swig_python_typemaps.i
+ bindings/swig_ruby_typemaps.i
+ DESTINATION ${QPID_INSTALL_DATADIR})
+install(FILES include/qpid/qpid.i
+ include/qmf/qmfengine.i
+ include/qmf/qmf2.i
+ DESTINATION ${QPID_INSTALL_INCLUDEDIR})
if (WIN32)
set (CMAKE_DEBUG_POSTFIX "d")
Modified: qpid/trunk/qpid/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/Makefile.am?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/Makefile.am Tue Nov 27 18:07:49 2012
@@ -27,6 +27,7 @@ EXTRA_DIST = \
xml/cluster.xml INSTALL-WINDOWS CMakeLists.txt BuildInstallSettings.cmake \
packaging/NSIS QPID_VERSION.txt bindings/CMakeLists.txt \
bindings/swig_python_typemaps.i bindings/swig_ruby_typemaps.i bindings/swig_perl_typemaps.i
+ include/qpid/qpid.i include/qmf/qmfengine.i include/qmf/qmf2.i
SUBDIRS = managementgen etc src docs/api docs/man examples bindings/qmf bindings/qpid bindings/qmf2
@@ -36,4 +37,4 @@ libtool: $(LIBTOOL_DEPS)
check-long: all
$(MAKE) -C src/tests check-long
-
\ No newline at end of file
+
Modified: qpid/trunk/qpid/cpp/bindings/qmf/python/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/python/CMakeLists.txt?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/python/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/python/CMakeLists.txt Tue Nov 27 18:07:49 2012
@@ -21,7 +21,7 @@
## Use Swig to generate a literal binding to the C++ API
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES CPLUSPLUS ON)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include")
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/bindings")
swig_add_module(qmfengine_python python ${CMAKE_CURRENT_SOURCE_DIR}/python.i)
swig_link_libraries(qmfengine_python qmf qmfconsole ${PYTHON_LIBRARIES})
Modified: qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am Tue Nov 27 18:07:49 2012
@@ -29,7 +29,7 @@ EXTRA_DIST = CMakeLists.txt python.i
BUILT_SOURCES = $(generated_file_list)
SWIG_FLAGS = -w362,401
-$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmfengine.i
+$(generated_file_list): $(srcdir)/python.i
$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o qmfengine.cpp $(srcdir)/python.i
pylibdir = $(pyexecdir)
Modified: qpid/trunk/qpid/cpp/bindings/qmf/python/python.i
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/python/python.i?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/python/python.i (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/python/python.i Tue Nov 27 18:07:49 2012
@@ -139,5 +139,5 @@
-%include "../qmfengine.i"
+%include "qmf/qmfengine.i"
Modified: qpid/trunk/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt Tue Nov 27 18:07:49 2012
@@ -22,7 +22,9 @@
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ruby.i PROPERTIES CPLUSPLUS ON)
-include_directories(${RUBY_INCLUDE_DIRS} ${qpid-cpp_SOURCE_DIR}/include)
+include_directories(${RUBY_INCLUDE_DIRS}
+ ${qpid-cpp_SOURCE_DIR}/include
+ ${qpid-cpp_SOURCE_DIR}/bindings)
swig_add_module(qmfengine_ruby ruby ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i)
swig_link_libraries(qmfengine_ruby qmf qmfconsole ${RUBY_LIBRARY})
Modified: qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am Tue Nov 27 18:07:49 2012
@@ -29,7 +29,7 @@ rubylibdir = $(RUBY_LIB)
dist_rubylib_DATA = qmf.rb
-qmfengine.cpp: $(srcdir)/ruby.i $(srcdir)/../qmfengine.i
+qmfengine.cpp: $(srcdir)/ruby.i
$(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o qmfengine.cpp $(srcdir)/ruby.i
rubylibarchdir = $(RUBY_LIB_ARCH)
Modified: qpid/trunk/qpid/cpp/bindings/qmf/ruby/ruby.i
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/ruby/ruby.i?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/ruby/ruby.i (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/ruby/ruby.i Tue Nov 27 18:07:49 2012
@@ -102,5 +102,5 @@
}
-%include "../qmfengine.i"
+%include "qmf/qmfengine.i"
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt Tue Nov 27 18:07:49 2012
@@ -21,7 +21,7 @@
## Use Swig to generate a literal binding to the C++ API
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES CPLUSPLUS ON)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include")
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/bindings")
swig_add_module(cqmf2_python python ${CMAKE_CURRENT_SOURCE_DIR}/python.i)
swig_link_libraries(cqmf2_python qmf2 ${PYTHON_LIBRARIES})
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am Tue Nov 27 18:07:49 2012
@@ -29,7 +29,7 @@ EXTRA_DIST = CMakeLists.txt python.i
BUILT_SOURCES = $(generated_file_list)
SWIG_FLAGS = -w362,401
-$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmf2.i $(srcdir)/../../swig_python_typemaps.i
+$(generated_file_list): $(srcdir)/python.i
$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqmf2.cpp $(srcdir)/python.i
pylibdir = $(pyexecdir)
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/python/python.i
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/python/python.i?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/python/python.i (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/python/python.i Tue Nov 27 18:07:49 2012
@@ -19,7 +19,7 @@
%module cqmf2
%include "std_string.i"
-%include "../../swig_python_typemaps.i"
+%include "swig_python_typemaps.i"
/* Define the general-purpose exception handling */
%exception {
@@ -37,5 +37,5 @@
}
}
-%include "../qmf2.i"
+%include "qmf/qmf2.i"
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am Tue Nov 27 18:07:49 2012
@@ -27,7 +27,7 @@ SWIG_FLAGS = -w362,401
rubylibdir = $(RUBY_LIB)
-cqmf2.cpp: $(srcdir)/ruby.i $(srcdir)/../qmf2.i $(srcdir)/../../swig_ruby_typemaps.i
+cqmf2.cpp: $(srcdir)/ruby.i
$(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqmf2.cpp $(srcdir)/ruby.i
rubylibarchdir = $(RUBY_LIB_ARCH)
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/ruby/ruby.i
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/ruby/ruby.i?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/ruby/ruby.i (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/ruby/ruby.i Tue Nov 27 18:07:49 2012
@@ -21,7 +21,7 @@
/* Ruby doesn't have a != operator*/
#pragma SWIG nowarn=378
%include "std_string.i"
-%include "../../swig_ruby_typemaps.i"
+%include "swig_ruby_typemaps.i"
/* Define the general-purpose exception handling */
%exception {
@@ -34,4 +34,4 @@
}
}
-%include "../qmf2.i"
+%include "qmf2.i"
Modified: qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am Tue Nov 27 18:07:49 2012
@@ -21,7 +21,7 @@ SUBDIRS = dotnet
if HAVE_SWIG
-EXTRA_DIST = qpid.i
+EXTRA_DIST = CMakeLists.txt qpid.i
if HAVE_RUBY_DEVEL
SUBDIRS += ruby
@@ -39,7 +39,7 @@ EXTRA_DIST += perl/perl.i perl/CMakeList
BUILT_SOURCES = perl/cqpid_perl.cpp
SWIG_FLAGS = -w362,401
-perl/cqpid_perl.cpp: $(srcdir)/perl/perl.i $(srcdir)/qpid.i $(srcdir)/../swig_perl_typemaps.i
+perl/cqpid_perl.cpp: $(srcdir)/perl/perl.i
$(SWIG) -perl -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o perl/cqpid_perl.cpp $(srcdir)/perl/perl.i
perl/Makefile: perl/cqpid_perl.cpp
Modified: qpid/trunk/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/perl/CMakeLists.txt?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/perl/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/perl/CMakeLists.txt Tue Nov 27 18:07:49 2012
@@ -21,18 +21,23 @@
## Use Swig to generate a literal binding to the C++ API
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/perl.i PROPERTIES CPLUSPLUS ON)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/perl.i PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include")
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/perl.i
+ PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/bindings")
swig_add_module(cqpid_perl perl ${CMAKE_CURRENT_SOURCE_DIR}/perl.i)
swig_link_libraries(cqpid_perl qpidmessaging qpidtypes qmf2 ${PERL_LIBRARY})
-set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing -I${PERL_INCLUDE_PATH} -I${qpid-cpp_SOURCE_DIR}/include")
+set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing")
+include_directories(${PERL_INCLUDE_PATH}
+ ${qpid-cpp_SOURCE_DIR}/include
+ ${qpid-cpp_SOURCE_DIR}/bindings)
##----------------------------------
## Install the complete Perl binding
##----------------------------------
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcqpid_perl.so
${CMAKE_CURRENT_BINARY_DIR}/cqpid_perl.pm
+ ${CMAKE_CURRENT_SOURCE_DIR}/qpid.pm
DESTINATION ${PERL_PFX_ARCHLIB}
COMPONENT ${QPID_COMPONENT_CLIENT}
)
Modified: qpid/trunk/qpid/cpp/bindings/qpid/perl/perl.i
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/perl/perl.i?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/perl/perl.i (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/perl/perl.i Tue Nov 27 18:07:49 2012
@@ -19,7 +19,7 @@
%module cqpid_perl
%include "std_string.i"
-%include "../../swig_perl_typemaps.i"
+%include "swig_perl_typemaps.i"
/* Define the general-purpose exception handling */
%exception {
@@ -31,5 +31,5 @@
}
}
-%include "../qpid.i"
+%include "qpid/qpid.i"
Modified: qpid/trunk/qpid/cpp/bindings/qpid/python/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/python/CMakeLists.txt?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/python/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/python/CMakeLists.txt Tue Nov 27 18:07:49 2012
@@ -21,12 +21,16 @@
## Use Swig to generate a literal binding to the C++ API
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES CPLUSPLUS ON)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include")
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i
+ PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/bindings")
swig_add_module(cqpid_python python ${CMAKE_CURRENT_SOURCE_DIR}/python.i)
swig_link_libraries(cqpid_python qpidmessaging qpidtypes qmf2 ${PYTHON_LIBRARIES})
-set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing -I${PYTHON_INCLUDE_PATH} -I${qpid-cpp_SOURCE_DIR}/include")
+set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing")
+include_directories(${PYTHON_INCLUDE_PATH}
+ ${qpid-cpp_SOURCE_DIR}/include
+ ${qpid-cpp_SOURCE_DIR}/bindings)
##------------------------------------
## Install the complete Python binding
Modified: qpid/trunk/qpid/cpp/bindings/qpid/python/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/python/Makefile.am?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/python/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/python/Makefile.am Tue Nov 27 18:07:49 2012
@@ -29,7 +29,7 @@ EXTRA_DIST = CMakeLists.txt python.i
BUILT_SOURCES = $(generated_file_list)
SWIG_FLAGS = -w362,401
-$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qpid.i $(srcdir)/../../swig_python_typemaps.i
+$(generated_file_list): $(srcdir)/python.i
$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o cqpid.cpp $(srcdir)/python.i
pylibdir = $(pyexecdir)
Modified: qpid/trunk/qpid/cpp/bindings/qpid/python/python.i
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/python/python.i?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/python/python.i (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/python/python.i Tue Nov 27 18:07:49 2012
@@ -19,7 +19,7 @@
%module cqpid
%include "std_string.i"
-%include "../../swig_python_typemaps.i"
+%include "swig_python_typemaps.i"
/* Needed for get/setPriority methods. Surprising SWIG 1.3.40 doesn't
* convert uint8_t by default. */
@@ -159,7 +159,7 @@ QPID_EXCEPTION(UnauthorizedAccess, Sessi
%rename(_setTtl) qpid::messaging::Message::setTtl;
-%include "../qpid.i"
+%include "qpid/qpid.i"
%extend qpid::messaging::Connection {
%pythoncode %{
Modified: qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt Tue Nov 27 18:07:49 2012
@@ -31,7 +31,9 @@ set(GEM_OUTPUT_FILE ${GEM_OUTPUT_PATH}/p
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ruby.i PROPERTIES CPLUSPLUS ON)
-include_directories(${RUBY_INCLUDE_DIRS} ${qpid-cpp_SOURCE_DIR}/include)
+include_directories(${RUBY_INCLUDE_DIRS}
+ ${qpid-cpp_SOURCE_DIR}/include
+ ${qpid-cpp_SOURCE_DIR}/bindings)
swig_add_module(cqpid_ruby ruby ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i)
swig_link_libraries(cqpid_ruby qpidmessaging qpidtypes qmf2 ${RUBY_LIBRARY})
Modified: qpid/trunk/qpid/cpp/bindings/qpid/ruby/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/ruby/Makefile.am?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/ruby/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/ruby/Makefile.am Tue Nov 27 18:07:49 2012
@@ -27,7 +27,7 @@ SWIG_FLAGS = -w362,401
rubylibdir = $(RUBY_LIB)
-cqpid.cpp: $(srcdir)/ruby.i $(srcdir)/../qpid.i $(srcdir)/../../swig_ruby_typemaps.i
+cqpid.cpp: $(srcdir)/ruby.i
$(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqpid.cpp $(srcdir)/ruby.i
rubylibarchdir = $(RUBY_LIB_ARCH)
Modified: qpid/trunk/qpid/cpp/bindings/qpid/ruby/ruby.i
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/ruby/ruby.i?rev=1414294&r1=1414293&r2=1414294&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/ruby/ruby.i (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/ruby/ruby.i Tue Nov 27 18:07:49 2012
@@ -21,7 +21,7 @@
/* Ruby doesn't have a != operator*/
#pragma SWIG nowarn=378
%include "std_string.i"
-%include "../../swig_ruby_typemaps.i"
+%include "swig_ruby_typemaps.i"
/* Define the general-purpose exception handling */
%exception {
@@ -34,5 +34,5 @@
}
}
-%include "../qpid.i"
+%include "qpid/qpid.i"
Copied: qpid/trunk/qpid/cpp/include/qmf/qmf2.i (from r1414291, qpid/trunk/qpid/cpp/bindings/qmf2/qmf2.i)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/qmf2.i?p2=qpid/trunk/qpid/cpp/include/qmf/qmf2.i&p1=qpid/trunk/qpid/cpp/bindings/qmf2/qmf2.i&r1=1414291&r2=1414294&rev=1414294&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/cpp/include/qmf/qmfengine.i (from r1414291, qpid/trunk/qpid/cpp/bindings/qmf/qmfengine.i)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/qmfengine.i?p2=qpid/trunk/qpid/cpp/include/qmf/qmfengine.i&p1=qpid/trunk/qpid/cpp/bindings/qmf/qmfengine.i&r1=1414291&r2=1414294&rev=1414294&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/cpp/include/qpid/qpid.i (from r1414291, qpid/trunk/qpid/cpp/bindings/qpid/qpid.i)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/qpid.i?p2=qpid/trunk/qpid/cpp/include/qpid/qpid.i&p1=qpid/trunk/qpid/cpp/bindings/qpid/qpid.i&r1=1414291&r2=1414294&rev=1414294&view=diff
==============================================================================
(empty)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org