Skip to content

Commit e55a108

Browse files
cjbjcjbj
committed
Merge pull request #43 from Bigous/master
Build with NaN
2 parents 250ef9c + b3eec33 commit e55a108

File tree

10 files changed

+706
-716
lines changed

10 files changed

+706
-716
lines changed

‎binding.gyp

Lines changed: 73 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -79,36 +79,87 @@
7979
}
8080
}
8181
],
82-
["OS=='win'", {
83-
"variables" : {
84-
"oci_lib_dir%": "<!(IF DEFINED OCI_LIB_DIR (echo %OCI_LIB_DIR%) ELSE (echo C:\oracle\instantclient\sdk\lib\msvc))",
85-
"oci_inc_dir%": "<!(IF DEFINED OCI_INC_DIR (echo %OCI_INC_DIR%) ELSE (echo C:\oracle\instantclient\sdk\include))",
86-
},
87-
"configurations" : {
88-
"Release" : {
89-
"msvs_settings": {
90-
"VCCLCompilerTool" : {
91-
"RuntimeLibrary" : "2"
82+
[
83+
"OS=='win'", {
84+
"variables" : {
85+
"oci_lib_dir%": "<!(IF DEFINED OCI_LIB_DIR (echo %OCI_LIB_DIR%) ELSE (echo C:\oracle\instantclient\sdk\lib\msvc))",
86+
"oci_inc_dir%": "<!(IF DEFINED OCI_INC_DIR (echo %OCI_INC_DIR%) ELSE (echo C:\oracle\instantclient\sdk\include))",
87+
},
88+
"link_settings": {
89+
"libraries": [
90+
"-loci",
91+
]
92+
},
93+
"configurations" : {
94+
"Release" : {
95+
"msvs_settings": {
96+
"VCCLCompilerTool": {
97+
"RuntimeLibrary": 0,
98+
"Optimization": 3,
99+
"FavorSizeOrSpeed": 1,
100+
"InlineFunctionExpansion": 2,
101+
"WholeProgramOptimization": "true",
102+
"OmitFramePointers": "true",
103+
"EnableFunctionLevelLinking": "true",
104+
"EnableIntrinsicFunctions": "true",
105+
"RuntimeTypeInfo": "false",
106+
"PreprocessorDefinitions": [
107+
"WIN32_LEAN_AND_MEAN"
108+
],
109+
"ExceptionHandling": "0",
110+
"AdditionalOptions": [
111+
"/EHsc"
112+
]
113+
},
114+
"VCLibrarianTool": {
115+
"AdditionalOptions": [
116+
"/LTCG"
117+
]
118+
},
119+
"VCLinkerTool": {
120+
"LinkTimeCodeGeneration": 1,
121+
"OptimizeReferences": 2,
122+
"EnableCOMDATFolding": 2,
123+
"LinkIncremental": 1,
124+
"AdditionalLibraryDirectories": [
125+
"<(oci_lib_dir)"
126+
]
127+
}
92128
}
93129
}
94130
},
95-
"Debug" : {
96-
"msvs_settings": {
97-
"VCCLCompilerTool" : {
98-
"RuntimeLibrary" : "3"
99-
}
131+
"Debug": {
132+
"msvs_settings": {
133+
"VCCLCompilerTool": {
134+
"PreprocessorDefinitions": [
135+
"WIN32_LEAN_AND_MEAN"
136+
],
137+
"ExceptionHandling": "0",
138+
"AdditionalOptions": [
139+
"/EHsc"
140+
]
141+
},
142+
"VCLibrarianTool": {
143+
"AdditionalOptions": [
144+
"/LTCG"
145+
]
146+
},
147+
"VCLinkerTool": {
148+
"LinkTimeCodeGeneration": 1,
149+
"LinkIncremental": 1,
150+
"AdditionalLibraryDirectories": [
151+
"<(oci_lib_dir)"
152+
]
153+
}
154+
}
100155
}
101-
}
102-
},
103-
"cflags" : ['-fexceptions -EHsc'],
104-
"cflags_cc" : ['-fexceptions -EHsc'],
105-
"link_settings" : { "libraries" : ['<(oci_lib_dir)\oci.lib'] }
106-
}
156+
}
107157
],
108158
],
109159
"include_dirs" : [ "<(oci_inc_dir)",
110160
"src/dpi/src/",
111-
"src/dpi/include/"
161+
"src/dpi/include/",
162+
"<!(node -e \"require('nan')\")"
112163
],
113164
}
114165
]

‎examples/webapp.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ oracledb.createPool (
135135
function handleError(response, text, err)
136136
{
137137
if (err) {
138-
text += err.message
138+
text += err.message;
139139
}
140140
console.error(text);
141141
response.write("<p>Error: " + text + "</p>");

‎package.json

Lines changed: 48 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,50 @@
11
{
2-
"name" : "oracledb",
3-
"version" : "0.5.0",
4-
"description" : "Oracle Database driver by Oracle Corp.",
5-
"license" : "Apache 2.0",
6-
"homepage": "http://www.oracle.com/technetwork/database/database-technologies/node_js/index.html",
7-
"keywords" : [
8-
"oracledb", "dboracle", "Node.js", "SQL", "PL/SQL", "connection", "connectivity", "OCI", "client", "plugin", "library", "driver", "extension", "binding", "interface", "adapter", "module", "DB", "official", "Database", "Oracle"
9-
],
10-
"repository" : {
11-
"type" : "git",
12-
"url" : "git://github.com/oracle/node-oracledb.git"
13-
},
14-
"dependencies" : {
15-
},
16-
"engines" : {
17-
"node" : ">=0.10.28 <0.11"
18-
},
19-
"engineStrict": true,
20-
"maintainers" : [
21-
{
22-
"name" : "Oracle Corp."
23-
}
24-
],
25-
"bugs" : {
26-
"url" : "https://github.com/oracle/node-oracledb/issues"
27-
},
28-
"main" : "./index.js"
2+
"name": "oracledb",
3+
"version": "0.5.0",
4+
"description": "Oracle Database driver by Oracle Corp.",
5+
"license": "Apache 2.0",
6+
"homepage": "http://www.oracle.com/technetwork/database/database-technologies/node_js/index.html",
7+
"keywords": [
8+
"oracledb",
9+
"dboracle",
10+
"Node.js",
11+
"SQL",
12+
"PL/SQL",
13+
"connection",
14+
"connectivity",
15+
"OCI",
16+
"client",
17+
"plugin",
18+
"library",
19+
"driver",
20+
"extension",
21+
"binding",
22+
"interface",
23+
"adapter",
24+
"module",
25+
"DB",
26+
"official",
27+
"Database",
28+
"Oracle"
29+
],
30+
"repository": {
31+
"type": "git",
32+
"url": "git://github.com/oracle/node-oracledb.git"
33+
},
34+
"dependencies": {
35+
"nan": "^1.8.4"
36+
},
37+
"engines": {
38+
"node": ">=0.10.28"
39+
},
40+
"engineStrict": true,
41+
"maintainers": [
42+
{
43+
"name": "Oracle Corp."
44+
}
45+
],
46+
"bugs": {
47+
"url": "https://github.com/oracle/node-oracledb/issues"
48+
},
49+
"main": "./index.js"
2950
}

0 commit comments

Comments
 (0)