Skip to content

Commit e7c3afb

Browse files
kkaeferkkaefer
committed
some tweaks for windows support
1 parent fed5417 commit e7c3afb

9 files changed

Lines changed: 13 additions & 24 deletions

File tree

‎lib/sqlite3.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var sqlite3 = module.exports = exports = require('./sqlite3_bindings.node');
1+
var sqlite3 = module.exports = exports = require('./node_sqlite3.node');
22
var path = require('path');
33
var util = require('util');
44
var EventEmitter = require('events').EventEmitter;

‎node-sqlite3.sln‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 11.00
33
# Visual Studio 2010
4-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "node-sqlite3", "node-sqlite3.vcxproj", "{2018883C-427E-4E54-B1CB-9A232C3B2844}"
5-
ProjectSection(ProjectDependencies) = postProject
6-
{87745018-5C6E-4BFA-B3F6-8466A10B51EA} = {87745018-5C6E-4BFA-B3F6-8466A10B51EA}
7-
EndProjectSection
8-
EndProject
9-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "deps\sqlite3\sqlite3.vcxproj", "{87745018-5C6E-4BFA-B3F6-8466A10B51EA}"
4+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "node_sqlite3", "node-sqlite3.vcxproj", "{2018883C-427E-4E54-B1CB-9A232C3B2844}"
105
EndProject
116
Global
127
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -18,10 +13,6 @@ Global
1813
{2018883C-427E-4E54-B1CB-9A232C3B2844}.Debug|Win32.Build.0 = Debug|Win32
1914
{2018883C-427E-4E54-B1CB-9A232C3B2844}.Release|Win32.ActiveCfg = Release|Win32
2015
{2018883C-427E-4E54-B1CB-9A232C3B2844}.Release|Win32.Build.0 = Release|Win32
21-
{87745018-5C6E-4BFA-B3F6-8466A10B51EA}.Debug|Win32.ActiveCfg = Debug|Win32
22-
{87745018-5C6E-4BFA-B3F6-8466A10B51EA}.Debug|Win32.Build.0 = Debug|Win32
23-
{87745018-5C6E-4BFA-B3F6-8466A10B51EA}.Release|Win32.ActiveCfg = Release|Win32
24-
{87745018-5C6E-4BFA-B3F6-8466A10B51EA}.Release|Win32.Build.0 = Release|Win32
2516
EndGlobalSection
2617
GlobalSection(SolutionProperties) = preSolution
2718
HideSolutionNode = FALSE

‎node-sqlite3.vcxproj‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<ProjectGuid>{2018883C-427E-4E54-B1CB-9A232C3B2844}</ProjectGuid>
1515
<Keyword>Win32Proj</Keyword>
1616
<RootNamespace>nodesqlite3</RootNamespace>
17+
<ProjectName>node_sqlite3</ProjectName>
1718
</PropertyGroup>
1819
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1920
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -32,13 +33,15 @@
3233
</ImportGroup>
3334
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
3435
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
36+
<Import Project="node_extension.props" />
3537
</ImportGroup>
3638
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
3739
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3840
</ImportGroup>
3941
<PropertyGroup Label="UserMacros" />
4042
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
4143
<LinkIncremental>true</LinkIncremental>
44+
<OutDir>$(SolutionDir)\lib</OutDir>
4245
</PropertyGroup>
4346
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
4447
<LinkIncremental>false</LinkIncremental>
@@ -48,14 +51,12 @@
4851
<PrecompiledHeader>NotUsing</PrecompiledHeader>
4952
<WarningLevel>Level3</WarningLevel>
5053
<Optimization>Disabled</Optimization>
51-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NODESQLITE3_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
52-
<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>
54+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
55+
<AdditionalIncludeDirectories>$(ProejctDir)deps\sqlite3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
5356
</ClCompile>
5457
<Link>
5558
<SubSystem>Windows</SubSystem>
5659
<GenerateDebugInformation>true</GenerateDebugInformation>
57-
<AdditionalLibraryDirectories>C:\Users\kkaefer\Code\node\Debug;C:\Users\kkaefer\Code\node_modules\node-sqlite3\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
58-
<AdditionalDependencies>node.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
5960
</Link>
6061
</ItemDefinitionGroup>
6162
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -78,15 +79,17 @@
7879
<None Include="ReadMe.txt" />
7980
</ItemGroup>
8081
<ItemGroup>
82+
<ClInclude Include="deps\sqlite3\sqlite3.h" />
8183
<ClInclude Include="src\async.h" />
8284
<ClInclude Include="src\database.h" />
8385
<ClInclude Include="src\macros.h" />
8486
<ClInclude Include="src\statement.h" />
8587
<ClInclude Include="src\threading.h" />
8688
</ItemGroup>
8789
<ItemGroup>
90+
<ClCompile Include="deps\sqlite3\sqlite3.c" />
8891
<ClCompile Include="src\database.cc" />
89-
<ClCompile Include="src\sqlite3.cc" />
92+
<ClCompile Include="src\node_sqlite3.cc" />
9093
<ClCompile Include="src\statement.cc" />
9194
</ItemGroup>
9295
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎src/database.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include <string.h>
2-
#include <v8.h>
32
#include <node.h>
43

54
#include "macros.h"

‎src/database.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#ifndef NODE_SQLITE3_SRC_DATABASE_H
22
#define NODE_SQLITE3_SRC_DATABASE_H
33

4-
#include <v8.h>
54
#include <node.h>
65

76
#include <string>

src/sqlite3.cc renamed to src/node_sqlite3.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#include <v8.h>
21
#include <node.h>
32
#include <node_buffer.h>
43

@@ -104,4 +103,4 @@ const char* sqlite_authorizer_string(int type) {
104103
}
105104
}
106105

107-
NODE_MODULE(sqlite3_bindings, RegisterModule);
106+
NODE_MODULE(node_sqlite3, RegisterModule);

‎src/statement.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include <string.h>
2-
#include <v8.h>
32
#include <node.h>
43
#include <node_buffer.h>
54

‎src/statement.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#ifndef NODE_SQLITE3_SRC_STATEMENT_H
22
#define NODE_SQLITE3_SRC_STATEMENT_H
33

4-
#include <v8.h>
54
#include <node.h>
65

76
#include "database.h"

‎test/support/helper.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ exports.deleteFile = function(name) {
55
try {
66
fs.unlinkSync(name);
77
} catch(err) {
8-
if (err.errno !== process.ENOENT && err.code !== 'ENOENT') {
8+
if (err.errno !== process.ENOENT && err.code !== 'ENOENT' && err.syscall !== 'unlink') {
99
throw err;
1010
}
1111
}
@@ -15,7 +15,7 @@ assert.fileDoesNotExist = function(name) {
1515
try {
1616
fs.statSync(name);
1717
} catch(err) {
18-
if (err.errno !== process.ENOENT && err.code !== 'ENOENT') {
18+
if (err.errno !== process.ENOENT && err.code !== 'ENOENT' && err.syscall !== 'unlink') {
1919
throw err;
2020
}
2121
}

0 commit comments

Comments
 (0)