[APIS-842] 11.0 Driver Release - Python (#19)

* [APIS-842] 11.0 Driver Release - Python

* [APIS-842] Include openssl library path for Linux

Author: kisoo-han

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "cci-src"]
 	path = cci-src
 	url = [email protected]:CUBRID/cubrid-cci.git
+	branch = develop

build_cci.sh

@@ -8,8 +8,6 @@ fi
 
 cd cci-src
 chmod +x configure
-chmod +x external/libregex38a/configure
-chmod +x external/libregex38a/install-sh
 if [ "$1" = 'x86' ];then
   ./configure 
 else

cci-src

@@ -4108,7 +4108,7 @@ PyTypeObject _cubrid_CursorObject_type = {
   0,				/* tp_free */
 };
 
-#define _CUBRID_VERSION_	"10.2.0.0002"
+#define _CUBRID_VERSION_	"11.0.0.0001"
 static char _cubrid_doc[] = "CUBRID API Module for Python";
 
 #if PY_MAJOR_VERSION >= 3

python_cubrid.c

@@ -10,7 +10,7 @@
 else:
     setup_file = "setup_2.py"
 
-version = "10.2.0.0002"
+version = "11.0.0.0001"
 
 #os.system(setup_file)
 setup_fh = open(setup_file)

setup.py

@@ -64,10 +64,10 @@ def get_script_dir():
 
     if arch_type == 'x86':
         lnk_dir = os.path.join(script_dir, "cci-src\\win\\cas_cci\\Win32\\Release")
-        lnk_dir_ex = os.path.join(script_dir, "cci-src\\win\\external\\lib")
+        lnk_dir_ex = os.path.join(script_dir, "cci-src\\win\\external\\openssl\\lib_v140")
     else:
         lnk_dir = os.path.join(script_dir, "cci-src\\win\\cas_cci\\x64\\Release")
-        lnk_dir_ex = os.path.join(script_dir, "cci-src\\win\\external\\lib64")
+        lnk_dir_ex = os.path.join(script_dir, "cci-src\\win\\external\\openssl\\lib64_v140")
 
 #elif os_type == 'Linux':
 else:
@@ -80,8 +80,10 @@ def get_script_dir():
 
     if arch_type == 'x86':
         lnk_dir = os.path.join(script_dir, "cci-src/cci/.libs")
+        lnk_dir_ex = os.path.join(script_dir, "cci-src/external/openssl/lib")
     else:
         lnk_dir = os.path.join(script_dir, "cci-src/cci/.libs")
+        lnk_dir_ex = os.path.join(script_dir, "cci-src/external/openssl/lib")
 
 
 # set ext_modules
@@ -93,8 +95,10 @@ def get_script_dir():
                 name="_cubrid",
                 extra_link_args=["/NODEFAULTLIB:libcmt"],
                 library_dirs=[lnk_dir, lnk_dir_ex],
-                libraries=["cas_cci", "libregex38a",
-                           "ws2_32", "oleaut32", "advapi32"],
+                libraries=["cas_cci",
+                           "ws2_32", "oleaut32", "advapi32",
+                           "libssl", "libcrypto",
+                           "gdi32", "user32"],
                 include_dirs=[inc_dir_base, inc_dir_cci, inc_dir_broker, inc_dir_compat],
                 sources=['python_cubrid.c'],
             )
@@ -111,7 +115,8 @@ def get_script_dir():
                 name="_cubrid",
                 include_dirs=[inc_dir_base, inc_dir_cci, inc_dir_broker, inc_dir_compat],
                 sources=['python_cubrid.c'],
-                libraries=["pthread", "stdc++"],
+                library_dirs=[lnk_dir, lnk_dir_ex],
+                libraries=["pthread", "stdc++", "ssl", "crypto"],
                 extra_objects=[cci_static_lib]
             )
         ]
@@ -135,7 +140,7 @@ def get_script_dir():
 # Install CUBRID-Python driver.
 setup(
     name="CUBRID-Python",
-    version="10.2.0.0002",
+    version="11.0.0.0001",
     description="Python interface to CUBRID",
     long_description=\
             "Python interface to CUBRID conforming to the python DB API 2.0 "

setup_2.py

@@ -64,10 +64,10 @@ def get_script_dir():
 
     if arch_type == 'x86':
         lnk_dir = os.path.join(script_dir, "cci-src\\win\\cas_cci\\Win32\\Release")
-        lnk_dir_ex = os.path.join(script_dir, "cci-src\\win\\external\\lib")
+        lnk_dir_ex = os.path.join(script_dir, "cci-src\\win\\external\\openssl\\lib_v140")
     else:
         lnk_dir = os.path.join(script_dir, "cci-src\\win\\cas_cci\\x64\\Release")
-        lnk_dir_ex = os.path.join(script_dir, "cci-src\\win\\external\\lib64")
+        lnk_dir_ex = os.path.join(script_dir, "cci-src\\win\\external\\openssl\\lib64_v140")
 
 #elif os_type == 'Linux':
 else:
@@ -80,8 +80,10 @@ def get_script_dir():
 
     if arch_type == 'x86':
         lnk_dir = os.path.join(script_dir, "cci-src/cci/.libs")
+        lnk_dir_ex = os.path.join(script_dir, "cci-src/external/openssl/lib")
     else:
         lnk_dir = os.path.join(script_dir, "cci-src/cci/.libs")
+        lnk_dir_ex = os.path.join(script_dir, "cci-src/external/openssl/lib")
 
 
 # set ext_modules
@@ -93,8 +95,10 @@ def get_script_dir():
                 name="_cubrid",
                 extra_link_args=["/NODEFAULTLIB:libcmt"],
                 library_dirs=[lnk_dir, lnk_dir_ex],
-                libraries=["cas_cci", "libregex38a",
-                           "ws2_32", "oleaut32", "advapi32"],
+                libraries=["cas_cci",
+                           "ws2_32", "oleaut32", "advapi32",
+                           "libssl", "libcrypto",
+                           "gdi32", "user32"],
                 include_dirs=[inc_dir_base, inc_dir_cci, inc_dir_broker, inc_dir_compat],
                 sources=['python_cubrid.c'],
             )
@@ -111,7 +115,8 @@ def get_script_dir():
                 name="_cubrid",
                 include_dirs=[inc_dir_base, inc_dir_cci, inc_dir_broker, inc_dir_compat],
                 sources=['python_cubrid.c'],
-                libraries=["pthread", "stdc++"],
+                library_dirs=[lnk_dir, lnk_dir_ex],
+                libraries=["pthread", "stdc++", "ssl", "crypto"],
                 extra_objects=[cci_static_lib]
             )
         ]
@@ -132,7 +137,7 @@ def get_script_dir():
 # Install CUBRID-Python driver.
 setup(
     name="CUBRID-Python",
-    version="10.2.0.0002",
+    version="11.0.0.0001",
     description="Python interface to CUBRID",
     long_description=\
             "Python interface to CUBRID conforming to the python DB API 2.0 "