Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build with NaN #43

Merged
merged 26 commits into from
May 26, 2015
Merged

Build with NaN #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4b174b4
Commit inicial da alteração para NaN
Bigous Mar 5, 2015
79a8685
Commit inicial da alteração para NaN
Bigous Mar 5, 2015
6ecdca7
Removidos os erros de comipalção NaN, faltam 2 erros do sdk 7.0
Bigous Mar 5, 2015
22d8b3c
Removidos os erros de comipalção NaN, faltam 2 erros do sdk 7.0
Bigous Mar 5, 2015
a144ca8
Revert "Removidos os erros de comipalção NaN, faltam 2 erros do sdk 7.0"
Bigous Mar 5, 2015
63e7817
Revert "Removidos os erros de comipalção NaN, faltam 2 erros do sdk 7.0"
Bigous Mar 5, 2015
56613f6
Nan compile errors stripped.
Bigous Mar 5, 2015
537e74b
Nan compile errors stripped.
Bigous Mar 5, 2015
47646ec
Change configuration to compile without errors on windows.
Bigous Mar 9, 2015
bf2f046
Change configuration to compile without errors on windows.
Bigous Mar 9, 2015
9c3a488
BugFix - Escapable scope was not defined in GetValue
Bigous Mar 10, 2015
45eb8de
BugFix - Escapable scope was not defined in GetValue
Bigous Mar 10, 2015
1217432
Merge with upstream from oracle.
Bigous Mar 10, 2015
627516d
Merge with upstream from oracle.
Bigous Mar 10, 2015
ac0a3bf
Removed the use of deprecated sys package from webapp example
Bigous Mar 10, 2015
f15f846
Removed the use of deprecated sys package from webapp example
Bigous Mar 10, 2015
97fd0d7
Merge with the latest version of oracledb
Bigous Mar 16, 2015
e9bf062
Merge with the latest version of oracledb
Bigous Mar 16, 2015
43a306c
Bump to signoff
Bigous Mar 23, 2015
e08a200
Merge with the latest version of oracledb [SIGN-OFF]
Bigous Mar 16, 2015
7af0588
Merge with the latest version of oracledb [SIGN-OFF]
Bigous Mar 16, 2015
d8b200f
Bump to signoff
Bigous Mar 23, 2015
a148f7d
Merge with latest commit from upstream.
Bigous Mar 31, 2015
e68332f
Merge with latest commit from upstream.
Bigous Mar 31, 2015
3c36d55
Merge with tag 0.5
Bigous May 11, 2015
b3eec33
Avoiding using ?: operator with NanNull
Bigous May 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 73 additions & 22 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')\")"
],
}
]
Expand Down
2 changes: 1 addition & 1 deletion examples/webapp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>");
Expand Down
75 changes: 48 additions & 27 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
Loading