some tweaks for windows support

TooTallNate · Nov 19, 2011 · e7c3afb · e7c3afb
1 parent fed5417
commit e7c3afb
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 24 deletions.
diff --git a/lib/sqlite3.js b/lib/sqlite3.js
@@ -1,4 +1,4 @@
-var sqlite3 = module.exports = exports = require('./sqlite3_bindings.node');
+var sqlite3 = module.exports = exports = require('./node_sqlite3.node');
 var path = require('path');
 var util = require('util');
 var EventEmitter = require('events').EventEmitter;

diff --git a/node-sqlite3.sln b/node-sqlite3.sln
@@ -1,12 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "node_sqlite3", "node-sqlite3.vcxproj", "{2018883C-427E-4E54-B1CB-9A232C3B2844}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -18,10 +13,6 @@ Global
 		{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.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
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/node-sqlite3.vcxproj b/node-sqlite3.vcxproj
@@ -14,6 +14,7 @@
     <ProjectGuid>{2018883C-427E-4E54-B1CB-9A232C3B2844}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>nodesqlite3</RootNamespace>
+    <ProjectName>node_sqlite3</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -32,13 +33,15 @@
   </ImportGroup>
   <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="node_extension.props" />
   </ImportGroup>
   <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" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)\lib</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -48,14 +51,12 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NODESQLITE3_EXPORTS;%(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>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProejctDir)deps\sqlite3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <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>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -78,15 +79,17 @@
     <None Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="deps\sqlite3\sqlite3.h" />
     <ClInclude Include="src\async.h" />
     <ClInclude Include="src\database.h" />
     <ClInclude Include="src\macros.h" />
     <ClInclude Include="src\statement.h" />
     <ClInclude Include="src\threading.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="deps\sqlite3\sqlite3.c" />
     <ClCompile Include="src\database.cc" />
-    <ClCompile Include="src\sqlite3.cc" />
+    <ClCompile Include="src\node_sqlite3.cc" />
     <ClCompile Include="src\statement.cc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/src/database.cc b/src/database.cc
@@ -1,5 +1,4 @@
 #include <string.h>
-#include <v8.h>
 #include <node.h>
 
 #include "macros.h"

diff --git a/src/database.h b/src/database.h
@@ -1,7 +1,6 @@
 #ifndef NODE_SQLITE3_SRC_DATABASE_H
 #define NODE_SQLITE3_SRC_DATABASE_H
 
-#include <v8.h>
 #include <node.h>
 
 #include <string>

diff --git a/src/sqlite3.cc → src/node_sqlite3.cc b/src/sqlite3.cc → src/node_sqlite3.cc
@@ -1,4 +1,3 @@
-#include <v8.h>
 #include <node.h>
 #include <node_buffer.h>
 
@@ -104,4 +103,4 @@ const char* sqlite_authorizer_string(int type) {
     }
 }
 
-NODE_MODULE(sqlite3_bindings, RegisterModule);
+NODE_MODULE(node_sqlite3, RegisterModule);
diff --git a/src/statement.cc b/src/statement.cc
@@ -1,5 +1,4 @@
 #include <string.h>
-#include <v8.h>
 #include <node.h>
 #include <node_buffer.h>
 

diff --git a/src/statement.h b/src/statement.h
@@ -1,7 +1,6 @@
 #ifndef NODE_SQLITE3_SRC_STATEMENT_H
 #define NODE_SQLITE3_SRC_STATEMENT_H
 
-#include <v8.h>
 #include <node.h>
 
 #include "database.h"

diff --git a/test/support/helper.js b/test/support/helper.js
@@ -5,7 +5,7 @@ exports.deleteFile = function(name) {
     try {
         fs.unlinkSync(name);
     } catch(err) {
-        if (err.errno !== process.ENOENT && err.code !== 'ENOENT') {
+        if (err.errno !== process.ENOENT && err.code !== 'ENOENT' && err.syscall !== 'unlink') {
             throw err;
         }
     }
@@ -15,7 +15,7 @@ assert.fileDoesNotExist = function(name) {
     try {
         fs.statSync(name);
     } catch(err) {
-        if (err.errno !== process.ENOENT && err.code !== 'ENOENT') {
+        if (err.errno !== process.ENOENT && err.code !== 'ENOENT' && err.syscall !== 'unlink') {
             throw err;
         }
     }