-- fix: bongo-queuetool so that it works right
-- fix: some calls in libbongo were no longer needed
This commit is contained in:
@@ -2,7 +2,7 @@ include_directories(AFTER ${PYTHON_INCLUDE_PATH})
|
||||
|
||||
python_add_module(libs
|
||||
cal.c
|
||||
calcmd.c
|
||||
#calcmd.c
|
||||
libs.c
|
||||
msgapi.c
|
||||
msgapi-defs.c
|
||||
@@ -40,3 +40,4 @@ target_link_libraries(bootstrap
|
||||
)
|
||||
|
||||
install(TARGETS libs bootstrap DESTINATION ${PYTHON_SITEPACKAGES_PATH}/libbongo/)
|
||||
install(FILES __init__.py __init__.pyc DESTINATION ${PYTHON_SITEPACKAGES_PATH}/libbongo/)
|
||||
|
||||
@@ -38,8 +38,11 @@ extern "C" {
|
||||
static PyMethodDef ModuleMethods[] = { {NULL} };
|
||||
|
||||
/* Pull in the methods from the bindings */
|
||||
#if 0
|
||||
// we don't yet build calcmd
|
||||
extern PyMethodDef CalCmdMethods[];
|
||||
extern EnumItemDef CalCmdEnums[];
|
||||
#endif
|
||||
extern PyMethodDef CalMethods[];
|
||||
extern PyMethodDef MdbMethods[];
|
||||
extern EnumItemDef MdbEnums[];
|
||||
@@ -56,12 +59,6 @@ initlibs()
|
||||
char dbfdir[PATH_MAX];
|
||||
|
||||
/* Initialize the various bongo libraries */
|
||||
if (!MemoryManagerOpen((unsigned char*)"pybongo")) {
|
||||
PyErr_SetString(PyExc_ImportError,
|
||||
"bongo.libs error: MemoryManagerOpen() failed");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!ConnStartup(DEFAULT_CONNECTION_TIMEOUT)) {
|
||||
PyErr_SetString(PyExc_ImportError,
|
||||
"bongo.libs error: ConnStartup() failed");
|
||||
@@ -99,7 +96,7 @@ initlibs()
|
||||
|
||||
/* Add the Bongo libs */
|
||||
AddLibrary(module, "cal", CalMethods, NULL);
|
||||
AddLibrary(module, "calcmd", CalCmdMethods, CalCmdEnums);
|
||||
//AddLibrary(module, "calcmd", CalCmdMethods, CalCmdEnums);
|
||||
AddLibrary(module, "msgapi", MsgApiMethods, NULL);
|
||||
AddLibrary(module, "streamio", StreamIOMethods, NULL);
|
||||
AddLibrary(module, "bongojson", BongoJsonMethods, NULL);
|
||||
|
||||
Reference in New Issue
Block a user