Skip to content

N
node-sqlite3
Commit e7c3afb7 by Konstantin Kaefer
Options

some tweaks for windows support

parent fed5417a
Showing with 13 additions and 24 deletions
lib/sqlite3.js
var sqlite3 = module.exports = exports = require('./sqlite3_bindings.node'); var sqlite3 = module.exports = exports = require('./node_sqlite3.node');
var path = require('path'); var path = require('path');
var util = require('util'); var util = require('util');
var EventEmitter = require('events').EventEmitter; var EventEmitter = require('events').EventEmitter;
......
node-sqlite3.sln
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010 # Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "node-sqlite3", "node-sqlite3.vcxproj", "{2018883C-427E-4E54-B1CB-9A232C3B2844}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "node_sqlite3", "node-sqlite3.vcxproj", "{2018883C-427E-4E54-B1CB-9A232C3B2844}"
ProjectSection(ProjectDependencies) = postProject
{87745018-5C6E-4BFA-B3F6-8466A10B51EA} = {87745018-5C6E-4BFA-B3F6-8466A10B51EA}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "deps\sqlite3\sqlite3.vcxproj", "{87745018-5C6E-4BFA-B3F6-8466A10B51EA}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
...@@ -18,10 +13,6 @@ Global ...@@ -18,10 +13,6 @@ Global
{2018883C-427E-4E54-B1CB-9A232C3B2844}.Debug|Win32.Build.0 = Debug|Win32 {2018883C-427E-4E54-B1CB-9A232C3B2844}.Debug|Win32.Build.0 = Debug|Win32
{2018883C-427E-4E54-B1CB-9A232C3B2844}.Release|Win32.ActiveCfg = Release|Win32 {2018883C-427E-4E54-B1CB-9A232C3B2844}.Release|Win32.ActiveCfg = Release|Win32
{2018883C-427E-4E54-B1CB-9A232C3B2844}.Release|Win32.Build.0 = Release|Win32 {2018883C-427E-4E54-B1CB-9A232C3B2844}.Release|Win32.Build.0 = Release|Win32
{87745018-5C6E-4BFA-B3F6-8466A10B51EA}.Debug|Win32.ActiveCfg = Debug|Win32
{87745018-5C6E-4BFA-B3F6-8466A10B51EA}.Debug|Win32.Build.0 = Debug|Win32
{87745018-5C6E-4BFA-B3F6-8466A10B51EA}.Release|Win32.ActiveCfg = Release|Win32
{87745018-5C6E-4BFA-B3F6-8466A10B51EA}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
node-sqlite3.vcxproj
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<ProjectGuid>{2018883C-427E-4E54-B1CB-9A232C3B2844}</ProjectGuid> <ProjectGuid>{2018883C-427E-4E54-B1CB-9A232C3B2844}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>nodesqlite3</RootNamespace> <RootNamespace>nodesqlite3</RootNamespace>
<ProjectName>node_sqlite3</ProjectName>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
...@@ -32,6 +33,7 @@ ...@@ -32,6 +33,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="node_extension.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
...@@ -39,6 +41,7 @@ ...@@ -39,6 +41,7 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\lib</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
...@@ -48,14 +51,12 @@ ...@@ -48,14 +51,12 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NODESQLITE3_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>C:\Users\kkaefer\Code\node_modules\node-sqlite3\deps\sqlite3;C:\Users\kkaefer\Code\node\deps\uv\include;C:\Users\kkaefer\Code\node\deps\v8\include;C:\Users\kkaefer\Code\node\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProejctDir)deps\sqlite3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>C:\Users\kkaefer\Code\node\Debug;C:\Users\kkaefer\Code\node_modules\node-sqlite3\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>node.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
...@@ -78,6 +79,7 @@ ...@@ -78,6 +79,7 @@
<None Include="ReadMe.txt" /> <None Include="ReadMe.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="deps\sqlite3\sqlite3.h" />
<ClInclude Include="src\async.h" /> <ClInclude Include="src\async.h" />
<ClInclude Include="src\database.h" /> <ClInclude Include="src\database.h" />
<ClInclude Include="src\macros.h" /> <ClInclude Include="src\macros.h" />
...@@ -85,8 +87,9 @@ ...@@ -85,8 +87,9 @@
<ClInclude Include="src\threading.h" /> <ClInclude Include="src\threading.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="deps\sqlite3\sqlite3.c" />
<ClCompile Include="src\database.cc" /> <ClCompile Include="src\database.cc" />
<ClCompile Include="src\sqlite3.cc" /> <ClCompile Include="src\node_sqlite3.cc" />
<ClCompile Include="src\statement.cc" /> <ClCompile Include="src\statement.cc" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
src/database.cc
#include <string.h> #include <string.h>
#include <v8.h>
#include <node.h> #include <node.h>
#include "macros.h" #include "macros.h"
......
src/database.h
#ifndef NODE_SQLITE3_SRC_DATABASE_H #ifndef NODE_SQLITE3_SRC_DATABASE_H
#define NODE_SQLITE3_SRC_DATABASE_H #define NODE_SQLITE3_SRC_DATABASE_H
#include <v8.h>
#include <node.h> #include <node.h>
#include <string> #include <string>
......
src/sqlite3.cc → src/node_sqlite3.cc
#include <v8.h>
#include <node.h> #include <node.h>
#include <node_buffer.h> #include <node_buffer.h>
...@@ -104,4 +103,4 @@ const char* sqlite_authorizer_string(int type) { ...@@ -104,4 +103,4 @@ const char* sqlite_authorizer_string(int type) {
} }
} }
NODE_MODULE(sqlite3_bindings, RegisterModule); NODE_MODULE(node_sqlite3, RegisterModule);
src/statement.cc
#include <string.h> #include <string.h>
#include <v8.h>
#include <node.h> #include <node.h>
#include <node_buffer.h> #include <node_buffer.h>
......
src/statement.h
#ifndef NODE_SQLITE3_SRC_STATEMENT_H #ifndef NODE_SQLITE3_SRC_STATEMENT_H
#define NODE_SQLITE3_SRC_STATEMENT_H #define NODE_SQLITE3_SRC_STATEMENT_H
#include <v8.h>
#include <node.h> #include <node.h>
#include "database.h" #include "database.h"
......
test/support/helper.js
...@@ -5,7 +5,7 @@ exports.deleteFile = function(name) { ...@@ -5,7 +5,7 @@ exports.deleteFile = function(name) {
try { try {
fs.unlinkSync(name); fs.unlinkSync(name);
} catch(err) { } catch(err) {
if (err.errno !== process.ENOENT && err.code !== 'ENOENT') { if (err.errno !== process.ENOENT && err.code !== 'ENOENT' && err.syscall !== 'unlink') {
throw err; throw err;
} }
} }
...@@ -15,7 +15,7 @@ assert.fileDoesNotExist = function(name) { ...@@ -15,7 +15,7 @@ assert.fileDoesNotExist = function(name) {
try { try {
fs.statSync(name); fs.statSync(name);
} catch(err) { } catch(err) {
if (err.errno !== process.ENOENT && err.code !== 'ENOENT') { if (err.errno !== process.ENOENT && err.code !== 'ENOENT' && err.syscall !== 'unlink') {
throw err; throw err;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment