Merge pull request #54 from markdirish/v2.0

V2.0
wankdanker · Apr 5, 2019 · 9929caa · 9929caa
2 parents dfa40e3 + bd0a2e3
commit 9929caa
Show file tree

Hide file tree

Showing 143 changed files with 7,521 additions and 9,449 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = { "extends": "airbnb-base" };
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,9 @@ a.out
 build
 node_modules
 deps
-.idea
+.idea
+sandbox
+core
+oldtest
+.env
+.vscode/
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/binding.gyp b/binding.gyp
@@ -1,20 +1,18 @@
 {
   'targets' : [
     {
-      'target_name' : 'odbc_bindings',
+      'target_name' : 'odbc',
       'sources' : [ 
         'src/odbc.cpp',
         'src/odbc_connection.cpp',
         'src/odbc_statement.cpp',
-        'src/odbc_result.cpp',
         'src/dynodbc.cpp'
       ],
-      'cflags' : ['-Wall', '-Wextra', '-Wno-unused-parameter'],
+      'cflags' : ['-Wall', '-Wextra', '-Wno-unused-parameter', '-DNAPI_DISABLE_CPP_EXCEPTIONS'],
       'include_dirs': [
-        "<!(node -e \"require('nan')\")"
+        '<!@(node -p "require(\'node-addon-api\').include")'
       ],
       'defines' : [
-        'UNICODE'
       ],
       'conditions' : [
         [ 'OS == "linux"', {
@@ -50,12 +48,13 @@
           'conditions': [
              [ '"<(os_name)"=="OS400"', {
                'ldflags': [
-                  '-Wl,-brtl,-bnoquiet,-blibpath:/QOpenSys/pkgs/lib,-lodbc'
-                ]
+                  '-Wl,-brtl,-blibpath:/QOpenSys/pkgs/lib,-lodbc'
+                ],
+                'cflags' : ['-std=c++0x', '-DNAPI_DISABLE_CPP_EXCEPTIONS', '-Wall', '-Wextra', '-Wno-unused-parameter', '-I/QOpenSys/usr/include', '-I/QOpenSys/pkgs/include']
              }]
           ]
         }]
       ]
     }
   ]
-}
+}
diff --git a/examples/describe.js b/examples/describe.js
diff --git a/examples/params.js b/examples/params.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,9 @@ a.out @@
     build
     node_modules
     deps
-    .idea
+    .idea
+    sandbox
+    core
+    oldtest
+    .env
+    .vscode/