From 690a81e5d40661059e800bfff30dcd611ecc80da Mon Sep 17 00:00:00 2001
From: Alexey Stratulat <--local>
Date: Fri, 2 Aug 2019 12:25:48 +0700
Subject: [PATCH] [*] Renaming a project from libdap_server_core to
libDapServerCore.
---
CMakeLists.txt | 2 +-
include/libdap-server-core-python.h | 6 ++----
src/libdap-server-core-python.c | 6 +++---
test/test.py | 2 +-
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a66d475..31c5bfe7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(dap_server_core_python_module C)
+project(DapServerCore C)
cmake_minimum_required(VERSION 2.8)
set(CMAKE_VERBOSE_MAKEFILE ON)
diff --git a/include/libdap-server-core-python.h b/include/libdap-server-core-python.h
index cc71a4db..313bdf77 100644
--- a/include/libdap-server-core-python.h
+++ b/include/libdap-server-core-python.h
@@ -9,8 +9,6 @@
extern "C" {
#endif
-dap_server_t *t_server;
-
typedef struct PyDapServer {
PyObject_HEAD
dap_server_t *t_server;
@@ -58,14 +56,14 @@ static PyMethodDef DapServerCorePythonMethods[] = {
static struct PyModuleDef dapservercorepythonmodule = {
PyModuleDef_HEAD_INIT,
- "libdap_server_core_python_module", /* name of module */
+ "libDapServerCore", /* name of module */
NULL, /* module documentation, may be NULL */
-1, /* size of per-interpreter state of the module,
or -1 if the module keeps state in global variables. */
DapServerCorePythonMethods
};
-PyMODINIT_FUNC PyInit_libdap_server_core_python_module(void);
+PyMODINIT_FUNC PyInit_libDapServerCore(void);
diff --git a/src/libdap-server-core-python.c b/src/libdap-server-core-python.c
index fed7b846..a067ef37 100644
--- a/src/libdap-server-core-python.c
+++ b/src/libdap-server-core-python.c
@@ -47,7 +47,7 @@ static PyObject *dap_server_core_listen(PyObject *self, PyObject *args){
return Py_BuildValue("O", obj);
}
-PyMODINIT_FUNC PyInit_libdap_server_core_python_module(void){
+PyMODINIT_FUNC PyInit_libDapServerCore(void){
dapServer_dapServerType.tp_new = PyType_GenericNew;
if (PyType_Ready(&dapServer_dapServerType) < 0)
return NULL;
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
}
/* Add a built-in module, before Py_Initialize */
- PyImport_AppendInittab("libdap_server_core_python_module", PyInit_libdap_server_core_python_module);
+ PyImport_AppendInittab("libDapServerCore", PyInit_libDapServerCore);
/* Pass argv[0] to the Python interpreter */
Py_SetProgramName(program);
@@ -73,7 +73,7 @@ int main(int argc, char **argv) {
/* Optionally import the module; alternatively,
import can be deferred until the embedded script
imports it. */
- PyImport_ImportModule("libdap_server_core_python_module");
+ PyImport_ImportModule("libDapServerCore");
PyMem_RawFree(program);
return 0;
diff --git a/test/test.py b/test/test.py
index 90bd524e..2780abb1 100644
--- a/test/test.py
+++ b/test/test.py
@@ -1,4 +1,4 @@
-import libdap_server_core_python_module as server
+import libDapServerCore as server
print ("Start wrapping libdap server core python module")
res_i = server.init(1, 0)
--
GitLab