Merge pull request #43 from Bigous/master

Build with NaN
oracle · May 26, 2015 · e55a108 · e55a108
2 parents 250ef9c + b3eec33
commit e55a108
Show file tree

Hide file tree

Showing 10 changed files with 706 additions and 716 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -79,36 +79,87 @@
         }
       }
     ],
-    ["OS=='win'", {
-      "variables" : {
-        "oci_lib_dir%": "<!(IF DEFINED OCI_LIB_DIR (echo %OCI_LIB_DIR%) ELSE (echo C:\oracle\instantclient\sdk\lib\msvc))",
-        "oci_inc_dir%": "<!(IF DEFINED OCI_INC_DIR (echo %OCI_INC_DIR%) ELSE (echo C:\oracle\instantclient\sdk\include))",
-      },
-      "configurations" : {
-        "Release" : {
-          "msvs_settings": {
-            "VCCLCompilerTool" : {
-              "RuntimeLibrary" : "2"
+    [
+      "OS=='win'", {
+        "variables" : {
+          "oci_lib_dir%": "<!(IF DEFINED OCI_LIB_DIR (echo %OCI_LIB_DIR%) ELSE (echo C:\oracle\instantclient\sdk\lib\msvc))", 
+          "oci_inc_dir%": "<!(IF DEFINED OCI_INC_DIR (echo %OCI_INC_DIR%) ELSE (echo C:\oracle\instantclient\sdk\include))", 
+        },
+        "link_settings": {
+             "libraries": [
+                 "-loci",
+             ]
+         },
+        "configurations" : {
+          "Release" : {
+            "msvs_settings": {
+              "VCCLCompilerTool": {
+                "RuntimeLibrary": 0,
+                "Optimization": 3,
+                "FavorSizeOrSpeed": 1,
+                "InlineFunctionExpansion": 2,
+                "WholeProgramOptimization": "true",
+                "OmitFramePointers": "true",
+                "EnableFunctionLevelLinking": "true",
+                "EnableIntrinsicFunctions": "true",
+                "RuntimeTypeInfo": "false",
+                "PreprocessorDefinitions": [
+                  "WIN32_LEAN_AND_MEAN"
+                ],
+                "ExceptionHandling": "0",
+                "AdditionalOptions": [
+                  "/EHsc"
+                ]
+              },
+              "VCLibrarianTool": {
+                "AdditionalOptions": [
+                    "/LTCG"
+                ]
+              },
+              "VCLinkerTool": {
+                "LinkTimeCodeGeneration": 1,
+                "OptimizeReferences": 2,
+                "EnableCOMDATFolding": 2,
+                "LinkIncremental": 1,
+                "AdditionalLibraryDirectories": [
+                    "<(oci_lib_dir)"
+                ]
+              }
             }
           }
         },
-        "Debug" : {
-          "msvs_settings": {
-            "VCCLCompilerTool" : {
-              "RuntimeLibrary" : "3"
-            }
+          "Debug": {
+              "msvs_settings": {
+                  "VCCLCompilerTool": {
+                    "PreprocessorDefinitions": [
+                      "WIN32_LEAN_AND_MEAN"
+                    ],
+                    "ExceptionHandling": "0",
+                    "AdditionalOptions": [
+                        "/EHsc"
+                    ]
+                  },
+                  "VCLibrarianTool": {
+                      "AdditionalOptions": [
+                          "/LTCG"
+                      ]
+                  },
+                  "VCLinkerTool": {
+                      "LinkTimeCodeGeneration": 1,
+                      "LinkIncremental": 1,
+                      "AdditionalLibraryDirectories": [
+                          "<(oci_lib_dir)"
+                      ]
+                  }
+              }
           }
-        }
-      },
-      "cflags"        : ['-fexceptions -EHsc'],
-      "cflags_cc"     : ['-fexceptions -EHsc'],
-      "link_settings" : { "libraries" : ['<(oci_lib_dir)\oci.lib'] }
-    }
+      }
     ],
   ],
   "include_dirs"  : [ "<(oci_inc_dir)",
                       "src/dpi/src/",
-                      "src/dpi/include/"
+                      "src/dpi/include/",
+                      "<!(node -e \"require('nan')\")"
     ],
   }
   ]

diff --git a/examples/webapp.js b/examples/webapp.js
@@ -135,7 +135,7 @@ oracledb.createPool (
 function handleError(response, text, err)
 {
   if (err) {
-    text += err.message
+    text += err.message;
   }
   console.error(text);
   response.write("<p>Error: " + text + "</p>");

diff --git a/package.json b/package.json
@@ -1,29 +1,50 @@
 {
-    "name" : "oracledb",
-    "version" : "0.5.0",
-    "description" : "Oracle Database driver by Oracle Corp.",
-    "license" : "Apache 2.0",
-    "homepage": "http://www.oracle.com/technetwork/database/database-technologies/node_js/index.html",
-    "keywords" : [
-	"oracledb", "dboracle", "Node.js", "SQL", "PL/SQL", "connection", "connectivity", "OCI", "client", "plugin", "library", "driver", "extension", "binding", "interface", "adapter", "module", "DB", "official", "Database", "Oracle"
-    ],
-    "repository" : {
-	"type" : "git",
-	"url" : "git://github.com/oracle/node-oracledb.git"
-    },
-    "dependencies" : {
-    },
-    "engines" : {
-	"node" : ">=0.10.28 <0.11"
-    },
-    "engineStrict": true,
-    "maintainers" : [
-	{
-	    "name" : "Oracle Corp."
-	}
-    ],
-    "bugs" : {
-	"url" : "https://github.com/oracle/node-oracledb/issues"
-    },
-    "main" : "./index.js"
+  "name": "oracledb",
+  "version": "0.5.0",
+  "description": "Oracle Database driver by Oracle Corp.",
+  "license": "Apache 2.0",
+  "homepage": "http://www.oracle.com/technetwork/database/database-technologies/node_js/index.html",
+  "keywords": [
+    "oracledb",
+    "dboracle",
+    "Node.js",
+    "SQL",
+    "PL/SQL",
+    "connection",
+    "connectivity",
+    "OCI",
+    "client",
+    "plugin",
+    "library",
+    "driver",
+    "extension",
+    "binding",
+    "interface",
+    "adapter",
+    "module",
+    "DB",
+    "official",
+    "Database",
+    "Oracle"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/oracle/node-oracledb.git"
+  },
+  "dependencies": {
+    "nan": "^1.8.4"
+  },
+  "engines": {
+    "node": ">=0.10.28"
+  },
+  "engineStrict": true,
+  "maintainers": [
+    {
+      "name": "Oracle Corp."
+    }
+  ],
+  "bugs": {
+    "url": "https://github.com/oracle/node-oracledb/issues"
+  },
+  "main": "./index.js"
 }