[pytango] 61/98: Remove binding experiments
Sandor Bodo-Merle
sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:17:45 UTC 2017
This is an automated email from the git hooks/post-receive script.
sbodomerle-guest pushed a commit to tag v9.2.0
in repository pytango.
commit d55ee95ca6906b791cf31ead68672a1cbf263ee9
Author: Vincent Michel <vincent.michel at maxlab.lu.se>
Date: Fri Jul 8 16:24:30 2016 +0200
Remove binding experiments
---
cPyTango/__init__.py | 24 -
cPyTango/cPyTango.py | 895 ---------------------
cPyTango/enumeration.py | 109 ---
{src/boost/cpp => ext}/api_util.cpp | 0
{src/boost/cpp => ext}/archive_event_info.cpp | 0
{src/boost/cpp => ext}/attr_conf_event_data.cpp | 0
{src/boost/cpp => ext}/attribute_alarm_info.cpp | 0
{src/boost/cpp => ext}/attribute_dimension.cpp | 0
{src/boost/cpp => ext}/attribute_event_info.cpp | 0
{src/boost/cpp => ext}/attribute_info.cpp | 0
{src/boost/cpp => ext}/attribute_info_ex.cpp | 0
{src/boost/cpp => ext}/attribute_proxy.cpp | 0
{src/boost/cpp => ext}/base_types.cpp | 0
{src/boost/cpp => ext}/base_types_numpy.hpp | 0
{src/boost/cpp => ext}/callback.cpp | 0
{src/boost/cpp => ext}/callback.h | 0
{src/boost/cpp => ext}/change_event_info.cpp | 0
{src/boost/cpp => ext}/command_info.cpp | 0
{src/boost/cpp => ext}/connection.cpp | 0
{src/boost/cpp => ext}/constants.cpp | 0
{src/boost/cpp => ext}/data_ready_event_data.cpp | 0
{src/boost/cpp => ext}/database.cpp | 0
{src/boost/cpp => ext}/db.cpp | 0
{src/boost/cpp => ext}/defs.h | 0
{src/boost/cpp => ext}/dev_command_info.cpp | 0
{src/boost/cpp => ext}/dev_error.cpp | 0
{src/boost/cpp => ext}/device_attribute.cpp | 0
{src/boost/cpp => ext}/device_attribute.h | 0
{src/boost/cpp => ext}/device_attribute_config.cpp | 0
.../boost/cpp => ext}/device_attribute_history.cpp | 0
{src/boost/cpp => ext}/device_attribute_numpy.hpp | 0
{src/boost/cpp => ext}/device_data.cpp | 0
{src/boost/cpp => ext}/device_data_history.cpp | 0
{src/boost/cpp => ext}/device_info.cpp | 0
{src/boost/cpp => ext}/device_pipe.cpp | 0
{src/boost/cpp => ext}/device_pipe.h | 0
{src/boost/cpp => ext}/device_proxy.cpp | 0
{src/boost/cpp => ext}/enums.cpp | 0
{src/boost/cpp => ext}/event_data.cpp | 0
{src/boost/cpp => ext}/exception.cpp | 0
{src/boost/cpp => ext}/exception.h | 0
{src/boost/cpp => ext}/fast_from_py.h | 0
{src/boost/cpp => ext}/fast_from_py_numpy.hpp | 0
{src/boost/cpp => ext}/from_py.cpp | 0
{src/boost/cpp => ext}/from_py.h | 0
{src/boost/cpp => ext}/group.cpp | 0
{src/boost/cpp => ext}/group_reply.cpp | 0
{src/boost/cpp => ext}/group_reply_list.cpp | 0
{src/boost/cpp => ext}/locker_info.cpp | 0
{src/boost/cpp => ext}/locking_thread.cpp | 0
{src/boost/cpp => ext}/periodic_event_info.cpp | 0
{src/boost/cpp => ext}/pipe_info.cpp | 0
{src/boost/cpp => ext}/poll_device.cpp | 0
{src/boost/cpp => ext}/precompiled_header.cpp | 0
{src/boost/cpp => ext}/precompiled_header.hpp | 0
{src/boost/cpp => ext}/pytango.cpp | 0
{src/boost/cpp => ext}/pytgutils.cpp | 0
{src/boost/cpp => ext}/pytgutils.h | 0
{src/boost/cpp => ext}/pyutils.cpp | 0
{src/boost/cpp => ext}/pyutils.h | 0
{src/boost/cpp => ext}/server/attr.cpp | 0
{src/boost/cpp => ext}/server/attr.h | 0
{src/boost/cpp => ext}/server/attribute.cpp | 0
{src/boost/cpp => ext}/server/attribute.h | 0
{src/boost/cpp => ext}/server/auto_monitor.cpp | 0
{src/boost/cpp => ext}/server/command.cpp | 0
{src/boost/cpp => ext}/server/command.h | 0
{src/boost/cpp => ext}/server/device_class.cpp | 0
{src/boost/cpp => ext}/server/device_class.h | 0
{src/boost/cpp => ext}/server/device_impl.cpp | 0
{src/boost/cpp => ext}/server/device_impl.h | 0
{src/boost/cpp => ext}/server/dserver.cpp | 0
.../boost/cpp => ext}/server/encoded_attribute.cpp | 0
{src/boost/cpp => ext}/server/log4tango.cpp | 0
{src/boost/cpp => ext}/server/multi_attribute.cpp | 0
.../cpp => ext}/server/multi_class_attribute.cpp | 0
{src/boost/cpp => ext}/server/pipe.cpp | 0
{src/boost/cpp => ext}/server/pipe.h | 0
{src/boost/cpp => ext}/server/subdev.cpp | 0
{src/boost/cpp => ext}/server/tango_util.cpp | 0
.../cpp => ext}/server/user_default_attr_prop.cpp | 0
.../cpp => ext}/server/user_default_pipe_prop.cpp | 0
{src/boost/cpp => ext}/server/wattribute.cpp | 0
{src/boost/cpp => ext}/server/wattribute_numpy.hpp | 0
{src/boost/cpp => ext}/tango_numpy.h | 0
{src/boost/cpp => ext}/tgutils.h | 0
{src/boost/cpp => ext}/time_val.cpp | 0
{src/boost/cpp => ext}/to_py.cpp | 0
{src/boost/cpp => ext}/to_py.h | 0
{src/boost/cpp => ext}/to_py_numpy.hpp | 0
{src/boost/cpp => ext}/version.cpp | 0
src/sip/Makefile | 58 --
src/sip/Tango/__init__.py | 29 -
src/sip/Tango/__init_tango.py | 67 --
src/sip/Tango/release.py | 58 --
src/sip/setup.cfg | 2 -
src/sip/setup.py | 298 -------
src/sip/sip/AttributeInfo.sip | 104 ---
src/sip/sip/AttributeInfoEx.sip | 176 ----
src/sip/sip/CommandInfo.sip | 119 ---
src/sip/sip/Database.sip | 181 -----
src/sip/sip/DbData.sip | 12 -
src/sip/sip/DbDatum.sip | 187 -----
src/sip/sip/DbDevImportInfo.sip | 25 -
src/sip/sip/DbDevInfo.sip | 24 -
src/sip/sip/DeviceAttribute.sip | 30 -
src/sip/sip/DeviceAttributeConfig.sip | 38 -
src/sip/sip/DeviceInfo.sip | 24 -
src/sip/sip/DeviceProxy.sip | 222 -----
src/sip/sip/Tango.sip | 52 --
src/sip/sip/configure.py | 59 --
src/sip/sip/connection.sip | 51 --
src/sip/sip/constants.sip | 218 -----
src/sip/sip/std_utils.sip | 101 ---
src/swig/Makefile | 106 ---
src/swig/deviceproxy.i | 224 ------
src/swig/tango.i | 21 -
{src/boost/python => tango}/__init__.py | 0
{src/boost/python => tango}/api_util.py | 0
{src/boost/python => tango}/asyncio.py | 0
{src/boost/python => tango}/asyncio_tools.py | 0
{src/boost/python => tango}/attr_data.py | 0
{src/boost/python => tango}/attribute_proxy.py | 0
{src/boost/python => tango}/auto_monitor.py | 0
{src/boost/python => tango}/base_types.py | 0
{src/boost/python => tango}/callback.py | 0
{src/boost/python => tango}/client.py | 0
{src/boost/python => tango}/codec.py | 0
{src/boost/python => tango}/connection.py | 0
.../boost/python => tango}/databaseds/DataBase.xmi | 0
{src/boost/python => tango}/databaseds/DataBaseds | 0
{src/boost/python => tango}/databaseds/__init__.py | 0
.../python => tango}/databaseds/create_db.sql | 0
.../databaseds/create_db_tables.sql | 0
{src/boost/python => tango}/databaseds/database.py | 0
.../databaseds/db_access/__init__.py | 0
.../databaseds/db_access/beacon.py | 0
.../databaseds/db_access/sqlite3.py | 0
.../boost/python => tango}/databaseds/db_errors.py | 0
.../python => tango}/databaseds/mysql2sqlite.sh | 0
{src/boost/python => tango}/db.py | 0
{src/boost/python => tango}/device_attribute.py | 0
{src/boost/python => tango}/device_class.py | 0
{src/boost/python => tango}/device_data.py | 0
{src/boost/python => tango}/device_proxy.py | 0
{src/boost/python => tango}/device_server.py | 0
{src/boost/python => tango}/encoded_attribute.py | 0
{src/boost/python => tango}/exception.py | 0
{src/boost/python => tango}/futures.py | 0
{src/boost/python => tango}/gevent.py | 0
{src/boost/python => tango}/globals.py | 0
{src/boost/python => tango}/green.py | 0
{src/boost/python => tango}/group.py | 0
{src/boost/python => tango}/group_reply.py | 0
{src/boost/python => tango}/group_reply_list.py | 0
{src/boost/python => tango}/log4tango.py | 0
{src/boost/python => tango}/pipe.py | 0
{src/boost/python => tango}/pipe_data.py | 0
{src/boost/python => tango}/pytango_init.py | 0
{src/boost/python => tango}/pytango_pprint.py | 0
{src/boost/python => tango}/pyutil.py | 0
{src/boost/python => tango}/release.py | 0
{src/boost/python => tango}/server.py | 0
{src/boost/python => tango}/tango_asyncio.py | 0
{src/boost/python => tango}/tango_futures.py | 0
{src/boost/python => tango}/tango_gevent.py | 0
{src/boost/python => tango}/tango_numpy.py | 0
{src/boost/python => tango}/time_val.py | 0
{src/boost/python => tango}/utils.py | 0
169 files changed, 3514 deletions(-)
diff --git a/cPyTango/__init__.py b/cPyTango/__init__.py
deleted file mode 100644
index 55acfd4..0000000
--- a/cPyTango/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-##
-## This file is part of Taurus, a Tango User Interface Library
-##
-## http://www.tango-controls.org/static/PyTango/latest/doc/html/index.html
-##
-## Copyright 2011 CELLS / ALBA Synchrotron, Bellaterra, Spain
-##
-## PyTango is free software: you can redistribute it and/or modify
-## it under the terms of the GNU Lesser General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## PyTango is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public License
-## along with PyTango. If not, see <http://www.gnu.org/licenses/>.
-##
-################################################################################
-
-from cPyTango import *
diff --git a/cPyTango/cPyTango.py b/cPyTango/cPyTango.py
deleted file mode 100644
index 05e6fad..0000000
--- a/cPyTango/cPyTango.py
+++ /dev/null
@@ -1,895 +0,0 @@
-################################################################################
-##
-## This file is part of Taurus, a Tango User Interface Library
-##
-## http://www.tango-controls.org/static/PyTango/latest/doc/html/index.html
-##
-## Copyright 2011 CELLS / ALBA Synchrotron, Bellaterra, Spain
-##
-## PyTango is free software: you can redistribute it and/or modify
-## it under the terms of the GNU Lesser General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## PyTango is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public License
-## along with PyTango. If not, see <http://www.gnu.org/licenses/>.
-##
-################################################################################
-
-import ctypes
-import ctypes.util
-import enumeration
-import time
-
-_tango_lib_name = ctypes.util.find_library("c_tango")
-
-if _tango_lib_name is None:
- raise RuntimeError("Failed to find c_tango shared library")
-
-_ref = ctypes.byref
-String = ctypes.c_char_p
-StringPtr = ctypes.POINTER(String)
-Int = ctypes.c_int
-IntPtr = ctypes.POINTER(Int)
-Enum = ctypes.c_int
-Length = ctypes.c_uint
-Bool = ctypes.c_short
-
-c_tango = ctypes.CDLL(_tango_lib_name)
-
-TangoDataType = Enum
-TangoDataTypeEnum = enumeration.Enumeration("TangoDataTypeEnum", (
- "DEV_VOID",
- "DEV_BOOLEAN",
- "DEV_SHORT",
- "DEV_LONG",
- "DEV_FLOAT",
- "DEV_DOUBLE",
- "DEV_USHORT",
- "DEV_ULONG",
- "DEV_STRING",
- "DEVVAR_CHARARRAY",
- "DEVVAR_SHORTARRAY",
- "DEVVAR_LONGARRAY",
- "DEVVAR_FLOATARRAY",
- "DEVVAR_DOUBLEARRAY",
- "DEVVAR_USHORTARRAY",
- "DEVVAR_ULONGARRAY",
- "DEVVAR_STRINGARRAY",
- "DEVVAR_LONGSTRINGARRAY",
- "DEVVAR_DOUBLESTRINGARRAY",
- "DEV_STATE",
- "CONST_DEV_STRING",
- "DEVVAR_BOOLEANARRAY",
- "DEV_UCHAR",
- "DEV_LONG64",
- "DEV_ULONG64",
- "DEVVAR_LONG64ARRAY",
- "DEVVAR_ULONG64ARRAY",
- "DEV_INT" ) )
-locals().update(TangoDataTypeEnum.lookup)
-TangoDataTypePtr = ctypes.POINTER(TangoDataType)
-
-def _is_scalar(data_type):
- if data_type <= TangoDataTypeEnum.DEV_STRING: return True
- if data_type > TangoDataTypeEnum.DEV_STRING and data_type < TangoDataTypeEnum.DEV_STATE: return False
- if data_type == TangoDataTypeEnum.DEVVAR_BOOLEANARRAY or \
- data_type == TangoDataTypeEnum.DEVVAR_LONG64ARRAY or \
- data_type == TangoDataTypeEnum.DEVVAR_ULONG64ARRAY:
- return False
- return True
-
-TangoDataTypeEnum.is_scalar = _is_scalar
-
-TangoDevState = Enum
-TangoDevStateEnum = enumeration.Enumeration("TangoDevStateEnum", (
- "ON",
- "OFF",
- "CLOSE",
- "OPEN",
- "INSERT",
- "EXTRACT",
- "MOVING",
- "STANDBY",
- "FAULT",
- "INIT",
- "RUNNING",
- "ALARM",
- "DISABLE",
- "UNKNOWN") )
-locals().update(TangoDevStateEnum.lookup)
-TangoDevStatePtr = ctypes.POINTER(TangoDevState)
-
-AttrQuality = Enum
-AttrQualityEnum = enumeration.Enumeration("AttrQualityEnum", (
- "ATTR_VALID",
- "ATTR_INVALID",
- "ATTR_ALARM",
- "ATTR_CHANGING",
- "ATTR_WARNING" ) )
-locals().update(AttrQualityEnum.lookup)
-AttrQualityPtr = ctypes.POINTER(AttrQuality)
-
-AttrWriteType = Enum
-AttrWriteTypeEnum = enumeration.Enumeration("AttrWriteTypeEnum", (
- "READ",
- "READ_WITH_WRITE",
- "WRITE",
- "READ_WRITE" ) )
-locals().update(AttrWriteTypeEnum.lookup)
-AttrWriteTypePtr = ctypes.POINTER(AttrWriteType)
-
-AttrDataFormat = Enum
-AttrDataFormatEnum = enumeration.Enumeration("AttrDataFormatEnum", (
- "SCALAR",
- "SPECTRUM",
- "IMAGE" ) )
-locals().update(AttrDataFormatEnum.lookup)
-AttrDataFormatPtr = ctypes.POINTER(AttrDataFormat)
-
-DispLevel = Enum
-DispLevelEnum = enumeration.Enumeration("DispLevelEnum", (
- "OPERATOR",
- "EXPERT" ) )
-locals().update(DispLevelEnum.lookup)
-DispLevelPtr = ctypes.POINTER(DispLevel)
-
-ErrSeverity = Enum
-ErrSeverityEnum = enumeration.Enumeration("ErrSeverityEnum", (
- "WARN",
- "ERR",
- "PANIC" ) )
-locals().update(ErrSeverityEnum.lookup)
-ErrSeverityPtr = ctypes.POINTER(ErrSeverity)
-
-DevSource = Enum
-DevSourceEnum = enumeration.Enumeration("DevSourceEnum", (
- "DEV",
- "CACHE",
- "CACHE_DEV" ) )
-locals().update(DevSourceEnum.lookup)
-DevSourcePtr = ctypes.POINTER(DevSource)
-
-TangoDevLong = ctypes.c_int32
-TangoDevLongPtr = ctypes.POINTER(TangoDevLong)
-TangoDevULong = ctypes.c_uint32
-TangoDevULongPtr = ctypes.POINTER(TangoDevULong)
-TangoDevLong64 = ctypes.c_int64
-TangoDevLong64Ptr = ctypes.POINTER(TangoDevLong64)
-TangoDevULong64 = ctypes.c_uint64
-TangoDevULong64Ptr = ctypes.POINTER(TangoDevULong64)
-
-
-class VarArray(ctypes.Structure):
-
- def __len__(self):
- return self.length
-
- def __getitem__(self, i):
- if not isinstance(i,int): raise TypeError("tuple indices must be integers")
- if i < 0 or i > self.length-1: raise IndexError("tuple index out of range")
- return self.sequence[i]
-
-
-class VarBoolArray(VarArray):
- _fields_ = \
- ("length", Length), \
- ("sequence", ctypes.POINTER(ctypes.c_int16))
-
-
-class VarCharArray(VarArray):
- _fields_ = \
- ("length", Length), \
- ("sequence", ctypes.POINTER(ctypes.c_char))
-
-
-class VarShortArray(VarArray):
- _fields_ = \
- ("length", Length), \
- ("sequence", ctypes.POINTER(ctypes.c_int16))
-
-
-class VarUShortArray(VarArray):
- _fields_ = \
- ("length", Length), \
- ("sequence", ctypes.POINTER(ctypes.c_uint16))
-
-
-class VarLongArray(VarArray):
- _fields_ = \
- ("length", Length), \
- ("sequence", TangoDevLongPtr)
-
-
-class VarULongArray(VarArray):
- _fields_ = \
- ("length", Length), \
- ("sequence", TangoDevULongPtr)
-
-
-class VarLong64Array(VarArray):
- _fields_ = \
- ("length", Length), \
- ("sequence", TangoDevLong64Ptr)
-
-
-class VarULong64Array(VarArray):
- _fields_ = \
- ("length", Length), \
- ("sequence", TangoDevULong64Ptr)
-
-
-class VarFloatArray(VarArray):
- _fields_ = \
- ("length", Length), \
- ("sequence", ctypes.POINTER(ctypes.c_float))
-
-
-class VarDoubleArray(VarArray):
- _fields_ = \
- ("length", Length), \
- ("sequence", ctypes.POINTER(ctypes.c_double))
-
-
-class VarStringArray(VarArray):
- _fields_ = \
- ("length", Length), \
- ("sequence", StringPtr)
-
- def __str__(self):
- l = self.length
- if l == 1:
- return self.sequence[0]
- return str(list(self.sequence[:10]))
-VarStringArrayPtr = ctypes.POINTER(VarStringArray)
-
-class VarStateArray(VarArray):
- _fields_ = \
- ("length", Length), \
- ("sequence", TangoDevStatePtr)
-
- def __str__(self):
- l = self.length
- if l == 1:
- return TangoDevStateEnum.whatis(self.sequence[0])
- return map(TangoDevStateEnum.whatis, self.sequence[:10])
-
-
-class TangoAttributeData(ctypes.Union):
- _fields_ = \
- ("bool_arr", VarBoolArray), \
- ("char_arr", VarCharArray), \
- ("short_arr", VarShortArray), \
- ("ushort_arr", VarUShortArray), \
- ("long_arr", VarLongArray), \
- ("ulong_arr", VarULongArray), \
- ("long64_arr", VarLong64Array), \
- ("ulong64_arr", VarULong64Array), \
- ("float_arr", VarFloatArray), \
- ("double_arr", VarDoubleArray), \
- ("string_arr", VarStringArray), \
- ("state_arr", VarStateArray)
-
- def get_raw(self, type):
- if type == DEV_BOOLEAN: return self.bool_arr
- elif type == DEV_UCHAR: return self.char_arr
- elif type == DEV_SHORT: return self.short_arr
- elif type == DEV_USHORT: return self.ushort_arr
- elif type == DEV_LONG: return self.long_arr
- elif type == DEV_ULONG: return self.ulong_arr
- elif type == DEV_LONG64: return self.long64_arr
- elif type == DEV_ULONG64: return self.ulong64_arr
- elif type == DEV_FLOAT: return self.float_arr
- elif type == DEV_DOUBLE: return self.double_arr
- elif type == DEV_STRING: return self.string_arr
- elif type == DEV_STATE: return self.state_arr
-
- def get(self, type):
- raw = self.get_raw(type)
- if TangoDataTypeEnum.is_scalar(type):
- return raw[0]
- return raw
-
- def representation(self, type):
- return str(self.get_raw(type))
-TangoAttributeDataPtr = ctypes.POINTER(TangoAttributeData)
-
-
-class TangoCommandData(ctypes.Union):
- _fields_ = \
- ("bool_val", Bool), \
- ("short_val", ctypes.c_short), \
- ("ushort_val", ctypes.c_ushort), \
- ("long_val", ctypes.c_int32), \
- ("ulong_val", ctypes.c_uint32), \
- ("float_val", ctypes.c_float), \
- ("double_val", ctypes.c_double), \
- ("string_val", ctypes.c_char_p), \
- ("state_val", TangoDevState), \
- ("long64_val", ctypes.c_int64), \
- ("ulong64_val", ctypes.c_uint64), \
- ("bool_arr", VarBoolArray), \
- ("char_arr", VarCharArray), \
- ("short_arr", VarShortArray), \
- ("ushort_arr", VarUShortArray), \
- ("long_arr", VarLongArray), \
- ("ulong_arr", VarULongArray), \
- ("long64_arr", VarLong64Array), \
- ("ulong64_arr", VarULong64Array), \
- ("float_arr", VarFloatArray), \
- ("double_arr", VarDoubleArray), \
- ("string_arr", VarStringArray), \
- ("state_arr", VarStateArray),
-TangoCommandDataPtr = ctypes.POINTER(TangoCommandData)
-
-
-class TangoPropertyData(ctypes.Union):
- _fields_ = \
- ("bool_val", Bool), \
- ("char_val", ctypes.c_char), \
- ("short_val", ctypes.c_short), \
- ("ushort_val", ctypes.c_ushort), \
- ("long_val", ctypes.c_int32), \
- ("ulong_val", ctypes.c_uint32), \
- ("float_val", ctypes.c_float), \
- ("double_val", ctypes.c_double), \
- ("string_val", ctypes.c_char_p), \
- ("long64_val", ctypes.c_int64), \
- ("ulong64_val", ctypes.c_uint64), \
- ("short_arr", VarShortArray), \
- ("ushort_arr", VarUShortArray), \
- ("long_arr", VarLongArray), \
- ("ulong_arr", VarULongArray), \
- ("long64_arr", VarLong64Array), \
- ("ulong64_arr", VarULong64Array), \
- ("float_arr", VarFloatArray), \
- ("double_arr", VarDoubleArray), \
- ("string_arr", VarStringArray),
-TangoPropertyDataPtr = ctypes.POINTER(TangoPropertyData)
-
-
-class CommandData(ctypes.Structure):
- _fields_ = \
- ("arg_type",TangoDataType), \
- ("cmd_data",TangoCommandData)
-CommandDataPtr = ctypes.POINTER(CommandData)
-
-
-_time_t = ctypes.c_long
-_suseconds_t = ctypes.c_long
-
-class timeval(ctypes.Structure):
- _fields_ = \
- ("tv_sec", _time_t), \
- ("tv_usec", _suseconds_t),
-
- def __str__(self):
- return time.ctime(self.tv_sec + 1E-6 * self.tv_usec)
-timevalPtr = ctypes.POINTER(timeval)
-
-
-class AttributeData(ctypes.Structure):
- _fields_ = \
- ("data_type", TangoDataType), \
- ("attr_data", TangoAttributeData), \
- ("quality", AttrQuality), \
- ("name", String), \
- ("dim_x", Int), \
- ("dim_y", Int), \
- ("time_stamp", timeval)
-
- def __str__(self):
- s = "AttributeData[\n"
- s += "name: %s\n" % self.name
- s += "data_type: %s\n" % TangoDataTypeEnum.whatis(self.data_type)
- s += "quality: %s\n" % AttrQualityEnum.whatis(self.quality)
- s += "dim_x: %d\n" % self.dim_x
- s += "dim_y: %d\n" % self.dim_y
- s += "time_stamp: %s\n" % self.time_stamp
- s += "attr_data: %s\n" % str(self.attr_data.representation(self.data_type))
- s += "]\n"
- return s
-
- def get_raw_data(self):
- return self.attr_data.get_raw(self.data_type)
-
- def get_data(self):
- return self.attr_data.get(self.data_type)
-AttributeDataPtr = ctypes.POINTER(AttributeData)
-
-
-class AttributeDataList(ctypes.Structure):
- _fields_ = \
- ("length", Length), \
- ("sequence", AttributeDataPtr)
-
- def __len__(self):
- return self.length
-
- def __getitem__(self, i):
- if not isinstance(i,int): raise TypeError("tuple indices must be integers")
- if i < 0 or i > self.length-1: raise IndexError("tuple index out of range")
- return self.sequence[i]
-
- def __str__(self):
- s = "AttributeDataList[\n"
- for attr in self: s += attr
- return s
-AttributeDataListPtr = ctypes.POINTER(AttributeDataList)
-
-
-class DevFailed(ctypes.Structure):
- _fields_ = \
- ("desc", String), \
- ("reason", String), \
- ("origin", String), \
- ("severity", ErrSeverity)
-
- def __str__(self):
- s = "Severity : %d\n" % self.severity
- s += "Reason : %s\n" % self.reason
- s += "Description : %s\n" % self.desc
- s += "Origin : %s\n\n" % self.origin
- return s
-
- def __repr__(self):
- return self.__str__()
-DevFailedPtr = ctypes.POINTER(DevFailed)
-
-
-class ErrorStack(ctypes.Structure):
- _fields_ = \
- ("length", Length), \
- ("sequence", DevFailedPtr)
-
- def __len__(self):
- return self.length
-
- def __getitem__(self, i):
- if not isinstance(i,int): raise TypeError("tuple indices must be integers")
- if i < 0 or i > self.length-1: raise IndexError("tuple index out of range")
- return self.sequence[i]
-
- def __str__(self):
- s = "\nTango exception:\n"
- for i in xrange(self.length):
- s += str(self.sequence[i])
- return s
-
- def __repr__(self):
- return self.__str__()
-ErrorStackPtr = ctypes.POINTER(ErrorStack)
-
-
-class CommandInfo(ctypes.Structure):
- _fields_ = \
- ("cmd_name", String), \
- ("cmd_tag", Int), \
- ("in_type", Int), \
- ("out_type", Int), \
- ("in_type_desc", String), \
- ("out_type_desc", String), \
- ("disp_level", DispLevel)
-CommandInfoPtr = ctypes.POINTER(CommandInfo)
-
-
-class CommandInfoList(ctypes.Structure):
- _fields_ = \
- ("length", Length), \
- ("sequence", CommandInfoPtr)
-CommandInfoListPtr = ctypes.POINTER(CommandInfoList)
-
-
-class AttributeInfo(ctypes.Structure):
- _fields_ = \
- ("name", String), \
- ("writable", AttrWriteType), \
- ("data_format", AttrDataFormat), \
- ("data_type", TangoDataType), \
- ("max_dim_x", Int), \
- ("max_dim_y", Int), \
- ("description", String), \
- ("label", String), \
- ("unit", String), \
- ("standard_unit", String), \
- ("display_unit", String), \
- ("format", String), \
- ("min_value", String), \
- ("max_value", String), \
- ("min_alarm", String), \
- ("max_alarm", String), \
- ("writable_attr_name", String), \
- ("disp_level", DispLevel)
-AttributeInfoPtr = ctypes.POINTER(AttributeInfo)
-
-
-class AttributeInfoList(ctypes.Structure):
- _fields_ = \
- ("length", Length), \
- ("sequence", AttributeInfoPtr)
-AttributeInfoListPtr = ctypes.POINTER(AttributeInfoList)
-
-
-class DbDatum(ctypes.Structure):
- _fields_ = \
- ("property_name", String), \
- ("data_type", TangoDataType), \
- ("prop_data", TangoPropertyData), \
- ("is_empty", Bool), \
- ("wrong_data_type", Bool)
-DbDatumPtr = ctypes.POINTER(DbDatum)
-
-
-class DbData(ctypes.Structure):
- _fields_ = \
- ("length", Length), \
- ("sequence", DbDatumPtr)
-DbDataPtr = ctypes.POINTER(DbData)
-
-
-DeviceProxyPtr = ctypes.c_void_p
-DeviceProxyPtrPtr = ctypes.POINTER(DeviceProxyPtr)
-DatabasePtr = ctypes.c_void_p
-DatabasePtrPtr = ctypes.POINTER(DatabasePtr)
-
-
-c_tango.tango_create_device_proxy.argtypes = (String, DeviceProxyPtrPtr, ErrorStackPtr, )
-c_tango.tango_delete_device_proxy.argtypes = (DeviceProxyPtrPtr, ErrorStackPtr, )
-c_tango.tango_set_timeout_millis.argtypes = (DeviceProxyPtr, Int, ErrorStackPtr, )
-c_tango.tango_get_timeout_millis.argtypes = (DeviceProxyPtr, IntPtr, ErrorStackPtr, )
-c_tango.tango_set_source.argtypes = (DeviceProxyPtr, DevSource, ErrorStackPtr, )
-c_tango.tango_get_source.argtypes = (DeviceProxyPtr, DevSourcePtr, ErrorStackPtr, )
-c_tango.tango_command_query.argtypes = (DeviceProxyPtr, String, CommandInfoPtr, ErrorStackPtr, )
-c_tango.tango_command_list_query.argtypes = (DeviceProxyPtr, CommandInfoListPtr, ErrorStackPtr, )
-c_tango.tango_command_inout.argtypes = (DeviceProxyPtr, String, CommandDataPtr, CommandDataPtr, ErrorStackPtr, )
-c_tango.tango_free_CommandData.argtypes = (CommandDataPtr, )
-c_tango.tango_free_CommandInfo.argtypes = (CommandInfoPtr, )
-c_tango.tango_free_CommandInfoList.argtypes = (CommandInfoListPtr, )
-c_tango.tango_get_attribute_list.argtypes = (DeviceProxyPtr, VarStringArrayPtr, ErrorStackPtr, )
-c_tango.tango_get_attribute_config.argtypes = (DeviceProxyPtr, VarStringArrayPtr, AttributeInfoListPtr, ErrorStackPtr, )
-c_tango.tango_attribute_list_query.argtypes = (DeviceProxyPtr, AttributeInfoListPtr, ErrorStackPtr, )
-c_tango.tango_read_attribute.argtypes = (DeviceProxyPtr, String, AttributeDataPtr, ErrorStackPtr, )
-c_tango.tango_write_attribute.argtypes = (DeviceProxyPtr, String, AttributeDataPtr, ErrorStackPtr, )
-c_tango.tango_read_attributes.argtypes = (DeviceProxyPtr, VarStringArrayPtr, AttributeDataListPtr, ErrorStackPtr, )
-c_tango.tango_write_attributes.argtypes = (DeviceProxyPtr, AttributeDataListPtr, ErrorStackPtr, )
-c_tango.tango_free_AttributeData.argtypes = (AttributeDataPtr, )
-c_tango.tango_free_AttributeDataList.argtypes = (AttributeDataListPtr, )
-c_tango.tango_free_VarStringArray.argtypes = (VarStringArrayPtr, )
-c_tango.tango_print_ErrorStack.argtypes = (ErrorStackPtr, )
-c_tango.tango_free_ErrorStack.argtypes = (ErrorStackPtr, )
-c_tango.tango_create_database_proxy.argtypes = (DatabasePtrPtr, ErrorStackPtr, )
-c_tango.tango_delete_database_proxy.argtypes = (DatabasePtrPtr, ErrorStackPtr, )
-c_tango.tango_get_device_exported.argtypes = (DatabasePtr, String, DbDatumPtr, ErrorStackPtr, )
-c_tango.tango_get_device_exported_for_class.argtypes = (DatabasePtr, String, DbDatumPtr, ErrorStackPtr, )
-c_tango.tango_get_object_list.argtypes = (DatabasePtr, String, DbDatumPtr, ErrorStackPtr, )
-c_tango.tango_get_object_property_list.argtypes = (DatabasePtr, String, String, DbDatumPtr, ErrorStackPtr, )
-c_tango.tango_get_property.argtypes = (DatabasePtr, String, DbDataPtr, ErrorStackPtr, )
-c_tango.tango_put_property.argtypes = (DatabasePtr, String, DbDataPtr, ErrorStackPtr, )
-c_tango.tango_delete_property.argtypes = (DatabasePtr, String, DbDataPtr, ErrorStackPtr, )
-c_tango.tango_get_device_property.argtypes = (DeviceProxyPtr, DbDataPtr, ErrorStackPtr, )
-c_tango.tango_put_device_property.argtypes = (DeviceProxyPtr, DbDataPtr, ErrorStackPtr, )
-c_tango.tango_delete_device_property.argtypes = (DeviceProxyPtr, DbDataPtr, ErrorStackPtr, )
-c_tango.tango_free_DbDatum.argtypes = (DbDatumPtr, )
-c_tango.tango_free_DbData.argtypes = (DbDataPtr, )
-
-
-def tango_create_device_proxy(dev_name):
- dev_name = ctypes.create_string_buffer(dev_name)
- dev_ptr = ctypes.c_void_p()
- err_stack = ErrorStack()
- result = c_tango.tango_create_device_proxy(dev_name, _ref(dev_ptr), _ref(err_stack))
- if result:
- return dev_ptr
- raise Exception(err_stack)
-
-def tango_delete_device_proxy(dev_ptr):
- err_stack = ErrorStack()
- result = c_tango.tango_delete_device_proxy(_ref(dev_ptr), _ref(err_stack))
- if result:
- return True
- raise Exception(err_stack)
-
-def tango_set_timeout_millis(dev_ptr, millis):
- err_stack = ErrorStack()
- millis = ctypes.c_int(millis)
- result = c_tango.tango_set_timeout_millis(dev_ptr, millis, _ref(err_stack))
- if result:
- return True
- raise Exception(err_stack)
-
-def tango_get_timeout_millis(dev_ptr):
- err_stack = ErrorStack()
- millis = ctypes.c_int()
- result = c_tango.tango_get_timeout_millis(dev_ptr, _ref(millis), _ref(err_stack))
- if result:
- return millis
- raise Exception(err_stack)
-
-def tango_set_source(dev_ptr, src):
- """src -> DevSource"""
- err_stack = ErrorStack()
- result = c_tango.tango_set_source(dev_ptr, src, _ref(err_stack))
- if result:
- return True
- raise Exception(err_stack)
-
-def tango_get_source(dev_ptr):
- err_stack = ErrorStack()
- src = ctypes.c_int()
- result = c_tango.tango_get_source(dev_ptr, _ref(src), _ref(err_stack))
- if result:
- return src
- raise Exception(err_stack)
-
-def tango_command_query(dev_ptr, cmd_name):
- err_stack = ErrorStack()
- cmd_name = ctypes.create_string_buffer(cmd_name)
- cmd_info = CommandInfo()
- result = c_tango.tango_command_query(dev_ptr, cmd_name, _ref(cmd_info), _ref(err_stack))
- if result:
- return cmd_info
- raise Exception(err_stack)
-
-def tango_command_list_query(dev_ptr):
- err_stack = ErrorStack()
- cmd_info_list = CommandInfoList()
- result = c_tango.tango_command_list_query(dev_ptr, _ref(cmd_info_list), _ref(err_stack))
- if result:
- return cmd_info_list
- raise Exception(err_stack)
-
-def tango_command_inout(dev_ptr, cmd_name, arg_in):
- """arg_in->CommandData"""
- err_stack = ErrorStack()
- cmd_name = ctypes.create_string_buffer(cmd_name)
- arg_out = CommandData()
- result = c_tango.tango_command_inout(dev_ptr, cmd_name, _ref(arg_in), _ref(arg_out), _ref(err_stack))
- if result:
- return arg_out
- raise Exception(err_stack)
-
-def tango_free_CommandData(cmd_data):
- c_tango.tango_free_CommandData(_ref(cmd_data))
-
-def tango_free_CommandInfo(cmd_info):
- c_tango.tango_free_CommandInfo(_ref(cmd_info))
-
-def tango_free_CommandInfoList(cmd_info_list):
- c_tango.tango_free_CommandInfoList(_ref(cmd_info_list))
-
-def tango_get_attribute_list(dev_ptr):
- err_stack = ErrorStack()
- attr_names = VarStringArray()
- result = c_tango.tango_get_attribute_list(dev_ptr, _ref(attr_names), _ref(err_stack))
- if result:
- return attr_names
- raise Exception(err_stack)
-
-def tango_get_attribute_config(dev_ptr, attr_names):
- print "TODO"
- return
- err_stack = ErrorStack()
- attr_names = VarStringArray()
- attr_info_list = AttributeInfoList()
- result = c_tango.tango_get_attribute_config(dev_ptr, _ref(attr_names), _ref(attr_info_list), _ref(err_stack))
- if result:
- return attr_info_list
- raise Exception(err_stack)
-
-def tango_attribute_list_query(dev_ptr):
- err_stack = ErrorStack()
- attr_info_list = AttributeInfoList()
- result = c_tango.tango_attribute_list_query(dev_ptr, _ref(attr_info_list), _ref(err_stack))
- if result:
- return attr_info_list
- raise Exception(err_stack)
-
-def tango_read_attribute(dev_ptr, attr_name):
- attr_name = ctypes.create_string_buffer(attr_name)
- attr_data = AttributeData()
- err_stack = ErrorStack()
- result = c_tango.tango_read_attribute(dev_ptr, attr_name, _ref(attr_data), _ref(err_stack))
- if result:
- return attr_data
- raise Exception(err_stack)
-
-def tango_write_attribute(dev_ptr, attr_name, value):
- print "TODO"
- return
- attr_data = AttributeData()
- attr_data.name = ctypes.create_string_buffer(attr_name)
- attr_data.attr_data = value
- err_stack = ErrorStack()
- result = c_tango.tango_write_attribute(dev_ptr, attr_name, _ref(attr_data), _ref(err_stack))
- if result:
- return True
- raise Exception(err_stack)
-
-def tango_read_attributes(dev_ptr, attr_names):
- print "TODO"
- return
- attr_data_list = AttributeDataList()
- attr_names = VarStringArray()
- err_stack = ErrorStack()
- result = c_tango.tango_read_attribute(dev_ptr, _ref(attr_names), _ref(attr_data_list), _ref(err_stack))
- if result:
- return attr_data
- raise Exception(err_stack)
-
-def tango_write_attributes(dev_ptr, attr_data_list):
- """attr_data_list->AttributeDataList"""
- err_stack = ErrorStack()
- result = c_tango.tango_write_attributes(dev_ptr, _ref(attr_data_list), _ref(err_stack))
- if result:
- return True
- raise Exception(err_stack)
-
-def tango_free_AttributeData(attr_data):
- c_tango.tango_free_AttributeData(_ref(attr_data))
-
-def tango_free_AttributeDataList(attr_data_list):
- c_tango.tango_free_AttributeDataList(_ref(attr_data_list))
-
-def tango_free_VarStringArray(str_array):
- c_tango.tango_free_VarStringArray(_ref(str_array))
-
-def tango_print_ErrorStack(err_stack):
- """Should not be used. This function prints to STDOUT instead of sys.stdout.
- Use: 'print err_stack' instead"""
- c_tango.tango_print_ErrorStack(_ref(err_stack))
-
-def tango_free_ErrorStack(err_stack):
- c_tango.tango_free_ErrorStack(_ref(err_stack))
-
-def tango_create_database_proxy():
- err_stack = ErrorStack()
- db_ptr = ctypes.c_void_p()
- result = c_tango.tango_create_database_proxy(_ref(db_ptr), _ref(err_stack))
- if result:
- return db_ptr
- raise Exception(err_stack)
-
-def tango_delete_database_proxy(db_ptr):
- err_stack = ErrorStack()
- result = c_tango.tango_delete_database_proxy(_ref(db_ptr), _ref(err_stack))
- if result:
- return True
- raise Exception(err_stack)
-
-def tango_get_device_exported(db_ptr, name_filter):
- err_stack = ErrorStack()
- name_filter = ctypes.create_string_buffer(name_filter)
- db_datum = DbDatum()
- result = c_tango.tango_get_device_exported(db_ptr, name_filter, _ref(db_datum), _ref(err_stack))
- if result:
- return db_datum
- raise Exception(err_stack)
-
-def tango_get_device_exported_for_class(db_ptr, class_name):
- err_stack = ErrorStack()
- class_name = ctypes.create_string_buffer(class_name)
- db_datum = DbDatum()
- result = c_tango.tango_get_device_exported_for_class(db_ptr, class_name, _ref(db_datum), _ref(err_stack))
- if result:
- return db_datum
- raise Exception(err_stack)
-
-def tango_get_object_list(db_ptr, name_filter):
- err_stack = ErrorStack()
- name_filter = ctypes.create_string_buffer(name_filter)
- db_datum = DbDatum()
- result = c_tango.tango_get_object_list(db_ptr, name_filter, _ref(db_datum), _ref(err_stack))
- if result:
- return db_datum
- raise Exception(err_stack)
-
-def tango_get_object_property_list(db_ptr, obj_name, name_filter):
- err_stack = ErrorStack()
- obj_name = ctypes.create_string_buffer(obj_name)
- name_filter = ctypes.create_string_buffer(name_filter)
- db_datum = DbDatum()
- result = c_tango.tango_get_object_property_list(db_ptr, obj_name, name_filter, _ref(db_datum), _ref(err_stack))
- if result:
- return db_datum
- raise Exception(err_stack)
-
-def tango_get_property(db_ptr, obj_name):
- err_stack = ErrorStack()
- obj_name = ctypes.create_string_buffer(obj_name)
- db_data = DbData()
- result = c_tango.tango_get_property(db_ptr, obj_name, _ref(db_data), _ref(err_stack))
- if result:
- return db_datum
- raise Exception(err_stack)
-
-def tango_put_property(db_ptr, obj_name, prop_list):
- """prop_list -> DbData"""
- err_stack = ErrorStack()
- obj_name = ctypes.create_string_buffer(obj_name)
- result = c_tango.tango_put_property(db_ptr, obj_name, _ref(prop_list), _ref(err_stack))
- if result:
- return True
- raise Exception(err_stack)
-
-def tango_delete_property(db_ptr, obj_name, prop_list):
- """prop_list -> DbData"""
- err_stack = ErrorStack()
- obj_name = ctypes.create_string_buffer(obj_name)
- result = c_tango.tango_delete_property(db_ptr, obj_name, _ref(prop_list), _ref(err_stack))
- if result:
- return True
- raise Exception(err_stack)
-
-def tango_get_device_property(dev_ptr, prop_list):
- """prop_list -> DbData"""
- err_stack = ErrorStack()
- result = c_tango.tango_get_device_property(dev_ptr, _ref(prop_list), _ref(err_stack))
- if result:
- return prop_list
- raise Exception(err_stack)
-
-def tango_put_device_property(dev_ptr, prop_list):
- """prop_list -> DbData"""
- err_stack = ErrorStack()
- result = c_tango.tango_put_device_property(dev_ptr, _ref(prop_list), _ref(err_stack))
- if result:
- return True
- raise Exception(err_stack)
-
-def tango_delete_device_property(dev_ptr, prop_list):
- """prop_list -> DbData"""
- err_stack = ErrorStack()
- result = c_tango.tango_delete_device_property(dev_ptr, _ref(prop_list), _ref(err_stack))
- if result:
- return True
- raise Exception(err_stack)
-
-def tango_free_DbDatum(db_datum):
- c_tango.tango_free_DbDatum(_ref(db_datum))
-
-def tango_free_DbData(db_data):
- c_tango.tango_free_DbData(_ref(db_data))
-
-
-class DeviceProxy:
- def __init__(self, dev_name):
- self._dev_name = dev_name
- self._dev = tango_create_device_proxy(dev_name)
-
- def read_attribute(self, attr_name):
- return tango_read_attribute(self._dev, attr_name)
-
- def write_attribute(self, attr_name, value):
- return tango_read_attribute(self._dev, attr)
-
- def read_attributes(self, attr_name_list):
- return tango_read_attributes(self._dev, attr_name_list)
-
- def get_property(self, attr_name_list):
- if isinstance(attr_name_list, str):
- attr_name_list = [ attr_name_list ]
- n = len(attr_name_list)
- db_data = DbData()
- db_data.length = n
- db_data.sequence = (n*DbDatum)()
- for i in xrange(n):
- db_data.sequence[i].property_name = attr_name_list[i]
- db_data.sequence[i].data_type = DEV_STRING
- return tango_get_device_property(self._dev, db_data)
-
- def __del__(self):
- try:
- if self._dev:
- try:
- tango_delete_device_proxy(self._dev)
- except Exception, e:
- print e
- except AttributeError:
- #The error was in the constructor and therefore _dev is not defined
- pass
-
diff --git a/cPyTango/enumeration.py b/cPyTango/enumeration.py
deleted file mode 100644
index 006bea6..0000000
--- a/cPyTango/enumeration.py
+++ /dev/null
@@ -1,109 +0,0 @@
-################################################################################
-##
-## This file is part of Taurus, a Tango User Interface Library
-##
-## http://www.tango-controls.org/static/PyTango/latest/doc/html/index.html
-##
-## Copyright 2011 CELLS / ALBA Synchrotron, Bellaterra, Spain
-##
-## PyTango is free software: you can redistribute it and/or modify
-## it under the terms of the GNU Lesser General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## PyTango is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public License
-## along with PyTango. If not, see <http://www.gnu.org/licenses/>.
-##
-################################################################################
-
-import types
-
-"""
- Enumeration module.
- In C, enums allow you to declare a bunch of constants with unique values,
- without necessarily specifying the actual values (except in cases where you
- need to). Python has an accepted idiom that's fine for very small numbers of
- constants (A, B, C, D = range(4)) but it doesn't scale well to large numbers,
- and it doesn't allow you to specify values for some constants while leaving
- others unspecified. This approach does those things, while verifying that all
- values (specified and unspecified) are unique. Enum values then are attributes
- of an Enumeration class (Volkswagen.BEETLE, Volkswagen.PASSAT, etc.).
-"""
-
-
-class Enumeration:
- """ Enumeration class intended to provide the 'enum' feature present in many
- programming languages.
- Usage:
- car = ThingWithType(Volkswagen.BEETLE)
- print whatkind(car.type, Volkswagen)
- bug = ThingWithType(Insect.BEETLE)
- print whatkind(bug.type, Insect)
-
- Notice that car's and bug's attributes don't include any of the
- enum machinery, because that machinery is all CLASS attributes and
- not INSTANCE attributes. So you can generate thousands of cars and
- bugs with reckless abandon, never worrying that time or memory will
- be wasted on redundant copies of the enum stuff.
-
- print car.__dict__
- print bug.__dict__
- pprint.pprint(Volkswagen.__dict__)
- pprint.pprint(Insect.__dict__)
- """
-
- def __init__(self, name, enumList):
- self.__doc__ = name
- lookup = { }
- reverseLookup = { }
- uniqueNames = [ ]
- self._uniqueValues = uniqueValues = [ ]
- self._uniqueId = 0
- for x in enumList:
- if type(x) == types.TupleType:
- x, i = x
- if type(x) != types.StringType:
- raise EnumException, "enum name is not a string: " + x
- if type(i) != types.IntType:
- raise EnumException, "enum value is not an integer: " + i
- if x in uniqueNames:
- raise EnumException, "enum name is not unique: " + x
- if i in uniqueValues:
- raise EnumException, "enum value is not unique for " + x
- uniqueNames.append(x)
- uniqueValues.append(i)
- lookup[x] = i
- reverseLookup[i] = x
- for x in enumList:
- if type(x) != types.TupleType:
- if type(x) != types.StringType:
- raise EnumException, "enum name is not a string: " + x
- if x in uniqueNames:
- raise EnumException, "enum name is not unique: " + x
- uniqueNames.append(x)
- i = self.generateUniqueId()
- uniqueValues.append(i)
- lookup[x] = i
- reverseLookup[i] = x
- self.lookup = lookup
- self.reverseLookup = reverseLookup
-
- def generateUniqueId(self):
- while self._uniqueId in self._uniqueValues:
- self._uniqueId += 1
- n = self._uniqueId
- self._uniqueId += 1
- return n
-
- def __getattr__(self, attr):
- if not self.lookup.has_key(attr):
- raise AttributeError
- return self.lookup[attr]
-
- def whatis(self, value):
- return self.reverseLookup[value]
diff --git a/src/boost/cpp/api_util.cpp b/ext/api_util.cpp
similarity index 100%
rename from src/boost/cpp/api_util.cpp
rename to ext/api_util.cpp
diff --git a/src/boost/cpp/archive_event_info.cpp b/ext/archive_event_info.cpp
similarity index 100%
rename from src/boost/cpp/archive_event_info.cpp
rename to ext/archive_event_info.cpp
diff --git a/src/boost/cpp/attr_conf_event_data.cpp b/ext/attr_conf_event_data.cpp
similarity index 100%
rename from src/boost/cpp/attr_conf_event_data.cpp
rename to ext/attr_conf_event_data.cpp
diff --git a/src/boost/cpp/attribute_alarm_info.cpp b/ext/attribute_alarm_info.cpp
similarity index 100%
rename from src/boost/cpp/attribute_alarm_info.cpp
rename to ext/attribute_alarm_info.cpp
diff --git a/src/boost/cpp/attribute_dimension.cpp b/ext/attribute_dimension.cpp
similarity index 100%
rename from src/boost/cpp/attribute_dimension.cpp
rename to ext/attribute_dimension.cpp
diff --git a/src/boost/cpp/attribute_event_info.cpp b/ext/attribute_event_info.cpp
similarity index 100%
rename from src/boost/cpp/attribute_event_info.cpp
rename to ext/attribute_event_info.cpp
diff --git a/src/boost/cpp/attribute_info.cpp b/ext/attribute_info.cpp
similarity index 100%
rename from src/boost/cpp/attribute_info.cpp
rename to ext/attribute_info.cpp
diff --git a/src/boost/cpp/attribute_info_ex.cpp b/ext/attribute_info_ex.cpp
similarity index 100%
rename from src/boost/cpp/attribute_info_ex.cpp
rename to ext/attribute_info_ex.cpp
diff --git a/src/boost/cpp/attribute_proxy.cpp b/ext/attribute_proxy.cpp
similarity index 100%
rename from src/boost/cpp/attribute_proxy.cpp
rename to ext/attribute_proxy.cpp
diff --git a/src/boost/cpp/base_types.cpp b/ext/base_types.cpp
similarity index 100%
rename from src/boost/cpp/base_types.cpp
rename to ext/base_types.cpp
diff --git a/src/boost/cpp/base_types_numpy.hpp b/ext/base_types_numpy.hpp
similarity index 100%
rename from src/boost/cpp/base_types_numpy.hpp
rename to ext/base_types_numpy.hpp
diff --git a/src/boost/cpp/callback.cpp b/ext/callback.cpp
similarity index 100%
rename from src/boost/cpp/callback.cpp
rename to ext/callback.cpp
diff --git a/src/boost/cpp/callback.h b/ext/callback.h
similarity index 100%
rename from src/boost/cpp/callback.h
rename to ext/callback.h
diff --git a/src/boost/cpp/change_event_info.cpp b/ext/change_event_info.cpp
similarity index 100%
rename from src/boost/cpp/change_event_info.cpp
rename to ext/change_event_info.cpp
diff --git a/src/boost/cpp/command_info.cpp b/ext/command_info.cpp
similarity index 100%
rename from src/boost/cpp/command_info.cpp
rename to ext/command_info.cpp
diff --git a/src/boost/cpp/connection.cpp b/ext/connection.cpp
similarity index 100%
rename from src/boost/cpp/connection.cpp
rename to ext/connection.cpp
diff --git a/src/boost/cpp/constants.cpp b/ext/constants.cpp
similarity index 100%
rename from src/boost/cpp/constants.cpp
rename to ext/constants.cpp
diff --git a/src/boost/cpp/data_ready_event_data.cpp b/ext/data_ready_event_data.cpp
similarity index 100%
rename from src/boost/cpp/data_ready_event_data.cpp
rename to ext/data_ready_event_data.cpp
diff --git a/src/boost/cpp/database.cpp b/ext/database.cpp
similarity index 100%
rename from src/boost/cpp/database.cpp
rename to ext/database.cpp
diff --git a/src/boost/cpp/db.cpp b/ext/db.cpp
similarity index 100%
rename from src/boost/cpp/db.cpp
rename to ext/db.cpp
diff --git a/src/boost/cpp/defs.h b/ext/defs.h
similarity index 100%
rename from src/boost/cpp/defs.h
rename to ext/defs.h
diff --git a/src/boost/cpp/dev_command_info.cpp b/ext/dev_command_info.cpp
similarity index 100%
rename from src/boost/cpp/dev_command_info.cpp
rename to ext/dev_command_info.cpp
diff --git a/src/boost/cpp/dev_error.cpp b/ext/dev_error.cpp
similarity index 100%
rename from src/boost/cpp/dev_error.cpp
rename to ext/dev_error.cpp
diff --git a/src/boost/cpp/device_attribute.cpp b/ext/device_attribute.cpp
similarity index 100%
rename from src/boost/cpp/device_attribute.cpp
rename to ext/device_attribute.cpp
diff --git a/src/boost/cpp/device_attribute.h b/ext/device_attribute.h
similarity index 100%
rename from src/boost/cpp/device_attribute.h
rename to ext/device_attribute.h
diff --git a/src/boost/cpp/device_attribute_config.cpp b/ext/device_attribute_config.cpp
similarity index 100%
rename from src/boost/cpp/device_attribute_config.cpp
rename to ext/device_attribute_config.cpp
diff --git a/src/boost/cpp/device_attribute_history.cpp b/ext/device_attribute_history.cpp
similarity index 100%
rename from src/boost/cpp/device_attribute_history.cpp
rename to ext/device_attribute_history.cpp
diff --git a/src/boost/cpp/device_attribute_numpy.hpp b/ext/device_attribute_numpy.hpp
similarity index 100%
rename from src/boost/cpp/device_attribute_numpy.hpp
rename to ext/device_attribute_numpy.hpp
diff --git a/src/boost/cpp/device_data.cpp b/ext/device_data.cpp
similarity index 100%
rename from src/boost/cpp/device_data.cpp
rename to ext/device_data.cpp
diff --git a/src/boost/cpp/device_data_history.cpp b/ext/device_data_history.cpp
similarity index 100%
rename from src/boost/cpp/device_data_history.cpp
rename to ext/device_data_history.cpp
diff --git a/src/boost/cpp/device_info.cpp b/ext/device_info.cpp
similarity index 100%
rename from src/boost/cpp/device_info.cpp
rename to ext/device_info.cpp
diff --git a/src/boost/cpp/device_pipe.cpp b/ext/device_pipe.cpp
similarity index 100%
rename from src/boost/cpp/device_pipe.cpp
rename to ext/device_pipe.cpp
diff --git a/src/boost/cpp/device_pipe.h b/ext/device_pipe.h
similarity index 100%
rename from src/boost/cpp/device_pipe.h
rename to ext/device_pipe.h
diff --git a/src/boost/cpp/device_proxy.cpp b/ext/device_proxy.cpp
similarity index 100%
rename from src/boost/cpp/device_proxy.cpp
rename to ext/device_proxy.cpp
diff --git a/src/boost/cpp/enums.cpp b/ext/enums.cpp
similarity index 100%
rename from src/boost/cpp/enums.cpp
rename to ext/enums.cpp
diff --git a/src/boost/cpp/event_data.cpp b/ext/event_data.cpp
similarity index 100%
rename from src/boost/cpp/event_data.cpp
rename to ext/event_data.cpp
diff --git a/src/boost/cpp/exception.cpp b/ext/exception.cpp
similarity index 100%
rename from src/boost/cpp/exception.cpp
rename to ext/exception.cpp
diff --git a/src/boost/cpp/exception.h b/ext/exception.h
similarity index 100%
rename from src/boost/cpp/exception.h
rename to ext/exception.h
diff --git a/src/boost/cpp/fast_from_py.h b/ext/fast_from_py.h
similarity index 100%
rename from src/boost/cpp/fast_from_py.h
rename to ext/fast_from_py.h
diff --git a/src/boost/cpp/fast_from_py_numpy.hpp b/ext/fast_from_py_numpy.hpp
similarity index 100%
rename from src/boost/cpp/fast_from_py_numpy.hpp
rename to ext/fast_from_py_numpy.hpp
diff --git a/src/boost/cpp/from_py.cpp b/ext/from_py.cpp
similarity index 100%
rename from src/boost/cpp/from_py.cpp
rename to ext/from_py.cpp
diff --git a/src/boost/cpp/from_py.h b/ext/from_py.h
similarity index 100%
rename from src/boost/cpp/from_py.h
rename to ext/from_py.h
diff --git a/src/boost/cpp/group.cpp b/ext/group.cpp
similarity index 100%
rename from src/boost/cpp/group.cpp
rename to ext/group.cpp
diff --git a/src/boost/cpp/group_reply.cpp b/ext/group_reply.cpp
similarity index 100%
rename from src/boost/cpp/group_reply.cpp
rename to ext/group_reply.cpp
diff --git a/src/boost/cpp/group_reply_list.cpp b/ext/group_reply_list.cpp
similarity index 100%
rename from src/boost/cpp/group_reply_list.cpp
rename to ext/group_reply_list.cpp
diff --git a/src/boost/cpp/locker_info.cpp b/ext/locker_info.cpp
similarity index 100%
rename from src/boost/cpp/locker_info.cpp
rename to ext/locker_info.cpp
diff --git a/src/boost/cpp/locking_thread.cpp b/ext/locking_thread.cpp
similarity index 100%
rename from src/boost/cpp/locking_thread.cpp
rename to ext/locking_thread.cpp
diff --git a/src/boost/cpp/periodic_event_info.cpp b/ext/periodic_event_info.cpp
similarity index 100%
rename from src/boost/cpp/periodic_event_info.cpp
rename to ext/periodic_event_info.cpp
diff --git a/src/boost/cpp/pipe_info.cpp b/ext/pipe_info.cpp
similarity index 100%
rename from src/boost/cpp/pipe_info.cpp
rename to ext/pipe_info.cpp
diff --git a/src/boost/cpp/poll_device.cpp b/ext/poll_device.cpp
similarity index 100%
rename from src/boost/cpp/poll_device.cpp
rename to ext/poll_device.cpp
diff --git a/src/boost/cpp/precompiled_header.cpp b/ext/precompiled_header.cpp
similarity index 100%
rename from src/boost/cpp/precompiled_header.cpp
rename to ext/precompiled_header.cpp
diff --git a/src/boost/cpp/precompiled_header.hpp b/ext/precompiled_header.hpp
similarity index 100%
rename from src/boost/cpp/precompiled_header.hpp
rename to ext/precompiled_header.hpp
diff --git a/src/boost/cpp/pytango.cpp b/ext/pytango.cpp
similarity index 100%
rename from src/boost/cpp/pytango.cpp
rename to ext/pytango.cpp
diff --git a/src/boost/cpp/pytgutils.cpp b/ext/pytgutils.cpp
similarity index 100%
rename from src/boost/cpp/pytgutils.cpp
rename to ext/pytgutils.cpp
diff --git a/src/boost/cpp/pytgutils.h b/ext/pytgutils.h
similarity index 100%
rename from src/boost/cpp/pytgutils.h
rename to ext/pytgutils.h
diff --git a/src/boost/cpp/pyutils.cpp b/ext/pyutils.cpp
similarity index 100%
rename from src/boost/cpp/pyutils.cpp
rename to ext/pyutils.cpp
diff --git a/src/boost/cpp/pyutils.h b/ext/pyutils.h
similarity index 100%
rename from src/boost/cpp/pyutils.h
rename to ext/pyutils.h
diff --git a/src/boost/cpp/server/attr.cpp b/ext/server/attr.cpp
similarity index 100%
rename from src/boost/cpp/server/attr.cpp
rename to ext/server/attr.cpp
diff --git a/src/boost/cpp/server/attr.h b/ext/server/attr.h
similarity index 100%
rename from src/boost/cpp/server/attr.h
rename to ext/server/attr.h
diff --git a/src/boost/cpp/server/attribute.cpp b/ext/server/attribute.cpp
similarity index 100%
rename from src/boost/cpp/server/attribute.cpp
rename to ext/server/attribute.cpp
diff --git a/src/boost/cpp/server/attribute.h b/ext/server/attribute.h
similarity index 100%
rename from src/boost/cpp/server/attribute.h
rename to ext/server/attribute.h
diff --git a/src/boost/cpp/server/auto_monitor.cpp b/ext/server/auto_monitor.cpp
similarity index 100%
rename from src/boost/cpp/server/auto_monitor.cpp
rename to ext/server/auto_monitor.cpp
diff --git a/src/boost/cpp/server/command.cpp b/ext/server/command.cpp
similarity index 100%
rename from src/boost/cpp/server/command.cpp
rename to ext/server/command.cpp
diff --git a/src/boost/cpp/server/command.h b/ext/server/command.h
similarity index 100%
rename from src/boost/cpp/server/command.h
rename to ext/server/command.h
diff --git a/src/boost/cpp/server/device_class.cpp b/ext/server/device_class.cpp
similarity index 100%
rename from src/boost/cpp/server/device_class.cpp
rename to ext/server/device_class.cpp
diff --git a/src/boost/cpp/server/device_class.h b/ext/server/device_class.h
similarity index 100%
rename from src/boost/cpp/server/device_class.h
rename to ext/server/device_class.h
diff --git a/src/boost/cpp/server/device_impl.cpp b/ext/server/device_impl.cpp
similarity index 100%
rename from src/boost/cpp/server/device_impl.cpp
rename to ext/server/device_impl.cpp
diff --git a/src/boost/cpp/server/device_impl.h b/ext/server/device_impl.h
similarity index 100%
rename from src/boost/cpp/server/device_impl.h
rename to ext/server/device_impl.h
diff --git a/src/boost/cpp/server/dserver.cpp b/ext/server/dserver.cpp
similarity index 100%
rename from src/boost/cpp/server/dserver.cpp
rename to ext/server/dserver.cpp
diff --git a/src/boost/cpp/server/encoded_attribute.cpp b/ext/server/encoded_attribute.cpp
similarity index 100%
rename from src/boost/cpp/server/encoded_attribute.cpp
rename to ext/server/encoded_attribute.cpp
diff --git a/src/boost/cpp/server/log4tango.cpp b/ext/server/log4tango.cpp
similarity index 100%
rename from src/boost/cpp/server/log4tango.cpp
rename to ext/server/log4tango.cpp
diff --git a/src/boost/cpp/server/multi_attribute.cpp b/ext/server/multi_attribute.cpp
similarity index 100%
rename from src/boost/cpp/server/multi_attribute.cpp
rename to ext/server/multi_attribute.cpp
diff --git a/src/boost/cpp/server/multi_class_attribute.cpp b/ext/server/multi_class_attribute.cpp
similarity index 100%
rename from src/boost/cpp/server/multi_class_attribute.cpp
rename to ext/server/multi_class_attribute.cpp
diff --git a/src/boost/cpp/server/pipe.cpp b/ext/server/pipe.cpp
similarity index 100%
rename from src/boost/cpp/server/pipe.cpp
rename to ext/server/pipe.cpp
diff --git a/src/boost/cpp/server/pipe.h b/ext/server/pipe.h
similarity index 100%
rename from src/boost/cpp/server/pipe.h
rename to ext/server/pipe.h
diff --git a/src/boost/cpp/server/subdev.cpp b/ext/server/subdev.cpp
similarity index 100%
rename from src/boost/cpp/server/subdev.cpp
rename to ext/server/subdev.cpp
diff --git a/src/boost/cpp/server/tango_util.cpp b/ext/server/tango_util.cpp
similarity index 100%
rename from src/boost/cpp/server/tango_util.cpp
rename to ext/server/tango_util.cpp
diff --git a/src/boost/cpp/server/user_default_attr_prop.cpp b/ext/server/user_default_attr_prop.cpp
similarity index 100%
rename from src/boost/cpp/server/user_default_attr_prop.cpp
rename to ext/server/user_default_attr_prop.cpp
diff --git a/src/boost/cpp/server/user_default_pipe_prop.cpp b/ext/server/user_default_pipe_prop.cpp
similarity index 100%
rename from src/boost/cpp/server/user_default_pipe_prop.cpp
rename to ext/server/user_default_pipe_prop.cpp
diff --git a/src/boost/cpp/server/wattribute.cpp b/ext/server/wattribute.cpp
similarity index 100%
rename from src/boost/cpp/server/wattribute.cpp
rename to ext/server/wattribute.cpp
diff --git a/src/boost/cpp/server/wattribute_numpy.hpp b/ext/server/wattribute_numpy.hpp
similarity index 100%
rename from src/boost/cpp/server/wattribute_numpy.hpp
rename to ext/server/wattribute_numpy.hpp
diff --git a/src/boost/cpp/tango_numpy.h b/ext/tango_numpy.h
similarity index 100%
rename from src/boost/cpp/tango_numpy.h
rename to ext/tango_numpy.h
diff --git a/src/boost/cpp/tgutils.h b/ext/tgutils.h
similarity index 100%
rename from src/boost/cpp/tgutils.h
rename to ext/tgutils.h
diff --git a/src/boost/cpp/time_val.cpp b/ext/time_val.cpp
similarity index 100%
rename from src/boost/cpp/time_val.cpp
rename to ext/time_val.cpp
diff --git a/src/boost/cpp/to_py.cpp b/ext/to_py.cpp
similarity index 100%
rename from src/boost/cpp/to_py.cpp
rename to ext/to_py.cpp
diff --git a/src/boost/cpp/to_py.h b/ext/to_py.h
similarity index 100%
rename from src/boost/cpp/to_py.h
rename to ext/to_py.h
diff --git a/src/boost/cpp/to_py_numpy.hpp b/ext/to_py_numpy.hpp
similarity index 100%
rename from src/boost/cpp/to_py_numpy.hpp
rename to ext/to_py_numpy.hpp
diff --git a/src/boost/cpp/version.cpp b/ext/version.cpp
similarity index 100%
rename from src/boost/cpp/version.cpp
rename to ext/version.cpp
diff --git a/src/sip/Makefile b/src/sip/Makefile
deleted file mode 100644
index 6820d9c..0000000
--- a/src/sip/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-TARGET = Tango.so
-OFILES = sipTangocmodule.o sipTangoDatabase.o sipTangoDeviceProxy.o sipTangoConnection.o sipTangoDbDevImportInfo.o sipTangoDbDevInfo.o sipTangoDbDatum.o sipTangoCommandInfoList.o sipTangoCommandInfo.o sipTangoDevCommandInfo.o sipTangostdvector1800.o sipTangostdvector0100stdstring.o sipTangostdstring.o
-HFILES = sipAPITango.h
-
-CC = gcc
-CXX = g++
-LINK = g++
-CPPFLAGS = -DNDEBUG -I. -I/usr/include/python2.6
-CFLAGS = -O2 -g -fPIC -Wall -W
-CXXFLAGS = -std=c++0x -O2 -g -fPIC -Wall -W
-LFLAGS = -z defs -shared -Wl,--version-script=Tango.exp
-LIBS = -ltango -llog4tango -lzmq -lomniORB4 -lomniDynamic4 -lomnithread -lCOS4 -lpython2.6
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-
-.cpp.o:
- $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.cc.o:
- $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.cxx.o:
- $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.C.o:
- $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.c.o:
- $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
-
-all: $(TARGET)
-
-$(OFILES): $(HFILES)
-
-$(TARGET): $(OFILES)
- @echo '{ global: initTango; local: *; };' > Tango.exp
- $(LINK) $(LFLAGS) -o $(TARGET) $(OFILES) $(LIBS)
-
-install: $(TARGET)
- @test -d $(DESTDIR)/usr/lib/python2.6/dist-packages || mkdir -p $(DESTDIR)/usr/lib/python2.6/dist-packages
- cp -f $(TARGET) $(DESTDIR)/usr/lib/python2.6/dist-packages/$(TARGET)
-
-clean:
- -rm -f $(TARGET)
- -rm -f sipTangocmodule.o
- -rm -f sipTangoDatabase.o
- -rm -f sipTangoDeviceProxy.o
- -rm -f sipTangoConnection.o
- -rm -f sipTangoDbDevImportInfo.o
- -rm -f sipTangoDbDevInfo.o
- -rm -f sipTangoDbDatum.o
- -rm -f sipTangoCommandInfoList.o
- -rm -f sipTangoCommandInfo.o
- -rm -f sipTangoDevCommandInfo.o
- -rm -f sipTangostdvector1800.o
- -rm -f sipTangostdvector0100stdstring.o
- -rm -f sipTangostdstring.o
- -rm -f Tango.exp
diff --git a/src/sip/Tango/__init__.py b/src/sip/Tango/__init__.py
deleted file mode 100644
index 58a1214..0000000
--- a/src/sip/Tango/__init__.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# ------------------------------------------------------------------------------
-# This file is part of PyTango (http://www.tinyurl.com/PyTango)
-#
-# Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
-# Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-#
-# Distributed under the terms of the GNU Lesser General Public License,
-# either version 3 of the License, or (at your option) any later version.
-# See LICENSE.txt for more info.
-# ------------------------------------------------------------------------------
-
-from . import release
-__author__ = release.Release.author_lines
-__version_info__ = release.Release.version_info
-__version__ = release.Release.version
-__version_long__ = release.Release.version_long
-__version_number__ = release.Release.version_number
-__version_description__ = release.Release.version_description
-__doc__ = release.Release.long_description
-del release
-
-from . import __init_tango
-from . import Tango
-__init_tango.init(Tango, None)
-del __init_tango
-del Tango
-
-from .Tango import *
-
diff --git a/src/sip/Tango/__init_tango.py b/src/sip/Tango/__init_tango.py
deleted file mode 100644
index e6dce8e..0000000
--- a/src/sip/Tango/__init_tango.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# ------------------------------------------------------------------------------
-# This file is part of PyTango (http://www.tinyurl.com/PyTango)
-#
-# Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
-# Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-#
-# Distributed under the terms of the GNU Lesser General Public License,
-# either version 3 of the License, or (at your option) any later version.
-# See LICENSE.txt for more info.
-# ------------------------------------------------------------------------------
-
-def __inc_param(obj, name):
- import collections
- ret = not name.startswith('_')
- ret &= not name in ('except_flags',)
- ret &= not isinstance(getattr(obj, name), collections.Callable)
- return ret
-
-def __single_param(obj, param_name, f=repr, fmt='%s = %s'):
- param_value = getattr(obj, param_name)
- return fmt % (param_name, f(param_value))
-
-def __struct_params_s(obj, separator=', ', f=repr, fmt='%s = %s'):
- """method wrapper for printing all elements of a struct"""
- s = separator.join([__single_param(obj, n, f, fmt) for n in dir(obj) if __inc_param(obj, n)])
- return s
-
-def __struct_params_repr(obj):
- """method wrapper for representing all elements of a struct"""
- return __struct_params_s(obj, fmt='%s=%s')
-
-def __struct_params_str(obj, fmt, f=repr):
- """method wrapper for printing all elements of a struct."""
- return __struct_params_s(obj, '\n', f=f, fmt=fmt)
-
-def __repr__Struct(self):
- """repr method for struct"""
- return '%s(%s)' % (self.__class__.__name__, __struct_params_repr(self))
-
-def __str__Struct_Helper(self, f=repr):
- """str method for struct"""
- attrs = [ n for n in dir(self) if __inc_param(self, n)]
- fmt = attrs and '%%%ds = %%s' % max(map(len, attrs)) or "%s = %s"
- return '%s(\n%s)\n' % (self.__class__.__name__, __struct_params_str(self, fmt, f))
-
-def __str__Struct(self):
- return __str__Struct_Helper(self)
-
-def __registerStructStr(Tango):
- """helper method to register str and repr methods for structures"""
- structs = (Tango.DeviceInfo, Tango.DbDevImportInfo, Tango.DbDatum,
- Tango.AttributeInfo, Tango.AttributeInfoEx,
- Tango.ChangeEventInfo, Tango.PeriodicEventInfo,
- Tango.ArchiveEventInfo, Tango.AttributeAlarmInfo,
- Tango.AttributeEventInfo,
- Tango.AttributeInfo, Tango.CommandInfo)
-
- for struct in structs:
- struct.__str__ = __str__Struct
- struct.__repr__ = __repr__Struct
-
-def __pprint_init(Tango):
- __registerStructStr(Tango)
-
-def init(Tango, Tangodict):
- __pprint_init(Tango)
- return 1
diff --git a/src/sip/Tango/release.py b/src/sip/Tango/release.py
deleted file mode 100644
index a1bcc27..0000000
--- a/src/sip/Tango/release.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# ------------------------------------------------------------------------------
-# This file is part of PyTango (http://www.tinyurl.com/PyTango)
-#
-# Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
-# Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-#
-# Distributed under the terms of the GNU Lesser General Public License,
-# either version 3 of the License, or (at your option) any later version.
-# See LICENSE.txt for more info.
-# ------------------------------------------------------------------------------
-
-"""
-This is an internal PyTango module.
-"""
-
-__all__ = [ "Release" ]
-
-__docformat__ = "restructuredtext"
-
-class Release:
- """
- Release information:
- - name : (str) package name
- - version_info : (tuple<int,int,int,str,int>) The five components
- of the version number: major, minor, micro, releaselevel, and
- serial.
- - version : (str) package version in format <major>.<minor>.<micro>
- - version_long : (str) package version in format
- <major>.<minor>.<micro><releaselevel><serial>
- - version_description : (str) short description for the current
- version
- - version_number : (int) <major>*100 + <minor>*10 + <micro>
- - description : (str) package description
- - long_description : (str) longer package description
- - authors : (dict<str(last name), tuple<str(full name),str(email)>>)
- package authors
- - url : (str) package url
- - download_url : (str) package download url
- - platform : (seq<str>) list of available platforms
- - keywords : (seq<str>) list of keywords
- - license : (str) the license"""
- name = 'PyTango'
- version_info = (8, 1, 0, 'dev', 0)
- version = '.'.join(map(str, version_info[:3]))
- version_long = version + ''.join(map(str, version_info[3:]))
- version_description = 'This version implements the C++ Tango 8.1 API.'
- version_number = int(version.replace('.',''))
- description = 'A python binding for the Tango control system'
- long_description = 'This module implements the Python Tango Device API ' \
- 'mapping.'
- license = 'LGPL'
- authors = { 'Coutinho' : ('Tiago Coutinho' , 'coutinho at esrf.fr') }
- author_lines = "\n".join([ "%s <%s>" % x for x in authors.values()])
- url = 'http://www.tango-controls.org/static/PyTango/'
- download_url = 'http://pypi.python.org/packages/source/P/PyTango'
- platform = ['Linux', 'Windows XP/Vista/7/8']
- keywords = ['Tango', 'CORBA', 'binding']
-
diff --git a/src/sip/setup.cfg b/src/sip/setup.cfg
deleted file mode 100644
index 0e215a3..0000000
--- a/src/sip/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[build_ext]
-sip-opts = -e -g -w
\ No newline at end of file
diff --git a/src/sip/setup.py b/src/sip/setup.py
deleted file mode 100644
index e39ebb7..0000000
--- a/src/sip/setup.py
+++ /dev/null
@@ -1,298 +0,0 @@
-# ------------------------------------------------------------------------------
-# This file is part of PyTango (http://www.tinyurl.com/PyTango)
-#
-# Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
-# Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-#
-# Distributed under the terms of the GNU Lesser General Public License,
-# either version 3 of the License, or (at your option) any later version.
-# See LICENSE.txt for more info.
-# ------------------------------------------------------------------------------
-
-import os
-import imp
-import sys
-import struct
-import platform
-import subprocess
-
-from distutils.core import setup, Extension
-from distutils.version import StrictVersion as V
-from distutils.unixccompiler import UnixCCompiler
-
-import sipdistutils
-
-
-def abspath(*path):
- """A method to determine absolute path for a given relative path to the
- directory where this setup.py script is located"""
- setup_dir = os.path.dirname(os.path.abspath(__file__))
- return os.path.join(setup_dir, *path)
-
-
-def get_release_info():
- try:
- sys.path.insert(0, abspath("python"))
- import release
- return release.Release
- finally:
- sys.path.pop(0)
-
-
-def uniquify(seq):
- no_dups = []
- [ no_dups.append(i) for i in seq if not no_dups.count(i) ]
- return no_dups
-
-
-class build_ext(sipdistutils.build_ext):
-
- def build_extensions(self):
- self.use_cpp_0x = False
- if isinstance(self.compiler, UnixCCompiler):
- compiler_pars = self.compiler.compiler_so
- while '-Wstrict-prototypes' in compiler_pars:
- del compiler_pars[compiler_pars.index('-Wstrict-prototypes')]
- #self.compiler.compiler_so = " ".join(compiler_pars)
-
- # mimic tango check to activate C++0x extension
- compiler = self.compiler.compiler
- pipe = subprocess.Popen(compiler + ["-dumpversion"], stdout=subprocess.PIPE).stdout
- gcc_ver = pipe.readlines()[0].decode().strip()
- if V(gcc_ver) >= V("4.3.3"):
- self.use_cpp_0x = True
- sipdistutils.build_ext.build_extensions(self)
-
- def build_extension(self, ext):
- if self.use_cpp_0x:
- ext.extra_compile_args += ['-std=c++0x']
- ext.define_macros += [ ('PYTANGO_HAS_UNIQUE_PTR', '1') ]
- sipdistutils.build_ext.build_extension(self, ext)
-
-
-def main():
- ZMQ_ROOT = LOG4TANGO_ROOT = OMNI_ROOT = TANGO_ROOT = '/usr'
-
- TANGO_ROOT = os.environ.get('TANGO_ROOT', TANGO_ROOT)
- OMNI_ROOT = os.environ.get('OMNI_ROOT', OMNI_ROOT)
- LOG4TANGO_ROOT = os.environ.get('LOG4TANGO_ROOT', LOG4TANGO_ROOT)
- ZMQ_ROOT = os.environ.get('ZMQ_ROOT', ZMQ_ROOT)
-
- Release = get_release_info()
-
- author = Release.authors['Coutinho']
-
- please_debug = False
-
- packages = [
- 'Tango',
- ]
-
- provides = [
- 'Tango',
- ]
-
- requires = [
- 'sip (>=4.10)',
- 'numpy (>=1.1)'
- ]
-
- classifiers = [
- 'Development Status :: 2 - Pre-Alpha',
- 'Environment :: Other Environment',
- 'Intended Audience :: Developers',
- 'License :: OSI Approved :: GNU Library or Lesser General Public License v3 (LGPLv3)',
- 'Natural Language :: English',
- 'Operating System :: Microsoft :: Windows',
- 'Operating System :: POSIX',
- 'Operating System :: POSIX :: Linux',
- 'Operating System :: Unix',
- 'Operating System :: MacOS',
- 'Programming Language :: C',
- 'Programming Language :: Python',
- 'Programming Language :: Python :: 3',
- 'Topic :: Scientific/Engineering',
- 'Topic :: Software Development :: Libraries',
- ]
-
- #-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-
- # include directories
- #-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-
-
- include_dirs = [ ]
-
- _tango_root_inc = os.path.join(TANGO_ROOT, 'include')
- include_dirs.append(_tango_root_inc)
-
- # $TANGO_ROOT/include/tango exists since tango 7.2.0
- # we changed the PyTango code include statements from:
- # #include <tango.h> to:
- # #include <tango/tango.h>
- # However tango itself complains that it doesn't know his own header files
- # if we don't add the $TANGO_ROOT/include/tango directory to the path. So we do it
- # here
- _tango_root_inc = os.path.join(_tango_root_inc, 'tango')
- if os.path.isdir(_tango_root_inc):
- include_dirs.append(_tango_root_inc)
-
- include_dirs.append(os.path.join(OMNI_ROOT, 'include'))
- include_dirs.append(os.path.join(LOG4TANGO_ROOT, 'include'))
-
- #-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-
- # library directories
- #-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-
-
- libraries = [
- 'tango',
- 'log4tango',
- 'zmq',
- ]
-
- extra_compile_args = []
-
- extra_link_args = []
-
- macros = []
-
- library_dirs = []
- for f in (TANGO_ROOT, LOG4TANGO_ROOT, ZMQ_ROOT):
- is64 = 8 * struct.calcsize("P") == 64
- d = os.path.join(f, 'lib')
- if is64:
- d = os.path.join(f, 'lib64')
- try:
- if not os.stat(d): raise Exception('%s_doesnt_exist' % d)
- except: d = os.path.join(f, 'lib')
- library_dirs.append(d)
-
- if os.name == 'nt':
- include_dirs += [ ]
-
- if please_debug:
- libraries += [
- #'libboost_python-vc80-mt-1_38', Boost in windows autodetects the
- #proper library to link itself with...
- 'omniORB414d_rt',
- 'omniDynamic414d_rt',
- 'omnithread34d_rt',
- 'COS414d_rt',
- ]
- extra_compile_args += []
- extra_link_args += ['/DEBUG']
- macros += [ ('_DEBUG', None) ]
- else:
- libraries += [
- #'libboost_python-vc80-mt-1_38', Boost in windows autodetects the
- #proper library to link itself with...
- 'omniORB414_rt',
- 'omniDynamic414_rt',
- 'omnithread34_rt',
- 'COS414_rt',
- ]
-
- library_dirs += [ os.path.join(OMNI_ROOT, 'lib', 'x86_win32') ]
-
- extra_compile_args += [
- '/EHsc',
- '/wd4005', # supress redefinition of HAVE_STRFTIME between python and omniORB
- '/wd4996', # same as /D_SCL_SECURE_NO_WARNINGS
- '/wd4250', # supress base class inheritance warning
- ]
-
- extra_link_args += []
-
- macros += [
- ('LOG4TANGO_HAS_DLL', None),
- ('TANGO_HAS_DLL', None),
- ('WIN32', None),
- ]
-
- else:
- if please_debug:
- extra_compile_args += ['-g', '-O0']
- extra_link_args += ['-g' , '-O0']
-
- libraries += [
- 'pthread',
- 'rt',
- 'dl',
- 'omniORB4',
- 'omniDynamic4',
- 'omnithread',
- 'COS4',
- ]
-
- is64 = 8 * struct.calcsize("P") == 64
- omni_lib = os.path.join(OMNI_ROOT, 'lib')
- if is64:
- omni_lib = os.path.join(OMNI_ROOT, 'lib64')
- try:
- if not os.stat(d): raise Exception('%s_doesnt_exist' % d)
- except:
- omni_lib = os.path.join(OMNI_ROOT, 'lib')
- library_dirs += [ omni_lib ]
-
-
- # Note for PyTango developers:
- # Compilation time can be greatly reduced by compiling the file
- # src/precompiled_header.hpp as src/precompiled_header.hpp.gch
- # and then uncommenting this line. Someday maybe this will be
- # automated...
- extra_compile_args += [
-# '-includesrc/precompiled_header.hpp',
- ]
-
- #if not please_debug:
- # extra_compile_args += [ '-g0' ]
-
- extra_link_args += [
- '-Wl,-h',
- '-Wl,--strip-all',
- ]
-
- macros += []
-
- include_dirs = uniquify(include_dirs)
- library_dirs = uniquify(library_dirs)
- src_dir = abspath('.')
- _cppfiles = [os.path.join(src_dir, fname) for fname in os.listdir(src_dir)
- if fname.endswith('.cpp') ]
- _cppfiles.sort()
- sources = [abspath("sip", "Tango.sip")] + _cppfiles
-
- cmdclass = {'build_ext': build_ext}
-
- _tango = Extension(
- name='Tango.Tango',
- sources=sources,
- include_dirs=include_dirs,
- library_dirs=library_dirs,
- libraries=libraries,
- define_macros=macros,
- extra_compile_args=extra_compile_args,
- extra_link_args=extra_link_args,
- language='c++',
- depends=[])
-
- dist = setup(
- name='Tango',
- version=Release.version,
- description=Release.description,
- long_description=Release.long_description,
- author=author[0],
- author_email=author[1],
- url=Release.url,
- download_url=Release.download_url,
- platforms=Release.platform,
- license=Release.license,
- packages=packages,
- package_dir={ 'Tango' : abspath("Tango") },
- classifiers=classifiers,
- provides=provides,
- keywords=Release.keywords,
- requires=requires,
- ext_modules=[_tango],
- cmdclass=cmdclass)
-
-if __name__ == "__main__":
- main()
diff --git a/src/sip/sip/AttributeInfo.sip b/src/sip/sip/AttributeInfo.sip
deleted file mode 100644
index cf58712..0000000
--- a/src/sip/sip/AttributeInfo.sip
+++ /dev/null
@@ -1,104 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-struct AttributeInfo : DeviceAttributeConfig
-{
-%TypeHeaderCode
-#include <tango.h>
-using namespace Tango;
-%End
-
- DispLevel disp_level;
-
- bool operator==(const AttributeInfo &);
-};
-
-%MappedType AttributeInfoList
-{
-%TypeHeaderCode
-#include <vector>
-#include <tango.h>
-using namespace Tango;
-%End
-
-%ConvertToTypeCode
- // See if we are just being asked to check the type of the Python
- // object.
- if(sipIsErr == NULL)
- {
- bool aReturnFlag = PyList_Check(sipPy);
- for(int i = 0; aReturnFlag && i < PySequence_Size(sipPy); ++i)
- {
- aReturnFlag = sipCanConvertToType(PySequence_ITEM(sipPy, i),
- sipType_AttributeInfo,
- SIP_NOT_NONE);
- }
- return aReturnFlag;
- }
-
- AttributeInfoList *attrInfoList = new AttributeInfoList();
- for(int i = 0; i < PySequence_Size(sipPy); ++i)
- {
- int state;
- AttributeInfo *aAttributeInfo = reinterpret_cast<AttributeInfo*>(
- sipConvertToType(PySequence_ITEM(sipPy, i),
- sipType_AttributeInfo, Py_None,
- SIP_NOT_NONE,
- &state, sipIsErr));
- // Deal with any errors.
- if (*sipIsErr)
- {
- sipReleaseType(aAttributeInfo, sipType_AttributeInfo, state);
-
- // Tidy up.
- delete attrInfoList;
-
- // There is no temporary instance.
- return 0;
- }
- attrInfoList->push_back(*aAttributeInfo);
- sipReleaseType(aAttributeInfo, sipType_AttributeInfo, state);
- }
- *sipCppPtr = attrInfoList;
- return sipGetState(sipTransferObj);
-%End
-
-%ConvertFromTypeCode
- PyObject *l;
-
- // Create the Python list of the correct length.
- if (!(l = PyList_New(sipCpp->size())))
- return NULL;
-
- // Go through each element in the C++ instance and convert it to a
- // wrapped AttributeInfo
- int i = 0;
- for(std::vector<AttributeInfo>::iterator j = sipCpp->begin();
- j != sipCpp->end(); ++j, ++i)
- {
- AttributeInfo *aAttributeInfo = new AttributeInfo(*j);
- PyObject *wobj;
-
- if (!(wobj = sipConvertFromNewType(aAttributeInfo,
- sipType_AttributeInfo,
- sipTransferObj)))
- {
- // There was an error so garbage collect the Python list.
- Py_DECREF(l);
- return NULL;
- }
- PyList_SET_ITEM(l, i, wobj);
- }
- delete sipCpp;
- return l;
-%End
-};
-
diff --git a/src/sip/sip/AttributeInfoEx.sip b/src/sip/sip/AttributeInfoEx.sip
deleted file mode 100644
index 0d60a07..0000000
--- a/src/sip/sip/AttributeInfoEx.sip
+++ /dev/null
@@ -1,176 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-struct AttributeAlarmInfo
-{
-%TypeHeaderCode
-#include <string>
-#include <vector>
-#include <tango.h>
-using namespace Tango;
-%End
- std::string min_alarm;
- std::string max_alarm;
- std::string min_warning;
- std::string max_warning;
- std::string delta_t;
- std::string delta_val;
- std::vector<std::string> extensions;
-};
-
-struct ChangeEventInfo
-{
-%TypeHeaderCode
-#include <string>
-#include <vector>
-#include <tango.h>
-using namespace Tango;
-%End
- std::string rel_change;
- std::string abs_change;
-};
-
-struct PeriodicEventInfo
-{
-%TypeHeaderCode
-#include <string>
-#include <vector>
-#include <tango.h>
-using namespace Tango;
-%End
- std::string period;
- std::vector<std::string> extensions;
-};
-
-struct ArchiveEventInfo
-{
-%TypeHeaderCode
-#include <string>
-#include <vector>
-#include <tango.h>
-using namespace Tango;
-%End
- std::string archive_rel_change;
- std::string archive_abs_change;
- std::string archive_period;
- std::vector<std::string> extensions;
-};
-
-struct AttributeEventInfo
-{
-%TypeHeaderCode
-#include <string>
-#include <vector>
-#include <tango.h>
-using namespace Tango;
-%End
- ChangeEventInfo ch_event;
- PeriodicEventInfo per_event;
- ArchiveEventInfo arch_event;
-};
-
-struct AttributeInfoEx : AttributeInfo
-{
-%TypeHeaderCode
-#include <string>
-#include <vector>
-#include <tango.h>
-using namespace Tango;
-%End
-
- AttributeAlarmInfo alarms;
- AttributeEventInfo events;
- std::vector<std::string> sys_extensions;
-
- bool operator==(const AttributeInfoEx &);
-};
-
-
-%MappedType AttributeInfoListEx
-{
-%TypeHeaderCode
-#include <vector>
-#include <tango.h>
-using namespace Tango;
-%End
-
-%ConvertToTypeCode
- // See if we are just being asked to check the type of the Python
- // object.
- if(sipIsErr == NULL)
- {
- bool aReturnFlag = PyList_Check(sipPy);
- for(int i = 0; aReturnFlag && i < PySequence_Size(sipPy); ++i)
- {
- aReturnFlag = sipCanConvertToType(PySequence_ITEM(sipPy, i),
- sipType_AttributeInfoEx,
- SIP_NOT_NONE);
- }
- return aReturnFlag;
- }
-
- AttributeInfoListEx *attrInfoListEx = new AttributeInfoListEx();
- for(int i = 0; i < PySequence_Size(sipPy); ++i)
- {
- int state;
- AttributeInfoEx *aAttributeInfoEx = reinterpret_cast<AttributeInfoEx*>(
- sipConvertToType(PySequence_ITEM(sipPy, i),
- sipType_AttributeInfoEx, Py_None,
- SIP_NOT_NONE,
- &state, sipIsErr));
- // Deal with any errors.
- if (*sipIsErr)
- {
- sipReleaseType(aAttributeInfoEx, sipType_AttributeInfoEx, state);
-
- // Tidy up.
- delete attrInfoListEx;
-
- // There is no temporary instance.
- return 0;
- }
- attrInfoListEx->push_back(*aAttributeInfoEx);
- sipReleaseType(aAttributeInfoEx, sipType_AttributeInfoEx, state);
- }
- *sipCppPtr = attrInfoListEx;
- return sipGetState(sipTransferObj);
-%End
-
-%ConvertFromTypeCode
- PyObject *l;
-
- // Create the Python list of the correct length.
- if (!(l = PyList_New(sipCpp->size())))
- return NULL;
-
- // Go through each element in the C++ instance and convert it to a
- // wrapped AttributeInfoEx
- int i = 0;
- for(std::vector<AttributeInfoEx>::iterator j = sipCpp->begin();
- j != sipCpp->end(); ++j, ++i)
- {
- AttributeInfoEx *aAttributeInfoEx = new AttributeInfoEx(*j);
- PyObject *wobj;
-
- if (!(wobj = sipConvertFromNewType(aAttributeInfoEx,
- sipType_AttributeInfoEx,
- sipTransferObj)))
- {
- // There was an error so garbage collect the Python list.
- Py_DECREF(l);
- return NULL;
- }
- PyList_SET_ITEM(l, i, wobj);
- }
- delete sipCpp;
- return l;
-%End
-};
diff --git a/src/sip/sip/CommandInfo.sip b/src/sip/sip/CommandInfo.sip
deleted file mode 100644
index 0ff6ed6..0000000
--- a/src/sip/sip/CommandInfo.sip
+++ /dev/null
@@ -1,119 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-struct DevCommandInfo
-{
-%TypeHeaderCode
-#include <tango.h>
-using namespace Tango;
-%End
-
- std::string cmd_name;
- long cmd_tag;
- long in_type;
- long out_type;
- std::string in_type_desc;
- std::string out_type_desc;
-
- bool operator==(const DevCommandInfo &);
-};
-
-struct CommandInfo : DevCommandInfo
-{
-%TypeHeaderCode
-#include <tango.h>
-using namespace Tango;
-%End
-
- DispLevel disp_level;
-
- bool operator==(const CommandInfo &);
-};
-
-%MappedType CommandInfoList
-{
-%TypeHeaderCode
-#include <vector>
-#include <tango.h>
-using namespace Tango;
-%End
-
-%ConvertToTypeCode
- // See if we are just being asked to check the type of the Python
- // object.
- if(sipIsErr == NULL)
- {
- bool aReturnFlag = PyList_Check(sipPy);
- for(int i = 0; aReturnFlag && i < PySequence_Size(sipPy); ++i)
- {
- aReturnFlag = sipCanConvertToType(PySequence_ITEM(sipPy, i),
- sipType_CommandInfo,
- SIP_NOT_NONE);
- }
- return aReturnFlag;
- }
-
- CommandInfoList *cmdInfoList = new CommandInfoList();
- for(int i = 0; i < PySequence_Size(sipPy); ++i)
- {
- int state;
- CommandInfo *aCommandInfo = reinterpret_cast<CommandInfo*>(
- sipConvertToType(PySequence_ITEM(sipPy, i),
- sipType_CommandInfo, Py_None,
- SIP_NOT_NONE,
- &state, sipIsErr));
- // Deal with any errors.
- if (*sipIsErr)
- {
- sipReleaseType(aCommandInfo, sipType_CommandInfo, state);
-
- // Tidy up.
- delete cmdInfoList;
-
- // There is no temporary instance.
- return 0;
- }
- cmdInfoList->push_back(*aCommandInfo);
- sipReleaseType(aCommandInfo, sipType_CommandInfo, state);
- }
- *sipCppPtr = cmdInfoList;
- return sipGetState(sipTransferObj);
-%End
-
-%ConvertFromTypeCode
- PyObject *l;
-
- // Create the Python list of the correct length.
- if (!(l = PyList_New(sipCpp->size())))
- return NULL;
-
- // Go through each element in the C++ instance and convert it to a
- // wrapped CommandInfo
- int i = 0;
- for(std::vector<CommandInfo>::iterator j = sipCpp->begin();
- j != sipCpp->end(); ++j, ++i)
- {
- CommandInfo *aCommandInfo = new CommandInfo(*j);
- PyObject *wobj;
-
- if (!(wobj = sipConvertFromNewType(aCommandInfo, sipType_CommandInfo, sipTransferObj)))
- {
- // There was an error so garbage collect the Python list.
- Py_DECREF(l);
- return NULL;
- }
- PyList_SET_ITEM(l, i, wobj);
- }
- delete sipCpp;
- return l;
-%End
-};
-
diff --git a/src/sip/sip/Database.sip b/src/sip/sip/Database.sip
deleted file mode 100644
index 93e1848..0000000
--- a/src/sip/sip/Database.sip
+++ /dev/null
@@ -1,181 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-class Database : Connection {
-
-%TypeHeaderCode
-#include <tango.h>
-using namespace Tango;
-%End
-
-private:
- virtual std::string get_corba_name(bool);
- virtual std::string build_corba_name();
- virtual int get_lock_ctr();
- virtual void set_lock_ctr(int);
- virtual std::string dev_name();
-
-public :
- Database();
- Database(std::string &host, int port);
- Database(std::string &file);
-
- Database(const Database &);
-//// Database & operator=(const Database &);
-
- void write_filedatabase();
- void reread_filedatabase();
- void write_event_channel_ior_filedatabase(std::string &);
- void build_connection ();
- void post_reconnection();
-
-
-//// inline Device_var &get_dbase() { return device;}
- void check_tango_host(const char *);
- AccessControlType check_access_control(std::string &);
- bool is_control_access_checked();
- void set_access_checked(bool val);
-
-// void set_tango_utils(Tango::Util *ptr);
- int get_server_release();
-
-// DevErrorList &get_access_except_errors();
- void clear_access_except_errors();
- bool is_command_allowed(std::string &,std::string &);
-
- bool is_multi_tango_host();
- std::vector<std::string> &get_multi_host();
- std::vector<std::string> &get_multi_port();
-
- const std::string &get_file_name();
-
-//#ifdef _TG_WINDOWS_
-// Database(CORBA::ORB *orb,std::string &,std::string &);
-// long get_tango_host_from_reg(char **,std::string &,std::string &);
-//#endif
-
-//
-// general methods
-//
-
- std::string get_info();
-
- DbDatum get_host_list();
- DbDatum get_host_list(std::string &);
- DbDatum get_services(std::string &,std::string &);
- void register_service(std::string &,std::string &,std::string &);
- void unregister_service(std::string &,std::string &);
-// CORBA::Any *fill_server_cache(std::string &,std::string &);
-
-/*
-//
-// device methods
-//
-
- void add_device(DbDevInfo&);
- void delete_device(std::string);
- DbDevImportInfo import_device(std::string &);
- void export_device(DbDevExportInfo &);
- void unexport_device(std::string);
-
- DbDatum get_device_name(std::string &, std::string &,DbServerCache *dsc);
- DbDatum get_device_name(std::string &, std::string &);
- DbDatum get_device_exported(std::string &);
- DbDatum get_device_domain(std::string &);
- DbDatum get_device_family(std::string &);
- DbDatum get_device_member(std::string &);
- void get_device_alias(std::string,std::string &);
- void get_alias(std::string,std::string &);
- DbDatum get_device_alias_list(std::string &);
- std::string get_class_for_device(std::string &);
- DbDatum get_class_inheritance_for_device(std::string &);
- DbDatum get_device_exported_for_class(std::string &);
- void put_device_alias(std::string &,std::string &);
- void delete_device_alias(std::string &);
-
-//
-// server methods
-//
- void add_server(std::string &, DbDevInfos&);
- void delete_server(std::string &);
- void export_server(DbDevExportInfos &);
- void unexport_server(std::string &);
-
- DbServerInfo get_server_info(std::string &);
- void put_server_info(DbServerInfo &);
- void delete_server_info(std::string &);
- DbDatum get_server_class_list(std::string &);
- DbDatum get_server_name_list();
- DbDatum get_instance_name_list(std::string &);
- DbDatum get_server_list();
- DbDatum get_server_list(std::string &);
- DbDatum get_host_server_list(std::string &);
- DbDatum get_device_class_list(std::string &);
-
-//
-// property methods
-//
-
- void get_property(std::string, DbData &,DbServerCache *dsc);
- void get_property(std::string st, DbData &db) {get_property(st,db,NULL);}
- void get_property_forced(std::string, DbData &,DbServerCache *dsc = NULL);
- void put_property(std::string, DbData &);
- void delete_property(std::string, DbData &);
- vector<DbHistory> get_property_history(std::string &,std::string &);
- DbDatum get_object_list(std::string &);
- DbDatum get_object_property_list(std::string &,std::string &);
-
- void get_device_property(std::string, DbData &, DbServerCache *dsc);
- void get_device_property(std::string st, DbData &db) {get_device_property(st,db,NULL);}
- void put_device_property(std::string, DbData &);
- void delete_device_property(std::string, DbData &);
- vector<DbHistory> get_device_property_history(std::string &,std::string &);
- DbDatum get_device_property_list(std::string &,std::string &);
- void get_device_property_list(std::string &,const std::string &,vector<std::string> &,DbServerCache *dsc = NULL);
-
- void get_device_attribute_property(std::string, DbData &, DbServerCache *dsc);
- void get_device_attribute_property(std::string st, DbData &db) {get_device_attribute_property(st,db,NULL);}
- void put_device_attribute_property(std::string, DbData &);
- void delete_device_attribute_property(std::string, DbData &);
- void delete_all_device_attribute_property(std::string, DbData &);
- vector<DbHistory> get_device_attribute_property_history(std::string &,std::string &,std::string &);
-
- void get_class_property(std::string, DbData &, DbServerCache *dsc);
- void get_class_property(std::string st,DbData &db) {get_class_property(st,db,NULL);}
- void put_class_property(std::string, DbData &);
- void delete_class_property(std::string, DbData &);
- vector<DbHistory> get_class_property_history(std::string &,std::string &);
- DbDatum get_class_list(std::string &);
- DbDatum get_class_property_list(std::string &);
-
- void get_class_attribute_property(std::string, DbData &, DbServerCache *dsc);
- void get_class_attribute_property(std::string st,DbData &db) {get_class_attribute_property(st,db,NULL);}
- void put_class_attribute_property(std::string, DbData &);
- void delete_class_attribute_property(std::string, DbData &);
- vector<DbHistory> get_class_attribute_property_history(std::string &,std::string &,std::string &);
- DbDatum get_class_attribute_list(std::string &,std::string &);
-
-
-// attribute methods
-
- void get_attribute_alias(std::string, std::string&);
- DbDatum get_attribute_alias_list(std::string &);
- void put_attribute_alias(std::string &,std::string &);
- void delete_attribute_alias(std::string &);
-
-// event methods
-
- void export_event(DevVarstd::stringArray *);
- void unexport_event(std::string &);
- CORBA::Any *import_event(std::string &);
-*/
-};
-
diff --git a/src/sip/sip/DbData.sip b/src/sip/sip/DbData.sip
deleted file mode 100644
index 3ba4be2..0000000
--- a/src/sip/sip/DbData.sip
+++ /dev/null
@@ -1,12 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-
diff --git a/src/sip/sip/DbDatum.sip b/src/sip/sip/DbDatum.sip
deleted file mode 100644
index 6319f96..0000000
--- a/src/sip/sip/DbDatum.sip
+++ /dev/null
@@ -1,187 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-//
-// DbDatum - data object for sending and receiving data from the
-// TANGO database api
-//
-class DbDatum
-{
-
-%TypeHeaderCode
-#include <tango.h>
-using namespace Tango;
-%End
-
-public :
- enum except_flags
- {
- isempty_flag,
- wrongtype_flag,
- numFlags
- };
-
- std::string name;
- std::vector<std::string> value_string;
-
-//
-// constructor methods
-//
- DbDatum();
- DbDatum (const char *);
- ~DbDatum();
- DbDatum(const DbDatum &);
-// DbDatum &operator=(const DbDatum &);
-
-// size_t size();
- bool is_empty();
-
-//// void exceptions(bitset<numFlags> fl) { exceptions_flags = fl;}
-//// bitset<numFlags> exceptions() {return exceptions_flags;}
- void reset_exceptions(except_flags fl);
- void set_exceptions(except_flags fl);
-
-//
-// insert methods
-//
-/*
- void operator << (bool);
- void operator << (short);
- void operator << (unsigned char);
- void operator << (unsigned short);
- void operator << (DevLong);
- void operator << (DevULong);
- void operator << (DevLong64);
- void operator << (DevULong64);
- void operator << (float);
- void operator << (double);
- void operator << (char *);
-// void operator << (char *&);
- void operator << (const char *);
-// void operator << (const char *&);
- void operator << (std::string&);
-
- void operator << (vector<std::string>&);
- void operator << (vector<short>&);
- void operator << (vector<unsigned short>&);
- void operator << (vector<DevLong>&);
- void operator << (vector<DevULong>&);
- void operator << (vector<DevLong64>&);
- void operator << (vector<DevULong64>&);
- void operator << (vector<float>&);
- void operator << (vector<double>&);
-
-//
-// extract methods
-//
-
- bool operator >> (bool&);
- bool operator >> (short&);
- bool operator >> (unsigned char&);
- bool operator >> (unsigned short&);
- bool operator >> (DevLong&);
- bool operator >> (DevULong&);
- bool operator >> (DevLong64&);
- bool operator >> (DevULong64&);
- bool operator >> (float&);
- bool operator >> (double&);
- bool operator >> (const char*&);
- bool operator >> (std::string&);
-
- bool operator >> (vector<std::string>&);
- bool operator >> (vector<short>&);
- bool operator >> (vector<unsigned short>&);
- bool operator >> (vector<DevLong>&);
- bool operator >> (vector<DevULong>&);
- bool operator >> (vector<DevLong64>&);
- bool operator >> (vector<DevULong64>&);
- bool operator >> (vector<float>&);
- bool operator >> (vector<double>&);
-*/
-};
-
-%MappedType DbData
-{
-%TypeHeaderCode
-#include <vector>
-#include <tango.h>
-using namespace Tango;
-%End
-
-%ConvertToTypeCode
- // See if we are just being asked to check the type of the Python
- // object.
- if(sipIsErr == NULL)
- {
- bool aReturnFlag = PyList_Check(sipPy);
- for(int i = 0; aReturnFlag && i < PySequence_Size(sipPy); ++i)
- {
- aReturnFlag = sipCanConvertToType(PySequence_ITEM(sipPy, i),
- sipType_DbDatum,
- SIP_NOT_NONE);
- }
- return aReturnFlag;
- }
-
- DbData *dbDatumList = new DbData();
- for(int i = 0; i < PySequence_Size(sipPy); ++i)
- {
- int state;
- DbDatum *aDbDatum = reinterpret_cast<DbDatum*>(
- sipConvertToType(PySequence_ITEM(sipPy, i),
- sipType_DbDatum, Py_None,
- SIP_NOT_NONE,
- &state, sipIsErr));
- // Deal with any errors.
- if (*sipIsErr)
- {
- sipReleaseType(aDbDatum, sipType_DbDatum, state);
-
- // Tidy up.
- delete dbDatumList;
-
- // There is no temporary instance.
- return 0;
- }
- dbDatumList->push_back(*aDbDatum);
- sipReleaseType(aDbDatum, sipType_DbDatum, state);
- }
- *sipCppPtr = dbDatumList;
- return sipGetState(sipTransferObj);
-%End
-
-%ConvertFromTypeCode
- PyObject *l;
-
- // Create the Python list of the correct length.
- if (!(l = PyList_New(sipCpp->size())))
- return NULL;
-
- // Go through each element in the C++ instance and convert it to a
- // wrapped DbDatum
- int i = 0;
- for(std::vector<DbDatum>::iterator j = sipCpp->begin();
- j != sipCpp->end(); ++j, ++i)
- {
- DbDatum *aDbDatum = new DbDatum(*j);
- PyObject *wobj;
-
- if (!(wobj = sipConvertFromNewType(aDbDatum, sipType_DbDatum, sipTransferObj)))
- {
- // There was an error so garbage collect the Python list.
- Py_DECREF(l);
- return NULL;
- }
- PyList_SET_ITEM(l, i, wobj);
- }
- return l;
-%End
-};
diff --git a/src/sip/sip/DbDevImportInfo.sip b/src/sip/sip/DbDevImportInfo.sip
deleted file mode 100644
index f96c1eb..0000000
--- a/src/sip/sip/DbDevImportInfo.sip
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-class DbDevImportInfo
-{
-
-%TypeHeaderCode
-#include <tango.h>
-using namespace Tango;
-%End
-
-public :
- std::string name;
- long exported;
- std::string ior;
- std::string version;
-};
\ No newline at end of file
diff --git a/src/sip/sip/DbDevInfo.sip b/src/sip/sip/DbDevInfo.sip
deleted file mode 100644
index 98b6d4a..0000000
--- a/src/sip/sip/DbDevInfo.sip
+++ /dev/null
@@ -1,24 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-class DbDevInfo
-{
-
-%TypeHeaderCode
-#include <tango.h>
-using namespace Tango;
-%End
-
-public :
- std::string name;
- std::string _class;
- std::string server;
-};
\ No newline at end of file
diff --git a/src/sip/sip/DeviceAttribute.sip b/src/sip/sip/DeviceAttribute.sip
deleted file mode 100644
index e1acc79..0000000
--- a/src/sip/sip/DeviceAttribute.sip
+++ /dev/null
@@ -1,30 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-class DeviceAttribute
-{
-
-public :
-//
-// constructor methods
-//
- enum except_flags
- {
- isempty_flag = 0,
- wrongtype_flag,
- failed_flag,
- unknown_format_flag,
- numFlags
- };
-
- DeviceAttribute();
- DeviceAttribute(const DeviceAttribute&);
-};
\ No newline at end of file
diff --git a/src/sip/sip/DeviceAttributeConfig.sip b/src/sip/sip/DeviceAttributeConfig.sip
deleted file mode 100644
index d405b5e..0000000
--- a/src/sip/sip/DeviceAttributeConfig.sip
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-struct DeviceAttributeConfig
-{
-%TypeHeaderCode
-#include <tango.h>
-using namespace Tango;
-%End
- std::string name;
- AttrWriteType writable;
- AttrDataFormat data_format;
- int data_type;
- int max_dim_x;
- int max_dim_y;
- std::string description;
- std::string label;
- std::string unit;
- std::string standard_unit;
- std::string display_unit;
- std::string format;
- std::string min_value;
- std::string max_value;
- std::string min_alarm;
- std::string max_alarm;
- std::string writable_attr_name;
- std::vector<std::string> extensions;
-
- bool operator==(const DeviceAttributeConfig &);
-};
diff --git a/src/sip/sip/DeviceInfo.sip b/src/sip/sip/DeviceInfo.sip
deleted file mode 100644
index f565562..0000000
--- a/src/sip/sip/DeviceInfo.sip
+++ /dev/null
@@ -1,24 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-struct DeviceInfo
-{
-%TypeHeaderCode
-#include <tango.h>
-using namespace Tango;
-%End
- std::string dev_class;
- std::string server_id;
- std::string server_host;
- long server_version;
- std::string doc_url;
- std::string dev_type;
-};
diff --git a/src/sip/sip/DeviceProxy.sip b/src/sip/sip/DeviceProxy.sip
deleted file mode 100644
index e53a87e..0000000
--- a/src/sip/sip/DeviceProxy.sip
+++ /dev/null
@@ -1,222 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-class DeviceProxy : Connection {
-
-%TypeHeaderCode
-#include <tango.h>
-using namespace Tango;
-%End
-
-protected:
- virtual std::string get_corba_name(bool);
- virtual std::string build_corba_name();
- virtual int get_lock_ctr();
- virtual void set_lock_ctr(int);
-
-public:
- DeviceProxy();
- DeviceProxy(const char *, bool ch_access);
- DeviceProxy(const char *);
-
- DeviceProxy(const DeviceProxy &);
-// DeviceProxy & operator=(const DeviceProxy &);
-
-//
-// general methods
-//
-
- virtual const DeviceInfo & info();
- virtual std::string dev_name();
- virtual void parse_name(std::string &);
- virtual Database *get_device_db();
-
- virtual std::string status();
- virtual DevState state();
- virtual std::string adm_name();
- virtual std::string description();
- virtual std::string name();
- virtual std::string alias();
-
- virtual int ping();
-
- virtual std::vector<std::string>* black_box(int);
-
-//
-// device methods
-//
- virtual CommandInfo command_query(std::string);
- virtual CommandInfoList* command_list_query();
-
-
- virtual DbDevImportInfo import_info();
-//
-// property methods
-//
- virtual void get_property(std::string& /In/, DbData& /Out/);
- virtual void get_property(std::vector<std::string> /In/, DbData& /Out/);
- virtual void get_property(DbData&);
- virtual void put_property(DbData& /In/);
- virtual void delete_property(std::string& /In/);
- virtual void delete_property(std::vector<std::string>& /In/);
- virtual void delete_property(DbData& /In/);
- virtual void get_property_list(const std::string &, std::vector<std::string> & /Out/);
-
-//
-// attribute methods
-//
- virtual std::vector<std::string> *get_attribute_list();
-
- virtual AttributeInfoList *get_attribute_config(std::vector<std::string>&);
- virtual AttributeInfoListEx *get_attribute_config_ex(std::vector<std::string>&);
-
- virtual AttributeInfoEx get_attribute_config(const std::string &);
-
- virtual AttributeInfoEx attribute_query(std::string name);
-
- virtual AttributeInfoList *attribute_list_query();
- virtual AttributeInfoListEx *attribute_list_query_ex();
-
- virtual void set_attribute_config(AttributeInfoList &);
- virtual void set_attribute_config(AttributeInfoListEx &);
-/*
- virtual DeviceAttribute read_attribute(std::string&);
- virtual DeviceAttribute read_attribute(const char *at);
- void read_attribute(const char *,DeviceAttribute &);
- void read_attribute(std::string &at,DeviceAttribute &da);
- virtual std::vector<DeviceAttribute> *read_attributes(std::vector<std::string>&);
-
- virtual void write_attribute(DeviceAttribute&);
- virtual void write_attributes(std::vector<DeviceAttribute>&);
-
- virtual DeviceAttribute write_read_attribute(DeviceAttribute &);
-
-//
-// history methods
-//
- virtual std::vector<DeviceDataHistory> *command_history(std::string &,int);
- virtual std::vector<DeviceDataHistory> *command_history(const char *na,int n)
- {std::string str(na);return command_history(str,n);}
-
- virtual std::vector<DeviceAttributeHistory> *attribute_history(std::string &,int);
- virtual std::vector<DeviceAttributeHistory> *attribute_history(const char *na,int n)
- {std::string str(na);return attribute_history(str,n);}
-//
-// Polling administration methods
-//
- virtual std::vector<std::string> *polling_status();
-
- virtual void poll_command(std::string &, int);
- virtual void poll_command(const char *na, int per) {std::string tmp(na);poll_command(tmp,per);}
- virtual void poll_attribute(std::string &, int);
- virtual void poll_attribute(const char *na, int per) {std::string tmp(na);poll_attribute(tmp,per);}
-
- virtual int get_command_poll_period(std::string &);
- virtual int get_command_poll_period(const char *na)
- {std::string tmp(na);return get_command_poll_period(tmp);}
- virtual int get_attribute_poll_period(std::string &);
- virtual int get_attribute_poll_period(const char *na)
- {std::string tmp(na);return get_attribute_poll_period(tmp);}
-
- virtual bool is_command_polled(std::string &);
- virtual bool is_command_polled(const char *na) {std::string tmp(na);return is_command_polled(tmp);}
- virtual bool is_attribute_polled(std::string &);
- virtual bool is_attribute_polled(const char *na) {std::string tmp(na);return is_attribute_polled(tmp);}
-
- virtual void stop_poll_command(std::string &);
- virtual void stop_poll_command(const char *na) {std::string tmp(na);stop_poll_command(tmp);}
- virtual void stop_poll_attribute(std::string &);
- virtual void stop_poll_attribute(const char *na) {std::string tmp(na);stop_poll_attribute(tmp);}
-//
-// Asynchronous methods
-//
- virtual long read_attribute_asynch(const char *na) {std::string tmp(na);return read_attribute_asynch(tmp);}
- virtual long read_attribute_asynch(std::string &att_name);
- virtual long read_attributes_asynch(std::vector <std::string> &);
-
- virtual std::vector<DeviceAttribute> *read_attributes_reply(long);
- virtual std::vector<DeviceAttribute> *read_attributes_reply(long,long);
- virtual DeviceAttribute *read_attribute_reply(long);
- virtual DeviceAttribute *read_attribute_reply(long,long);
-
- virtual long write_attribute_asynch(DeviceAttribute &);
- virtual long write_attributes_asynch(std::vector<DeviceAttribute> &);
-
- virtual void write_attributes_reply(long);
- virtual void write_attributes_reply(long,long);
- virtual void write_attribute_reply(long id) {write_attributes_reply(id);}
- virtual void write_attribute_reply(long to,long id) {write_attributes_reply(to,id);}
-
- virtual long pending_asynch_call(asyn_req_type req)
- {if (req == POLLING)return pasyn_ctr;
- else if (req==CALL_BACK) return pasyn_cb_ctr;
- else return (pasyn_ctr + pasyn_cb_ctr);}
-
- virtual void read_attributes_asynch(std::vector<std::string> &,CallBack &);
- virtual void read_attribute_asynch(const char *na,CallBack &cb) {std::string tmp(na);read_attribute_asynch(tmp,cb);}
- virtual void read_attribute_asynch(std::string &,CallBack &);
-
- virtual void write_attribute_asynch(DeviceAttribute &,CallBack &);
- virtual void write_attributes_asynch(std::vector<DeviceAttribute> &,CallBack &);
-//
-// Logging administration methods
-//
-#ifdef TANGO_HAS_LOG4TANGO
- virtual void add_logging_target(const std::string &target_type_name);
- virtual void add_logging_target(const char *target_type_name)
- {add_logging_target(std::string(target_type_name));}
-
- virtual void remove_logging_target(const std::string &target_type_name);
- virtual void remove_logging_target(const char *target_type_name)
- {remove_logging_target(std::string(target_type_name));}
-
- virtual std::vector<std::string> get_logging_target (void);
- virtual int get_logging_level (void);
- virtual void set_logging_level (int level);
-#endif // TANGO_HAS_LOG4TANGO
-//
-// Event methods
-//
- virtual int subscribe_event(const std::string &attr_name, EventType event, CallBack *,
- const std::vector<std::string> &filters); // For compatibility with Tango < 8
- virtual int subscribe_event(const std::string &attr_name, EventType event, CallBack *,
- const std::vector<std::string> &filters, bool stateless); // For compatibility with Tango < 8
- virtual int subscribe_event(const std::string &attr_name, EventType event, int event_queue_size,
- const std::vector<std::string> &filters, bool stateless = false); // For compatibility with Tango < 8
-
- virtual int subscribe_event(const std::string &attr_name, EventType event, CallBack *);
- virtual int subscribe_event(const std::string &attr_name, EventType event, CallBack *,bool stateless);
- virtual int subscribe_event(const std::string &attr_name, EventType event, int event_queue_size,bool stateless = false);
-
- virtual void unsubscribe_event(int event_id);
-//
-// Methods to access data in event queues
-//
- virtual void get_events (int event_id, EventDataList &event_list);
- virtual void get_events (int event_id, AttrConfEventDataList &event_list);
- virtual void get_events (int event_id, DataReadyEventDataList &event_list);
- virtual void get_events (int event_id, CallBack *cb);
- virtual int event_queue_size(int event_id);
- virtual TimeVal get_last_event_date(int event_id);
- virtual bool is_event_queue_empty(int event_id);
-
-//
-// Locking methods
-//
- virtual void lock(int lock_validity=DEFAULT_LOCK_VALIDITY);
- virtual void unlock(bool force=false);
- virtual std::string locking_status();
- virtual bool is_locked();
- virtual bool is_locked_by_me();
- virtual bool get_locker(LockerInfo &);
-*/
-};
-
diff --git a/src/sip/sip/Tango.sip b/src/sip/sip/Tango.sip
deleted file mode 100644
index 0816619..0000000
--- a/src/sip/sip/Tango.sip
+++ /dev/null
@@ -1,52 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-%Module Tango 008001000
-
-%Timeline { TANGO_7_2 TANGO_8_0 TANGO_8_1 }
-
-%Platforms {WIN32_PLATFORM POSIX_PLATFORM MACOS_PLATFORM}
-
-%Include std_utils.sip
-%Include constants.sip
-%Include CommandInfo.sip
-%Include DeviceInfo.sip
-%Include DeviceAttributeConfig.sip
-%Include AttributeInfo.sip
-%Include AttributeInfoEx.sip
-%Include DbDatum.sip
-%Include DbDevInfo.sip
-%Include DbDevImportInfo.sip
-%Include connection.sip
-%Include DeviceAttribute.sip
-%Include DeviceProxy.sip
-%Include Database.sip
-
-/*
-%PostInitialisationCode
-
- PyObject* init_tango = PyImport_ImportModule("__init_tango");
- if (init_tango == NULL)
- {
- if (!PyErr_Occurred())
- {
-
- }
- return;
- }
- PyObject* init_name = PyString_FromString("init");
- PyObject* ret = PyObject_CallMethodObjArgs(init_tango, init_name, sipModule,
- sipModuleDict, NULL);
- Py_DECREF(init_name);
- Py_DECREF(ret);
- Py_DECREF(init_tango);
-%End
-*/
\ No newline at end of file
diff --git a/src/sip/sip/configure.py b/src/sip/sip/configure.py
deleted file mode 100644
index 1a6ee6e..0000000
--- a/src/sip/sip/configure.py
+++ /dev/null
@@ -1,59 +0,0 @@
-import os
-import sys
-import sipconfig
-
-# The name of the SIP build file generated by SIP and used by the build
-# system.
-
-this_dir = os.path.dirname(os.path.abspath(__file__))
-sip_dir = os.path.join(this_dir, 'sip')
-build_dir = os.path.join(this_dir, 'build')
-install_dir = os.path.join(this_dir, os.path.pardir, 'Tango')
-
-try:
- os.makedirs(build_dir)
-except OSError:
- pass
-
-name = "Tango"
-sip_file = os.path.join(this_dir, name + ".sip")
-build_file = os.path.join(build_dir , name + ".sbf")
-
-# Get the SIP configuration information.
-config = sipconfig.Configuration()
-
-# Run SIP to generate the code.
-cmd = " ".join([config.sip_bin,
- "-e" , # Enable support for exceptions.
- "-g", # Always release and reaquire the GIL.
- "-w", # Enable warning messages
- "-c", build_dir,
- "-b", build_file,
- sip_file])
-print cmd
-ret = os.system(cmd)
-
-if ret:
- print "sip error: exiting..."
- sys.exit(ret)
-
-# Create the Makefile.
-makefile = sipconfig.SIPModuleMakefile(config, build_file, dir=this_dir,
- install_dir=install_dir)
-
-python_lib = "python{v[0]}.{v[1]}".format(v=sys.version_info)
-
-# Add the library we are wrapping. The name doesn't include any platform
-# specific prefixes or extensions (e.g. the "lib" prefix on UNIX, or the
-# ".dll" extension on Windows).
-makefile.extra_libs = ["tango", "log4tango", python_lib]
-makefile.extra_libs += ["zmq", "omniORB4", "omniDynamic4", "omnithread", "COS4"]
-#makefile.extra_lib_dirs = ["/home/tcoutinho/.local/lib"]
-#makefile.extra_include_dirs = ["/home/tcoutinho/.local/include", "/home/tcoutinho/.local/include/tango"]
-makefile.extra_cxxflags = ["-std=c++0x"]
-
-# see all undefined references
-makefile.extra_lflags = ['-z defs']
-
-# Generate the Makefile itself.
-makefile.generate()
diff --git a/src/sip/sip/connection.sip b/src/sip/sip/connection.sip
deleted file mode 100644
index 9df9c92..0000000
--- a/src/sip/sip/connection.sip
+++ /dev/null
@@ -1,51 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-class Connection {
-
-%TypeHeaderCode
-#include <tango.h>
-using namespace Tango;
-%End
-
-protected:
-
- virtual std::string get_corba_name(bool)=0;
- virtual std::string build_corba_name()=0;
- virtual int get_lock_ctr()=0;
- virtual void set_lock_ctr(int)=0;
-
-public:
- virtual std::string dev_name()=0;
-
- std::string &get_db_host();
- std::string &get_db_port();
- int get_db_port_num();
- bool get_from_env_var();
- static void get_fqdn(std::string &);
-
- bool is_dbase_used();
- std::string &get_dev_host();
- std::string &get_dev_port();
-
- int get_idl_version();
-
- virtual void set_timeout_millis(int timeout);
- virtual int get_timeout_millis();
- virtual DevSource get_source();
- virtual void set_source(DevSource );
- virtual void set_transparency_reconnection(bool val);
- virtual bool get_transparency_reconnection();
-
- AccessControlType get_access_control();
- void set_access_control(AccessControlType acc);
- AccessControlType get_access_right();
-};
diff --git a/src/sip/sip/constants.sip b/src/sip/sip/constants.sip
deleted file mode 100644
index 11f5772..0000000
--- a/src/sip/sip/constants.sip
+++ /dev/null
@@ -1,218 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-%ModuleHeaderCode
-#include <tango.h>
-using namespace Tango;
-%End
-
-enum CmdArgType {
- DEV_VOID,
- DEV_BOOLEAN,
- DEV_SHORT,
- DEV_LONG,
- DEV_FLOAT,
- DEV_DOUBLE,
- DEV_USHORT,
- DEV_ULONG,
- DEV_STRING,
- DEVVAR_CHARARRAY,
- DEVVAR_SHORTARRAY,
- DEVVAR_LONGARRAY,
- DEVVAR_FLOATARRAY,
- DEVVAR_DOUBLEARRAY,
- DEVVAR_USHORTARRAY,
- DEVVAR_ULONGARRAY,
- DEVVAR_STRINGARRAY,
- DEVVAR_LONGSTRINGARRAY,
- DEVVAR_DOUBLESTRINGARRAY,
- DEV_STATE,
- CONST_DEV_STRING,
- DEVVAR_BOOLEANARRAY,
- DEV_UCHAR,
- DEV_LONG64,
- DEV_ULONG64,
- DEVVAR_LONG64ARRAY,
- DEVVAR_ULONG64ARRAY,
- DEV_INT,
- DEV_ENCODED
-};
-
-enum MessBoxType {
- STOP,
- INFO
-};
-
-enum PollObjType {
- POLL_CMD,
- POLL_ATTR,
- EVENT_HEARTBEAT,
- STORE_SUBDEV
-};
-
-enum PollCmdCode {
- POLL_ADD_OBJ,
- POLL_REM_OBJ,
- POLL_START,
- POLL_STOP,
- POLL_UPD_PERIOD,
- POLL_REM_DEV,
- POLL_EXIT,
- POLL_REM_EXT_TRIG_OBJ,
- POLL_ADD_HEARTBEAT,
- POLL_REM_HEARTBEAT
-};
-
-enum SerialModel {
- BY_DEVICE,
- BY_CLASS,
- BY_PROCESS,
- NO_SYNC
-};
-
-enum AttReqType {
- READ_REQ,
- WRITE_REQ
-};
-
-enum LockCmdCode {
- LOCK_ADD_DEV,
- LOCK_REM_DEV,
- LOCK_UNLOCK_ALL_EXIT,
- LOCK_EXIT
-};
-
-enum LogLevel {
- LOG_OFF,
- LOG_FATAL,
- LOG_ERROR,
- LOG_WARN,
- LOG_INFO,
- LOG_DEBUG
-} ;
-
-enum LogTarget {
- LOG_CONSOLE,
- LOG_FILE,
- LOG_DEVICE
-};
-
-enum EventType {
- CHANGE_EVENT,
- QUALITY_EVENT,
- PERIODIC_EVENT,
- ARCHIVE_EVENT,
- USER_EVENT,
- ATTR_CONF_EVENT,
- DATA_READY_EVENT,
- numEventType
-};
-
-enum AttrSerialModel
-{
- ATTR_NO_SYNC,
- ATTR_BY_KERNEL,
- ATTR_BY_USER
-};
-
-enum KeepAliveCmdCode
-{
- EXIT_TH
-};
-
-enum AccessControlType
-{
- ACCESS_READ,
- ACCESS_WRITE
-};
-
-enum MinMaxValueCheck
-{
- MIN,
- MAX
-};
-
-enum ChannelType
-{
- ZMQ,
- NOTIFD
-};
-
-// IDL
-
-enum AttrQuality {
- ATTR_VALID,
- ATTR_INVALID,
- ATTR_ALARM,
- ATTR_CHANGING,
- ATTR_WARNING
- /*, __max_AttrQuality=0xffffffff */
-};
-
-enum AttrWriteType
-{
- READ,
- READ_WITH_WRITE,
- WRITE,
- READ_WRITE
- /*, __max_AttrWriteType=0xffffffff */
-};
-
-enum AttrDataFormat
-{
- SCALAR,
- SPECTRUM,
- IMAGE,
- FMT_UNKNOWN
- /*, __max_AttrDataFormat=0xffffffff */
-};
-
-enum DevSource
-{
- DEV,
- CACHE,
- CACHE_DEV
- /*, __max_DevSource=0xffffffff */
-};
-
-enum ErrSeverity
-{
- WARN,
- ERR,
- PANIC
- /*, __max_ErrSeverity=0xffffffff */
-};
-
-enum DevState
-{
- ON,
- OFF,
- CLOSE,
- OPEN,
- INSERT,
- EXTRACT,
- MOVING,
- STANDBY,
- FAULT,
- INIT,
- RUNNING,
- ALARM,
- DISABLE,
- UNKNOWN
- /*, __max_DevState=0xffffffff */
-};
-
-enum DispLevel
-{
- OPERATOR,
- EXPERT
- /*, __max_DispLevel=0xffffffff */
-};
diff --git a/src/sip/sip/std_utils.sip b/src/sip/sip/std_utils.sip
deleted file mode 100644
index 174f1bf..0000000
--- a/src/sip/sip/std_utils.sip
+++ /dev/null
@@ -1,101 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-%MappedType std::string
-{
-%TypeHeaderCode
-#include <string>
-%End
-
-%ConvertToTypeCode
-if (sipIsErr == NULL)
- return PyString_Check(sipPy);
-
- *sipCppPtr = new std::string(PyString_AsString(sipPy), PyString_Size(sipPy));
-
- return sipGetState(sipTransferObj);
-%End
-
-%ConvertFromTypeCode
-return PyString_FromStringAndSize(sipCpp->data(),sipCpp->length());
-%End
-};
-
-
-%MappedType std::vector<std::string>
-{
-%TypeHeaderCode
-#include <string>
-#include <vector>
-%End
-
-%ConvertToTypeCode
-if (sipIsErr == NULL)
-{
- bool aReturnFlag = PyList_Check(sipPy);
- for(int i = 0;aReturnFlag && i < PyList_Size(sipPy);++i)
- aReturnFlag = PyString_Check(PyList_GET_ITEM(sipPy,i));
- return aReturnFlag;
-}
-
-*sipCppPtr = new std::vector<std::string>(PyList_Size(sipPy));
-for(int i = 0;i < PyList_Size(sipPy);++i)
- (*sipCppPtr)->operator[](i) = PyString_AsString(PyList_GET_ITEM(sipPy,i));
-
-return sipGetState(sipTransferObj);
-%End
-
-%ConvertFromTypeCode
-PyObject* aReturnListPt = PyList_New(sipCpp->size());
-std::vector<std::string>::iterator vIter = sipCpp->begin();
-
-for(int i = 0;vIter != sipCpp->end();++vIter,++i)
- PyList_SET_ITEM(aReturnListPt,i,PyString_FromStringAndSize(vIter->data(),vIter->length()));
-
-return aReturnListPt;
-%End
-};
-
-
-%MappedType std::vector<int>
-{
-%TypeHeaderCode
-#include <vector>
-%End
-
-%ConvertToTypeCode
-if (sipIsErr == NULL)
-{
-bool aReturnFlag = PyList_Check(sipPy);
-for(int i = 0;aReturnFlag && i < PyList_Size(sipPy);++i)
- aReturnFlag = PyInt_Check(PyList_GET_ITEM(sipPy,i));
-return aReturnFlag;
-}
-
-*sipCppPtr = new std::vector<int>(PyList_Size(sipPy));
-for(int i = 0;i < PyList_Size(sipPy);++i)
- (*sipCppPtr)->operator[](i) = PyInt_AS_LONG(PyList_GET_ITEM(sipPy,i));
-
- return sipGetState(sipTransferObj);
-%End
-
-%ConvertFromTypeCode
-PyObject* aReturnListPt = PyList_New(sipCpp->size());
-std::vector<int>::iterator vIter = sipCpp->begin();
-
-for(int i = 0;vIter != sipCpp->end();++vIter,++i)
- PyList_SET_ITEM(aReturnListPt,i,PyInt_FromLong(*vIter));
-
-return aReturnListPt;
-%End
-
-};
-
diff --git a/src/swig/Makefile b/src/swig/Makefile
deleted file mode 100644
index 6555b4a..0000000
--- a/src/swig/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-
-# -----------------------------------------------------------------------------
-# Common stuff
-# -----------------------------------------------------------------------------
-COMMON_OUT = _common
-
-CSCC = cscc
-CC = c++
-LD = c++
-
-SRC = src
-SWIG = swig -c++
-
-INTERFACE_FILE=tango.i
-
-# -----------------------------------------------------------------------------
-# PERL stuff
-# -----------------------------------------------------------------------------
-PERL_FLAGS =$(shell perl -MConfig -e 'print join(" ", @Config{qw(ccflags optimize cccdlflags)}, "-I$$Config{archlib}/CORE")')
-PERL_LINK_FLAGS = $(shell perl -MConfig -e 'print $$Config{lddlflags}')
-PERL_OUT = _perl
-PERL_SWIG = $(SWIG) -perl5 -outdir $(PERL_OUT)
-PERL_CC = $(CC) $(PERL_FLAGS)
-PERL_LD = $(CC) $(PERL_LINK_FLAGS)
-
-# -----------------------------------------------------------------------------
-# Python stuff
-# -----------------------------------------------------------------------------
-PY_FLAGS = -g -fPIC -Wall $(shell python-config --includes) -std=c++0x
-PY_LINK_FLAGS = -ltango -llog4tango -lpthread -lrt -ldl -lomniORB4 -lomniDynamic4 -lomnithread -lCOS4 -lzmq
-PY_OUT = _python
-PY_SWIG = $(SWIG) -python -outdir $(PY_OUT)
-PY_CC = $(CC) $(PY_FLAGS)
-PY_LD = $(LD) $(PY_LINK_FLAGS) -shared
-
-# -----------------------------------------------------------------------------
-# C# stuff
-# -----------------------------------------------------------------------------
-CSHARP_FLAGS = -fPIC
-CSHARP_OUT = _csharp
-CSHARP_SWIG = $(SWIG) -csharp -outdir $(CSHARP_OUT)
-CSHARP_CC = $(CC) $(CSHARP_FLAGS)
-CSHARP_LD = $(CC) -shared
-
-# -----------------------------------------------------------------------------
-# TCL stuff
-# -----------------------------------------------------------------------------
-TCL_FLAGS = -I/usr/include/tcl -fPIC
-TCL_OUT = _tcl
-TCL_SWIG = $(SWIG) -tcl -outdir $(TCL_OUT)
-TCL_CC = $(CC) $(TCL_FLAGS)
-TCL_LD = $(LD) -shared
-
-# -----------------------------------------------------------------------------
-# GO stuff
-# -----------------------------------------------------------------------------
-GO_FLAGS = -fPIC
-GO_OUT = _go
-GO_SWIG = $(SWIG) -go -intgosize 32 -outdir $(GO_OUT)
-GO_CC = $(CC) $(GO_FLAGS)
-GO_LD = $(CC) -shared
-
-# -----------------------------------------------------------------------------
-# commands
-# -----------------------------------------------------------------------------
-
-all: perl python csharp tcl
-
-common:
- mkdir -p $(COMMON_OUT)
-
-perl: common
- mkdir -p $(PERL_OUT)
- $(PERL_SWIG) -o $(PERL_OUT)/tango_wrap.cpp $(INTERFACE_FILE)
- $(PERL_CC) -c $(PERL_OUT)/tango_wrap.cpp -o $(PERL_OUT)/tango_wrap.o
- $(PERL_LD) $(COMMON_OUT)/tango_wrap.o -o $(PERL_OUT)/_Tango.so
-
-python: common
- mkdir -p $(PY_OUT)
- $(PY_SWIG) -o $(PY_OUT)/tango_wrap.cpp $(INTERFACE_FILE)
- $(PY_CC) -c $(PY_OUT)/tango_wrap.cpp -o $(PY_OUT)/tango_wrap.o
- $(PY_LD) $(PY_OUT)/tango_wrap.o -o $(PY_OUT)/_Tango.so
-
-csharp: common
- mkdir -p $(CSHARP_OUT)
- $(CSHARP_SWIG) -o $(CSHARP_OUT)/example_wrap.c $(INTERFACE_FILE)
- $(CSHARP_CC) -c $(CSHARP_OUT)/example_wrap.c -o $(CSHARP_OUT)/example_wrap.o
- $(CSHARP_LD) $(COMMON_OUT)/example.o $(CSHARP_OUT)/example_wrap.o -o $(CSHARP_OUT)/libexample.so
-
-tcl: common
- mkdir -p $(TCL_OUT)
- $(TCL_SWIG) -o $(TCL_OUT)/example_wrap.c $(INTERFACE_FILE)
- $(TCL_CC) -c $(TCL_OUT)/example_wrap.c -o $(TCL_OUT)/example_wrap.o
- $(TCL_LD) $(COMMON_OUT)/example.o $(TCL_OUT)/example_wrap.o -o $(TCL_OUT)/example.so
-
-go: common
- mkdir -p $(GO_OUT)
- $(GO_SWIG) -o $(GO_OUT)/example_wrap.c $(INTERFACE_FILE)
- $(GO_CC) -c $(GO_OUT)/example_wrap.c -o $(GO_OUT)/example_wrap.o $(GO_FLAGS)
- $(GO_LD) $(COMMON_OUT)/example.o $(GO_OUT)/example_wrap.o -o $(GO_OUT)/example.so
- 6g -o $(GO_OUT)/example.6 $(GO_OUT)/example.go
- 6c -I $(GOROOT)/pkg/linux_amd64 -o $(GO_OUT)/example_gc.6 $(GO_OUT)/example_gc.c
- pack grc $(GO_OUT)/example.a $(GO_OUT)/example.6 $(GO_OUT)/example_gc.6
-
-clean:
- rm -rf $(COMMON_OUT) $(PERL_OUT) $(PY_OUT) $(CSHARP_OUT) $(TCL_OUT) $(GO_OUT)
diff --git a/src/swig/deviceproxy.i b/src/swig/deviceproxy.i
deleted file mode 100644
index 357b25f..0000000
--- a/src/swig/deviceproxy.i
+++ /dev/null
@@ -1,224 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
- %{
- #include <tango.h>
- %}
-
-namespace Tango
-{
-
-class DeviceProxy: public Connection
-{
-public:
- %newobject black_box;
- %newobject command_list_query;
- %newobject get_attribute_list;
- %newobject get_attribute_config;
- %newobject get_attribute_ex;
- %newobject attribute_list_query;
- %newobject attribute_list_query_ex;
- %newobject polling_status;
-
- DeviceProxy();
- DeviceProxy(std::string &name, CORBA::ORB *orb=NULL);
- DeviceProxy(std::string &name, bool ch_access, CORBA::ORB *orb=NULL);
- DeviceProxy(const char *, bool ch_access, CORBA::ORB *orb=NULL);
- DeviceProxy(const char *, CORBA::ORB *orb=NULL);
-
- DeviceProxy(const DeviceProxy &);
- DeviceProxy & operator=(const DeviceProxy &);
- virtual ~DeviceProxy();
-
-//
-// general methods
-//
-
- virtual Tango::DeviceInfo const &info();
- virtual inline std::string dev_name() { return device_name; }
- virtual void parse_name(std::string &);
- virtual Tango::Database *get_device_db();
-
- virtual std::string status();
- virtual Tango::DevState state();
- virtual std::string adm_name();
- virtual std::string description();
- virtual std::string name();
- virtual std::string alias();
-
- int get_tango_lib_version();
-
- virtual int ping();
- virtual std::vector<std::string> *black_box(int);
-//
-// device methods
-//
- virtual Tango::CommandInfo command_query(std::string);
- virtual Tango::CommandInfoList *command_list_query();
-
- virtual Tango::DbDevImportInfo import_info();
-//
-// property methods
-//
- virtual void get_property(std::string&, Tango::DbData&);
- virtual void get_property(std::vector<std::string>&, Tango::DbData&);
- virtual void get_property(Tango::DbData&);
- virtual void put_property(Tango::DbData&);
- virtual void delete_property(std::string&);
- virtual void delete_property(std::vector<std::string>&);
- virtual void delete_property(Tango::DbData&);
- virtual void get_property_list(const std::string &,std::vector<std::string> &);
-//
-// attribute methods
-//
- virtual std::vector<std::string> *get_attribute_list(); /* MEMORY LEAK */
-
- virtual Tango::AttributeInfoList *get_attribute_config(std::vector<std::string>&);
- virtual Tango::AttributeInfoListEx *get_attribute_config_ex(std::vector<std::string>&);
- virtual Tango::AttributeInfoEx get_attribute_config(const std::string &);
-
- virtual Tango::AttributeInfoEx attribute_query(std::string name);
- virtual Tango::AttributeInfoList *attribute_list_query();
- virtual Tango::AttributeInfoListEx *attribute_list_query_ex();
-
- virtual void set_attribute_config(Tango::AttributeInfoList &);
- virtual void set_attribute_config(Tango::AttributeInfoListEx &);
-
- virtual Tango::DeviceAttribute read_attribute(std::string&);
- virtual Tango::DeviceAttribute read_attribute(const char *at);
- void read_attribute(const char *, Tango::DeviceAttribute &);
- void read_attribute(std::string &at, Tango::DeviceAttribute &da);
- virtual std::vector<Tango::DeviceAttribute> *read_attributes(std::vector<std::string>&);
-
- virtual void write_attribute(Tango::DeviceAttribute&);
- virtual void write_attributes(std::vector<Tango::DeviceAttribute>&);
-
- virtual Tango::DeviceAttribute write_read_attribute(Tango::DeviceAttribute &);
-
-//
-// history methods
-//
- virtual std::vector<Tango::DeviceDataHistory> *command_history(std::string &,int);
- virtual std::vector<Tango::DeviceDataHistory> *command_history(const char *na,int n);
-
- virtual std::vector<Tango::DeviceAttributeHistory> *attribute_history(std::string &,int);
- virtual std::vector<Tango::DeviceAttributeHistory> *attribute_history(const char *na,int n);
-//
-// Polling administration methods
-//
- virtual std::vector<std::string> *polling_status();
-
- virtual void poll_command(std::string &, int);
- virtual void poll_command(const char *na, int per);
- virtual void poll_attribute(std::string &, int);
- virtual void poll_attribute(const char *na, int per);
-
- virtual int get_command_poll_period(std::string &);
- virtual int get_command_poll_period(const char *na)
- {std::string tmp(na);return get_command_poll_period(tmp);}
- virtual int get_attribute_poll_period(std::string &);
- virtual int get_attribute_poll_period(const char *na)
- {std::string tmp(na);return get_attribute_poll_period(tmp);}
-
- virtual bool is_command_polled(std::string &);
- virtual bool is_command_polled(const char *na);
- virtual bool is_attribute_polled(std::string &);
- virtual bool is_attribute_polled(const char *na);
-
- virtual void stop_poll_command(std::string &);
- virtual void stop_poll_command(const char *na);
- virtual void stop_poll_attribute(std::string &);
- virtual void stop_poll_attribute(const char *na);
-//
-// Asynchronous methods
-//
- virtual long read_attribute_asynch(const char *na);
- virtual long read_attribute_asynch(std::string &att_name);
- virtual long read_attributes_asynch(std::vector <std::string> &);
-
- virtual std::vector<Tango::DeviceAttribute> *read_attributes_reply(long);
- virtual std::vector<Tango::DeviceAttribute> *read_attributes_reply(long,long);
- virtual Tango::DeviceAttribute *read_attribute_reply(long);
- virtual Tango::DeviceAttribute *read_attribute_reply(long,long);
-
- virtual long write_attribute_asynch(Tango::DeviceAttribute &);
- virtual long write_attributes_asynch(std::vector<Tango::DeviceAttribute> &);
-
- virtual void write_attributes_reply(long);
- virtual void write_attributes_reply(long,long);
- virtual void write_attribute_reply(long id) {write_attributes_reply(id);}
- virtual void write_attribute_reply(long to,long id) {write_attributes_reply(to,id);}
-
- virtual long pending_asynch_call(Tango::asyn_req_type req)
- {if (req == POLLING)return pasyn_ctr;
- else if (req==CALL_BACK) return pasyn_cb_ctr;
- else return (pasyn_ctr + pasyn_cb_ctr);}
-
- virtual void read_attributes_asynch(std::vector<std::string> &, Tango::CallBack &);
- virtual void read_attribute_asynch(const char *na, Tango::CallBack &cb);
- virtual void read_attribute_asynch(std::string &, Tango::CallBack &);
-
- virtual void write_attribute_asynch(Tango::DeviceAttribute &, Tango::CallBack &);
- virtual void write_attributes_asynch(std::vector<Tango::DeviceAttribute> &, Tango::CallBack &);
-//
-// Logging administration methods
-//
-#ifdef TANGO_HAS_LOG4TANGO
- virtual void add_logging_target(const std::string &target_type_name);
- virtual void add_logging_target(const char *target_type_name)
- {add_logging_target(std::string(target_type_name));}
-
- virtual void remove_logging_target(const std::string &target_type_name);
- virtual void remove_logging_target(const char *target_type_name)
- {remove_logging_target(std::string(target_type_name));}
-
- virtual std::vector<std::string> get_logging_target (void);
- virtual int get_logging_level (void);
- virtual void set_logging_level (int level);
-#endif // TANGO_HAS_LOG4TANGO
-//
-// Event methods
-//
- virtual int subscribe_event(const std::string &attr_name, Tango::EventType event, Tango::CallBack *,
- const std::vector<std::string> &filters); // For compatibility with Tango < 8
- virtual int subscribe_event(const std::string &attr_name, Tango::EventType event, Tango::CallBack *,
- const std::vector<std::string> &filters, bool stateless); // For compatibility with Tango < 8
- virtual int subscribe_event(const std::string &attr_name, Tango::EventType event, int event_queue_size,
- const std::vector<std::string> &filters, bool stateless = false); // For compatibility with Tango < 8
-
- virtual int subscribe_event(const std::string &attr_name, Tango::EventType event, Tango::CallBack *);
- virtual int subscribe_event(const std::string &attr_name, Tango::EventType event, Tango::CallBack *,bool stateless);
- virtual int subscribe_event(const std::string &attr_name, Tango::EventType event, int event_queue_size,bool stateless = false);
-
- virtual void unsubscribe_event(int event_id);
-//
-// Methods to access data in event queues
-//
- virtual void get_events (int event_id, Tango::EventDataList &event_list);
- virtual void get_events (int event_id, Tango::AttrConfEventDataList &event_list);
- virtual void get_events (int event_id, Tango::DataReadyEventDataList &event_list);
- virtual void get_events (int event_id, Tango::CallBack *cb);
- virtual int event_queue_size(int event_id);
- virtual Tango::TimeVal get_last_event_date(int event_id);
- virtual bool is_event_queue_empty(int event_id);
-
-//
-// Locking methods
-//
- virtual void lock(int lock_validity=DEFAULT_LOCK_VALIDITY);
- virtual void unlock(bool force=false);
- virtual std::string locking_status();
- virtual bool is_locked();
- virtual bool is_locked_by_me();
- virtual bool get_locker(Tango::LockerInfo &);
-};
-
-}
\ No newline at end of file
diff --git a/src/swig/tango.i b/src/swig/tango.i
deleted file mode 100644
index 8e8b50e..0000000
--- a/src/swig/tango.i
+++ /dev/null
@@ -1,21 +0,0 @@
-/******************************************************************************
- This file is part of PyTango (http://www.tinyurl.com/PyTango)
-
- Copyright 2006-2012 CELLS / ALBA Synchrotron, Bellaterra, Spain
- Copyright 2013-2014 European Synchrotron Radiation Facility, Grenoble, France
-
- Distributed under the terms of the GNU Lesser General Public License,
- either version 3 of the License, or (at your option) any later version.
- See LICENSE.txt for more info.
-******************************************************************************/
-
-%module Tango
-
-%include "std_string.i"
-%include "std_vector.i"
-
-namespace std {
- %template(vector_string) vector<string>;
-};
-
-%include "deviceproxy.i"
\ No newline at end of file
diff --git a/src/boost/python/__init__.py b/tango/__init__.py
similarity index 100%
rename from src/boost/python/__init__.py
rename to tango/__init__.py
diff --git a/src/boost/python/api_util.py b/tango/api_util.py
similarity index 100%
rename from src/boost/python/api_util.py
rename to tango/api_util.py
diff --git a/src/boost/python/asyncio.py b/tango/asyncio.py
similarity index 100%
rename from src/boost/python/asyncio.py
rename to tango/asyncio.py
diff --git a/src/boost/python/asyncio_tools.py b/tango/asyncio_tools.py
similarity index 100%
rename from src/boost/python/asyncio_tools.py
rename to tango/asyncio_tools.py
diff --git a/src/boost/python/attr_data.py b/tango/attr_data.py
similarity index 100%
rename from src/boost/python/attr_data.py
rename to tango/attr_data.py
diff --git a/src/boost/python/attribute_proxy.py b/tango/attribute_proxy.py
similarity index 100%
rename from src/boost/python/attribute_proxy.py
rename to tango/attribute_proxy.py
diff --git a/src/boost/python/auto_monitor.py b/tango/auto_monitor.py
similarity index 100%
rename from src/boost/python/auto_monitor.py
rename to tango/auto_monitor.py
diff --git a/src/boost/python/base_types.py b/tango/base_types.py
similarity index 100%
rename from src/boost/python/base_types.py
rename to tango/base_types.py
diff --git a/src/boost/python/callback.py b/tango/callback.py
similarity index 100%
rename from src/boost/python/callback.py
rename to tango/callback.py
diff --git a/src/boost/python/client.py b/tango/client.py
similarity index 100%
rename from src/boost/python/client.py
rename to tango/client.py
diff --git a/src/boost/python/codec.py b/tango/codec.py
similarity index 100%
rename from src/boost/python/codec.py
rename to tango/codec.py
diff --git a/src/boost/python/connection.py b/tango/connection.py
similarity index 100%
rename from src/boost/python/connection.py
rename to tango/connection.py
diff --git a/src/boost/python/databaseds/DataBase.xmi b/tango/databaseds/DataBase.xmi
similarity index 100%
rename from src/boost/python/databaseds/DataBase.xmi
rename to tango/databaseds/DataBase.xmi
diff --git a/src/boost/python/databaseds/DataBaseds b/tango/databaseds/DataBaseds
similarity index 100%
rename from src/boost/python/databaseds/DataBaseds
rename to tango/databaseds/DataBaseds
diff --git a/src/boost/python/databaseds/__init__.py b/tango/databaseds/__init__.py
similarity index 100%
rename from src/boost/python/databaseds/__init__.py
rename to tango/databaseds/__init__.py
diff --git a/src/boost/python/databaseds/create_db.sql b/tango/databaseds/create_db.sql
similarity index 100%
rename from src/boost/python/databaseds/create_db.sql
rename to tango/databaseds/create_db.sql
diff --git a/src/boost/python/databaseds/create_db_tables.sql b/tango/databaseds/create_db_tables.sql
similarity index 100%
rename from src/boost/python/databaseds/create_db_tables.sql
rename to tango/databaseds/create_db_tables.sql
diff --git a/src/boost/python/databaseds/database.py b/tango/databaseds/database.py
similarity index 100%
rename from src/boost/python/databaseds/database.py
rename to tango/databaseds/database.py
diff --git a/src/boost/python/databaseds/db_access/__init__.py b/tango/databaseds/db_access/__init__.py
similarity index 100%
rename from src/boost/python/databaseds/db_access/__init__.py
rename to tango/databaseds/db_access/__init__.py
diff --git a/src/boost/python/databaseds/db_access/beacon.py b/tango/databaseds/db_access/beacon.py
similarity index 100%
rename from src/boost/python/databaseds/db_access/beacon.py
rename to tango/databaseds/db_access/beacon.py
diff --git a/src/boost/python/databaseds/db_access/sqlite3.py b/tango/databaseds/db_access/sqlite3.py
similarity index 100%
rename from src/boost/python/databaseds/db_access/sqlite3.py
rename to tango/databaseds/db_access/sqlite3.py
diff --git a/src/boost/python/databaseds/db_errors.py b/tango/databaseds/db_errors.py
similarity index 100%
rename from src/boost/python/databaseds/db_errors.py
rename to tango/databaseds/db_errors.py
diff --git a/src/boost/python/databaseds/mysql2sqlite.sh b/tango/databaseds/mysql2sqlite.sh
similarity index 100%
rename from src/boost/python/databaseds/mysql2sqlite.sh
rename to tango/databaseds/mysql2sqlite.sh
diff --git a/src/boost/python/db.py b/tango/db.py
similarity index 100%
rename from src/boost/python/db.py
rename to tango/db.py
diff --git a/src/boost/python/device_attribute.py b/tango/device_attribute.py
similarity index 100%
rename from src/boost/python/device_attribute.py
rename to tango/device_attribute.py
diff --git a/src/boost/python/device_class.py b/tango/device_class.py
similarity index 100%
rename from src/boost/python/device_class.py
rename to tango/device_class.py
diff --git a/src/boost/python/device_data.py b/tango/device_data.py
similarity index 100%
rename from src/boost/python/device_data.py
rename to tango/device_data.py
diff --git a/src/boost/python/device_proxy.py b/tango/device_proxy.py
similarity index 100%
rename from src/boost/python/device_proxy.py
rename to tango/device_proxy.py
diff --git a/src/boost/python/device_server.py b/tango/device_server.py
similarity index 100%
rename from src/boost/python/device_server.py
rename to tango/device_server.py
diff --git a/src/boost/python/encoded_attribute.py b/tango/encoded_attribute.py
similarity index 100%
rename from src/boost/python/encoded_attribute.py
rename to tango/encoded_attribute.py
diff --git a/src/boost/python/exception.py b/tango/exception.py
similarity index 100%
rename from src/boost/python/exception.py
rename to tango/exception.py
diff --git a/src/boost/python/futures.py b/tango/futures.py
similarity index 100%
rename from src/boost/python/futures.py
rename to tango/futures.py
diff --git a/src/boost/python/gevent.py b/tango/gevent.py
similarity index 100%
rename from src/boost/python/gevent.py
rename to tango/gevent.py
diff --git a/src/boost/python/globals.py b/tango/globals.py
similarity index 100%
rename from src/boost/python/globals.py
rename to tango/globals.py
diff --git a/src/boost/python/green.py b/tango/green.py
similarity index 100%
rename from src/boost/python/green.py
rename to tango/green.py
diff --git a/src/boost/python/group.py b/tango/group.py
similarity index 100%
rename from src/boost/python/group.py
rename to tango/group.py
diff --git a/src/boost/python/group_reply.py b/tango/group_reply.py
similarity index 100%
rename from src/boost/python/group_reply.py
rename to tango/group_reply.py
diff --git a/src/boost/python/group_reply_list.py b/tango/group_reply_list.py
similarity index 100%
rename from src/boost/python/group_reply_list.py
rename to tango/group_reply_list.py
diff --git a/src/boost/python/log4tango.py b/tango/log4tango.py
similarity index 100%
rename from src/boost/python/log4tango.py
rename to tango/log4tango.py
diff --git a/src/boost/python/pipe.py b/tango/pipe.py
similarity index 100%
rename from src/boost/python/pipe.py
rename to tango/pipe.py
diff --git a/src/boost/python/pipe_data.py b/tango/pipe_data.py
similarity index 100%
rename from src/boost/python/pipe_data.py
rename to tango/pipe_data.py
diff --git a/src/boost/python/pytango_init.py b/tango/pytango_init.py
similarity index 100%
rename from src/boost/python/pytango_init.py
rename to tango/pytango_init.py
diff --git a/src/boost/python/pytango_pprint.py b/tango/pytango_pprint.py
similarity index 100%
rename from src/boost/python/pytango_pprint.py
rename to tango/pytango_pprint.py
diff --git a/src/boost/python/pyutil.py b/tango/pyutil.py
similarity index 100%
rename from src/boost/python/pyutil.py
rename to tango/pyutil.py
diff --git a/src/boost/python/release.py b/tango/release.py
similarity index 100%
rename from src/boost/python/release.py
rename to tango/release.py
diff --git a/src/boost/python/server.py b/tango/server.py
similarity index 100%
rename from src/boost/python/server.py
rename to tango/server.py
diff --git a/src/boost/python/tango_asyncio.py b/tango/tango_asyncio.py
similarity index 100%
rename from src/boost/python/tango_asyncio.py
rename to tango/tango_asyncio.py
diff --git a/src/boost/python/tango_futures.py b/tango/tango_futures.py
similarity index 100%
rename from src/boost/python/tango_futures.py
rename to tango/tango_futures.py
diff --git a/src/boost/python/tango_gevent.py b/tango/tango_gevent.py
similarity index 100%
rename from src/boost/python/tango_gevent.py
rename to tango/tango_gevent.py
diff --git a/src/boost/python/tango_numpy.py b/tango/tango_numpy.py
similarity index 100%
rename from src/boost/python/tango_numpy.py
rename to tango/tango_numpy.py
diff --git a/src/boost/python/time_val.py b/tango/time_val.py
similarity index 100%
rename from src/boost/python/time_val.py
rename to tango/time_val.py
diff --git a/src/boost/python/utils.py b/tango/utils.py
similarity index 100%
rename from src/boost/python/utils.py
rename to tango/utils.py
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git
More information about the debian-science-commits
mailing list