mirror of
https://github.com/eclipse/upm.git
synced 2025-07-04 19:01:21 +03:00
SWIG: Moved common SWIG syntax to ${libname}.i
This commit moves common SWIG syntax to a ${libname}.i for sensor libraries. Much of the swig content was originally duplicated for each wrapper language which has lead to inconsistencies between wrappers over time. This commit moves all swig syntax to a common file. Language specific swig syntax can be added with #ifdef SWIG<LANGUAGE>. The src/CMakeLists.txt will look first for a language-specific .i file, then fall back to ${libname}.i. In this way, it's possible to override the common ${libname}.i file. If a fallback .i file does NOT exist, UPM CMake will generate a simple interface file for all languages. Example: If no src/abp/pyupm_abp.i and no src/abp/abp.i then generate ${CMAKE_CURRENT_BINARY_DIR}/abp.i When src/CMakeLists.txt uses a common ${libname}.i, it adds a -module <language>upm_${libname} to the swig command line. In the example below, a -module argument is provided for both Java and Javascript, while the python module takes all syntax from pyupm_abp.i. SWIG FILE Language CMake added SWIG args --------------- ---------- --------------------- src/abp/abp.i java -module javaupm_abp src/abp/abp.i javascript -module jsupm_abp src/abp/pyupm_abp.i python This commit removes ~4500 redundant lines for the UPM repository and helps promote uniformity for the SWIG'ed languages. Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
@ -1,23 +0,0 @@
|
||||
%module javaupm_tb7300
|
||||
%include "../upm.i"
|
||||
%include "typemaps.i"
|
||||
|
||||
// We need to use this method for enum wrapping since the enum typedefs used
|
||||
// by the derived classes (like ANALOG_VALUES_T) are passed to methods
|
||||
// in the base class which expect a uint32_t. This is fine, and
|
||||
// works everywhere except Java. It's type safety is a little too
|
||||
// stringent in these cases. %javaconst(1) is generally recommended
|
||||
// as it avoids JNI calls to determine the enumerant values at
|
||||
// runtime.
|
||||
%include "enumtypeunsafe.swg"
|
||||
%javaconst(1);
|
||||
|
||||
%include "bacnetmstp.hpp"
|
||||
%include "bacnetutil.hpp"
|
||||
%include "tb7300.hpp"
|
||||
%{
|
||||
#include "tb7300.hpp"
|
||||
%}
|
||||
|
||||
|
||||
JAVA_JNI_LOADLIBRARY(javaupm_tb7300)
|
@ -1,10 +0,0 @@
|
||||
%module jsupm_tb7300
|
||||
%include "../upm.i"
|
||||
%include "stdint.i"
|
||||
|
||||
%include "bacnetmstp.hpp"
|
||||
%include "bacnetutil.hpp"
|
||||
%include "tb7300.hpp"
|
||||
%{
|
||||
#include "tb7300.hpp"
|
||||
%}
|
@ -1,12 +0,0 @@
|
||||
// Include doxygen-generated documentation
|
||||
%include "pyupm_doxy2swig.i"
|
||||
%module pyupm_tb7300
|
||||
%include "../upm.i"
|
||||
%include "stdint.i"
|
||||
|
||||
%include "bacnetmstp.hpp"
|
||||
%include "bacnetutil.hpp"
|
||||
%include "tb7300.hpp"
|
||||
%{
|
||||
#include "tb7300.hpp"
|
||||
%}
|
29
src/tb7300/tb7300.i
Normal file
29
src/tb7300/tb7300.i
Normal file
@ -0,0 +1,29 @@
|
||||
%include "../common_top.i"
|
||||
|
||||
/* BEGIN Java syntax ------------------------------------------------------- */
|
||||
#ifdef SWIGJAVA
|
||||
/* We need to use this method for enum wrapping since the enum typedefs used
|
||||
* by the derived classes (like ANALOG_VALUES_T) are passed to methods
|
||||
* in the base class which expect a uint32_t. This is fine, and
|
||||
* works everywhere except Java. It's type safety is a little too
|
||||
* stringent in these cases. %javaconst(1) is generally recommended
|
||||
* as it avoids JNI calls to determine the enumerant values at
|
||||
* runtime.
|
||||
*/
|
||||
%include "enumtypeunsafe.swg"
|
||||
%javaconst(1);
|
||||
|
||||
JAVA_JNI_LOADLIBRARY(javaupm_tb7300)
|
||||
#endif
|
||||
/* END Java syntax */
|
||||
|
||||
/* BEGIN Common SWIG syntax ------------------------------------------------- */
|
||||
%{
|
||||
#include "bacnetmstp.hpp"
|
||||
#include "bacnetutil.hpp"
|
||||
#include "tb7300.hpp"
|
||||
%}
|
||||
%include "bacnetmstp.hpp"
|
||||
%include "bacnetutil.hpp"
|
||||
%include "tb7300.hpp"
|
||||
/* END Common SWIG syntax */
|
Reference in New Issue
Block a user