cxx: Rename include/libsigrok/ to include/libsigrokcxx/.
This commit is contained in:
Uwe Hermann
parent
1b40fdb881
commit
161dc24d84
10
Makefile.am
10
Makefile.am
|
|
@ -445,8 +445,8 @@ bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
|
|||
bindings_cxx_libsigrokcxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
|
||||
|
||||
library_include_HEADERS += \
|
||||
bindings/cxx/include/libsigrok/libsigrokcxx.hpp \
|
||||
bindings/cxx/include/libsigrok/enums.hpp
|
||||
bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \
|
||||
bindings/cxx/include/libsigrokcxx/enums.hpp
|
||||
|
||||
pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc
|
||||
|
||||
|
|
@ -455,7 +455,7 @@ doxy/xml/index.xml: include/libsigrok/libsigrok.h
|
|||
|
||||
bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp
|
||||
|
||||
bindings/cxx/include/libsigrok/enums.hpp: bindings/cxx/enums.timestamp
|
||||
bindings/cxx/include/libsigrokcxx/enums.hpp: bindings/cxx/enums.timestamp
|
||||
|
||||
bindings/cxx/enums.timestamp: bindings/cxx/enums.py doxy/xml/index.xml \
|
||||
bindings/cxx/ConfigKey_methods.cpp bindings/cxx/QuantityFlag_methods.cpp
|
||||
|
|
@ -469,7 +469,7 @@ cxx-clean:
|
|||
rm -rf doxy/
|
||||
rm -rf bindings/cxx/doxy/
|
||||
rm -f bindings/cxx/enums.cpp
|
||||
rm -f bindings/cxx/include/libsigrok/enums.hpp
|
||||
rm -f bindings/cxx/include/libsigrokcxx/enums.hpp
|
||||
rm -f bindings/cxx/enums.timestamp
|
||||
|
||||
CLEAN_EXTRA += cxx-clean
|
||||
|
|
@ -478,7 +478,7 @@ endif
|
|||
|
||||
CPPXMLDOC = bindings/cxx/doxy/xml/index.xml
|
||||
|
||||
$(CPPXMLDOC): bindings/cxx/include/libsigrok/libsigrokcxx.hpp \
|
||||
$(CPPXMLDOC): bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \
|
||||
bindings/cxx/enums.timestamp
|
||||
$(AM_V_GEN)cd $(srcdir)/bindings/cxx && BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null
|
||||
|
||||
|
|
|
|||
|
|
@ -743,7 +743,7 @@ WARN_LOGFILE =
|
|||
# spaces.
|
||||
# Note: If this tag is empty the current directory is searched.
|
||||
|
||||
INPUT = include/libsigrok/libsigrokcxx.hpp
|
||||
INPUT = include/libsigrokcxx/libsigrokcxx.hpp
|
||||
|
||||
# This tag can be used to specify the character encoding of the source files
|
||||
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "libsigrok/libsigrokcxx.hpp"
|
||||
#include "libsigrokcxx/libsigrokcxx.hpp"
|
||||
|
||||
#include <sstream>
|
||||
#include <cmath>
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ index_file = sys.argv[1]
|
|||
dirname = os.path.dirname(os.path.realpath(__file__))
|
||||
|
||||
outdirname = "bindings/cxx"
|
||||
if not os.path.exists(os.path.join(outdirname, 'include/libsigrok')):
|
||||
os.makedirs(os.path.join(outdirname, 'include/libsigrok'))
|
||||
if not os.path.exists(os.path.join(outdirname, 'include/libsigrokcxx')):
|
||||
os.makedirs(os.path.join(outdirname, 'include/libsigrokcxx'))
|
||||
|
||||
mapping = dict([
|
||||
('sr_loglevel', ('LogLevel', 'Log verbosity level')),
|
||||
|
|
@ -65,7 +65,7 @@ for compound in index.findall('compound'):
|
|||
if name in mapping:
|
||||
classes[member] = mapping[name]
|
||||
|
||||
header = open(os.path.join(outdirname, 'include/libsigrok/enums.hpp'), 'w')
|
||||
header = open(os.path.join(outdirname, 'include/libsigrokcxx/enums.hpp'), 'w')
|
||||
code = open(os.path.join(outdirname, 'enums.cpp'), 'w')
|
||||
swig = open(os.path.join(dirname, '../swig/enums.i'), 'w')
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ sr_includes, sr_lib_dirs, sr_libs, (sr_version,) = [
|
|||
|
||||
includes = ['../../include', '../cxx/include']
|
||||
includes += [os.path.join(srcdir, path) for path in includes]
|
||||
includes += ['../..', '../../include/libsigrok', '../cxx/include/libsigrok']
|
||||
includes += ['../..', '../../include/libsigrok', '../cxx/include/libsigrokcxx']
|
||||
includes += [i[2:] for i in sr_includes]
|
||||
includes += [np.get_include(), ]
|
||||
libdirs = ['../../.libs', '../cxx/.libs'] + [l[2:] for l in sr_lib_dirs]
|
||||
|
|
|
|||
|
|
@ -353,7 +353,7 @@ typedef guint pyg_flags_type;
|
|||
|
||||
%{
|
||||
|
||||
#include "libsigrok/libsigrokcxx.hpp"
|
||||
#include "libsigrokcxx/libsigrokcxx.hpp"
|
||||
|
||||
/* Convert from a Python dict to a std::map<std::string, std::string> */
|
||||
std::map<std::string, std::string> dict_to_map_string(PyObject *dict)
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#pragma SWIG nowarn=325,401
|
||||
|
||||
%{
|
||||
#include "libsigrok/libsigrokcxx.hpp"
|
||||
#include "libsigrokcxx/libsigrokcxx.hpp"
|
||||
using namespace std;
|
||||
%}
|
||||
|
||||
|
|
@ -271,10 +271,10 @@ typedef std::map<const sigrok::ConfigKey *, Glib::VariantBase>
|
|||
%attribute(sigrok::Analog, const sigrok::Unit *, unit, unit);
|
||||
%attributevector(Analog, std::vector<const sigrok::QuantityFlag *>, mq_flags, mq_flags);
|
||||
|
||||
%include "libsigrok/libsigrokcxx.hpp"
|
||||
%include "libsigrokcxx/libsigrokcxx.hpp"
|
||||
|
||||
%include "enums.i"
|
||||
|
||||
namespace sigrok {
|
||||
%include "libsigrok/enums.hpp"
|
||||
%include "libsigrokcxx/enums.hpp"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@ AC_CHECK_HEADERS([sys/mman.h sys/ioctl.h], [], [HW_BEAGLELOGIC="no"])
|
|||
AC_SUBST(SR_PKGLIBS)
|
||||
|
||||
CFLAGS="$CFLAGS -Iinclude/libsigrok -I${srcdir}/include/libsigrok $LIB_CFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibindings/cxx/include/libsigrok -I${srcdir}/bindings/cxx/include $LIB_CFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibindings/cxx/include/libsigrokcxx -I${srcdir}/bindings/cxx/include $LIB_CFLAGS"
|
||||
|
||||
# Find Java compiler and JNI includes for Java bindings.
|
||||
AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no])
|
||||
|
|
|
|||
Loading…
Reference in New Issue