BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename libsigrokxx to the more common libsigrokcxx.

This commit is contained in:
Uwe Hermann 2015-01-17 18:49:04 +01:00
parent f3256bb706
commit 52ff4f6a04
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.am
View File

@ -436,19 +436,19 @@ CLEAN_EXTRA =
if BINDINGS_CXX if BINDINGS_CXX
lib_LTLIBRARIES += bindings/cxx/libsigrokxx.la lib_LTLIBRARIES += bindings/cxx/libsigrokcxx.la
bindings_cxx_libsigrokxx_la_SOURCES = bindings/cxx/classes.cpp bindings_cxx_libsigrokcxx_la_SOURCES = bindings/cxx/classes.cpp
bindings_cxx_libsigrokxx_la_LIBADD = libsigrok.la $(glibmm_LIBS) bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
bindings_cxx_libsigrokxx_la_LDFLAGS = $(SR_LIB_LDFLAGS) bindings_cxx_libsigrokcxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
library_include_HEADERS += \ library_include_HEADERS += \
bindings/cxx/include/libsigrok/libsigrok.hpp \ bindings/cxx/include/libsigrok/libsigrok.hpp \
bindings/cxx/include/libsigrok/enums.hpp bindings/cxx/include/libsigrok/enums.hpp
pkgconfig_DATA += bindings/cxx/libsigrokxx.pc pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc
doxy/xml/index.xml: include/libsigrok/libsigrok.h doxy/xml/index.xml: include/libsigrok/libsigrok.h
$(AM_V_GEN)cd $(srcdir) && BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null $(AM_V_GEN)cd $(srcdir) && BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null
@ -497,7 +497,7 @@ python-quietclean:
$(AM_V_at)cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet clean --all 3>&1 1>&2 2>&3 \ $(AM_V_at)cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet clean --all 3>&1 1>&2 2>&3 \
| grep -v "can.t clean it"; true | grep -v "can.t clean it"; true
$(PDIR)/timestamp: bindings/cxx/libsigrokxx.la $(PDIR)/sigrok/core/classes.i \ $(PDIR)/timestamp: bindings/cxx/libsigrokcxx.la $(PDIR)/sigrok/core/classes.i \
bindings/swig/classes.i $(PDOC) $(library_include_HEADERS) bindings/swig/classes.i $(PDOC) $(library_include_HEADERS)
$(AM_V_at)$(MAKE) python-quietclean $(AM_V_at)$(MAKE) python-quietclean
$(AM_V_GEN)cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet build 3>&1 1>&2 2>&3 \ $(AM_V_GEN)cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet build 3>&1 1>&2 2>&3 \
@ -552,10 +552,10 @@ $(JJAR): $(JCXX)
$(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC) $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC)
$(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG) $(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG)
$(JLIB): $(JCXX) bindings/cxx/libsigrokxx.la $(library_include_HEADERS) $(JLIB): $(JCXX) bindings/cxx/libsigrokcxx.la $(library_include_HEADERS)
$(AM_V_GEN)$(CXXCOMPILE) -L.libs -Lbindings/cxx/.libs \ $(AM_V_GEN)$(CXXCOMPILE) -L.libs -Lbindings/cxx/.libs \
-fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \ -fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \
-lsigrokxx -o $(JLIB) -lsigrokcxx -o $(JLIB)
java-install: java-install:
$(INSTALL) -d $(libdir)/jni $(INSTALL) -d $(libdir)/jni

4
README
View File

@ -61,7 +61,7 @@ Requirements for the C++ bindings:
Requirements for the Python bindings: Requirements for the Python bindings:
- libsigrokxx >= 0.3.0 (the libsigrok C++ bindings, see above) - libsigrokcxx >= 0.3.0 (the libsigrok C++ bindings, see above)
- Python >= 2.7 or Python >= 3 (including development files!) - Python >= 2.7 or Python >= 3 (including development files!)
- Python setuptools (for Python 2 or 3) - Python setuptools (for Python 2 or 3)
- pygobject >= 3.0.0 (for Python 2 or 3), a.k.a python-gi - pygobject >= 3.0.0 (for Python 2 or 3), a.k.a python-gi
@ -73,7 +73,7 @@ Requirements for the Python bindings:
Requirements for the Java bindings: Requirements for the Java bindings:
- libsigrokxx >= 0.3.0 (the libsigrok C++ bindings, see above) - libsigrokcxx >= 0.3.0 (the libsigrok C++ bindings, see above)
- SWIG >= 2.0.0 - SWIG >= 2.0.0
- Java JDK (for JNI includes and the javac/jar binaries) - Java JDK (for JNI includes and the javac/jar binaries)
- doxygen (optional, only needed for the Java API docs) - doxygen (optional, only needed for the Java API docs)

2
bindings/cxx/Doxyfile
View File

@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places. # title of most generated pages and in a few other places.
# The default value is: My Project. # The default value is: My Project.
PROJECT_NAME = "sigrok++" PROJECT_NAME = "libsigrokcxx"
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version

12
bindings/cxx/include/libsigrok/libsigrok.hpp
View File

@ -24,8 +24,8 @@
Introduction Introduction
------------ ------------
The sigrok++ API provides an object-oriented C++ interface to the functionality The libsigrokcxx API provides an object-oriented C++ interface to the
in libsigrok, including automatic memory and resource management. functionality in libsigrok, including automatic memory and resource management.
It is built on top of the public libsigrok C API, and is designed to be used as It is built on top of the public libsigrok C API, and is designed to be used as
a standalone alternative API. Programs should not mix usage of the C and C++ a standalone alternative API. Programs should not mix usage of the C and C++
@ -45,10 +45,10 @@ use. The C++ interface code also keeps track of internal dependencies between
libsigrok resources, and ensures that objects are not prematurely deleted when libsigrok resources, and ensures that objects are not prematurely deleted when
their resources are in use by other objects. their resources are in use by other objects.
This means that management of sigrok++ objects and their underlying libsigrok This means that management of libsigrokcxx objects and their underlying
resources can be treated as fully automatic. As long as all shared pointers to libsigrok resources can be treated as fully automatic. As long as all shared
objects are deleted or reassigned when no longer in use, all underlying pointers to objects are deleted or reassigned when no longer in use, all
resources will be released at the right time. underlying resources will be released at the right time.
Getting started Getting started
--------------- ---------------

4
bindings/cxx/libsigrokxx.pc.in → bindings/cxx/libsigrokcxx.pc.in
View File

@ -3,13 +3,13 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
Name: libsigrokxx Name: libsigrokcxx
Description: C++ bindings for libsigrok Description: C++ bindings for libsigrok
URL: http://www.sigrok.org URL: http://www.sigrok.org
Requires: libsigrok glibmm-2.4 Requires: libsigrok glibmm-2.4
Requires.private: @SR_PKGLIBS@ Requires.private: @SR_PKGLIBS@
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lsigrokxx Libs: -L${libdir} -lsigrokcxx
Libs.private: -lm Libs.private: -lm
Cflags: -I${includedir} Cflags: -I${includedir}

2
bindings/java/org/sigrok/core/classes/classes.i
View File

@ -16,7 +16,7 @@
* ------------ * ------------
* *
* The sigrok-java API provides an object-oriented Java interface to the * The sigrok-java API provides an object-oriented Java interface to the
* functionality in libsigrok. It is built on top of the sigrok++ C++ API. * functionality in libsigrok. It is built on top of the libsigrokcxx C++ API.
* *
* Getting started * Getting started
* --------------- * ---------------

2
bindings/python/setup.py
View File

@ -39,7 +39,7 @@ includes += ['../..', '../../include/libsigrok', '../cxx/include/libsigrok']
includes += [i[2:] for i in sr_includes] includes += [i[2:] for i in sr_includes]
includes += [np.get_include(), ] includes += [np.get_include(), ]
libdirs = ['../../.libs', '../cxx/.libs'] + [l[2:] for l in sr_lib_dirs] libdirs = ['../../.libs', '../cxx/.libs'] + [l[2:] for l in sr_lib_dirs]
libs = [l[2:] for l in sr_libs] + ['sigrokxx'] libs = [l[2:] for l in sr_libs] + ['sigrokcxx']
def vpath(file): def vpath(file):
vfile = os.path.join(srcdir, file) vfile = os.path.join(srcdir, file)

2
bindings/python/sigrok/core/classes.i
View File

@ -24,7 +24,7 @@ Introduction
------------ ------------
The pysigrok API provides an object-oriented Python interface to the The pysigrok API provides an object-oriented Python interface to the
functionality in libsigrok. It is built on top of the sigrok++ C++ API. functionality in libsigrok. It is built on top of the libsigrokcxx C++ API.
Getting started Getting started
--------------- ---------------

2
configure.ac
View File

@ -537,7 +537,7 @@ AC_SUBST(SR_PACKAGE_VERSION_MICRO)
AC_SUBST(SR_PACKAGE_VERSION) AC_SUBST(SR_PACKAGE_VERSION)
AC_CONFIG_FILES([Makefile include/libsigrok/version.h libsigrok.pc AC_CONFIG_FILES([Makefile include/libsigrok/version.h libsigrok.pc
bindings/cxx/libsigrokxx.pc]) bindings/cxx/libsigrokcxx.pc])
AC_OUTPUT AC_OUTPUT