diff --git a/VS2012/Arangod Binary/Arangod Binary.vcxproj b/VS2012/Arangod Binary/Arangod Binary.vcxproj
index df1cc9be7c..7f9b2bab36 100644
--- a/VS2012/Arangod Binary/Arangod Binary.vcxproj
+++ b/VS2012/Arangod Binary/Arangod Binary.vcxproj
@@ -246,8 +246,6 @@
-
-
@@ -292,7 +290,6 @@
-
@@ -342,8 +339,6 @@
-
-
@@ -400,7 +395,6 @@
-
diff --git a/VS2012/Arangod Binary/Arangod Binary.vcxproj.filters b/VS2012/Arangod Binary/Arangod Binary.vcxproj.filters
index 8301f088fd..02bcec9af6 100644
--- a/VS2012/Arangod Binary/Arangod Binary.vcxproj.filters
+++ b/VS2012/Arangod Binary/Arangod Binary.vcxproj.filters
@@ -37,12 +37,6 @@
{b0dd276d-71b6-4991-a4b2-5524256eb6e5}
-
- {120b3084-35a3-4c63-9dd3-5dd5962475e0}
-
-
- {e1c38b70-c0da-49f9-a438-654573b89d12}
-
{bdf04799-3349-4e2d-8270-9e3b17a27613}
@@ -207,12 +201,6 @@
IndexOperators Source
-
- PriorityQueue Source
-
-
- PriorityQueue Source
-
Skiplists Source
@@ -264,9 +252,6 @@
VocBase Source
-
- VocBase Source
-
VocBase Source
@@ -485,12 +470,6 @@
IndexOperators Header
-
- PriorityQueue Header
-
-
- PriorityQueue Header
-
RestHandler Header
@@ -557,9 +536,6 @@
VocBase Header
-
- VocBase Header
-
VocBase Header
diff --git a/VS2012/Installer/arango32.xml b/VS2012/Installer/arango32.xml
index 86cf63cf9a..47c2bcbd95 100755
--- a/VS2012/Installer/arango32.xml
+++ b/VS2012/Installer/arango32.xml
@@ -28,6 +28,7 @@
+
diff --git a/VS2012/Installer/arango64.xml b/VS2012/Installer/arango64.xml
index 65a4de3ea8..c4195f0430 100755
--- a/VS2012/Installer/arango64.xml
+++ b/VS2012/Installer/arango64.xml
@@ -28,6 +28,7 @@
+
diff --git a/VS2012/arango.sln b/VS2012/arango.sln
index 0c38f05bb4..ce2c481d59 100644
--- a/VS2012/arango.sln
+++ b/VS2012/arango.sln
@@ -58,6 +58,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Arangob Binary", "Arangob B
{604036DD-7013-4463-B827-D06016BD41FC} = {604036DD-7013-4463-B827-D06016BD41FC}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Checkserver Binary", "Checkserver Binary\Checkserver Binary.vcxproj", "{2BC148DF-067A-4299-AA89-15A4DB89B40F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9FB69E35-6ADE-4AAD-9766-B5409C1D2595} = {9FB69E35-6ADE-4AAD-9766-B5409C1D2595}
+ {8985F67A-A9CC-41C8-80D4-364678550F2F} = {8985F67A-A9CC-41C8-80D4-364678550F2F}
+ {604036DD-7013-4463-B827-D06016BD41FC} = {604036DD-7013-4463-B827-D06016BD41FC}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -170,6 +177,14 @@ Global
{1D51688C-8A5D-4191-A3A6-ACD5D3A8111F}.Release|Win32.Build.0 = Release|Win32
{1D51688C-8A5D-4191-A3A6-ACD5D3A8111F}.Release|x64.ActiveCfg = Release|x64
{1D51688C-8A5D-4191-A3A6-ACD5D3A8111F}.Release|x64.Build.0 = Release|x64
+ {2BC148DF-067A-4299-AA89-15A4DB89B40F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2BC148DF-067A-4299-AA89-15A4DB89B40F}.Debug|Win32.Build.0 = Debug|Win32
+ {2BC148DF-067A-4299-AA89-15A4DB89B40F}.Debug|x64.ActiveCfg = Debug|x64
+ {2BC148DF-067A-4299-AA89-15A4DB89B40F}.Debug|x64.Build.0 = Debug|x64
+ {2BC148DF-067A-4299-AA89-15A4DB89B40F}.Release|Win32.ActiveCfg = Release|Win32
+ {2BC148DF-067A-4299-AA89-15A4DB89B40F}.Release|Win32.Build.0 = Release|Win32
+ {2BC148DF-067A-4299-AA89-15A4DB89B40F}.Release|x64.ActiveCfg = Release|x64
+ {2BC148DF-067A-4299-AA89-15A4DB89B40F}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/arangosh/V8Client/check-server.cpp b/arangosh/V8Client/check-server.cpp
index d69e4e8f33..49400f11d9 100644
--- a/arangosh/V8Client/check-server.cpp
+++ b/arangosh/V8Client/check-server.cpp
@@ -44,13 +44,43 @@ using namespace triagens::arango;
// --SECTION-- private functions
// -----------------------------------------------------------------------------
+////////////////////////////////////////////////////////////////////////////////
+/// @brief exit function
+////////////////////////////////////////////////////////////////////////////////
+
+#ifdef _WIN32
+
+static void checkserverExitFunction (int exitCode, void* data) {
+ int res = 0;
+
+ // ...........................................................................
+ // TODO: need a terminate function for windows to be called and cleanup
+ // any windows specific stuff.
+ // ...........................................................................
+
+ res = finaliseWindows(TRI_WIN_FINAL_WSASTARTUP_FUNCTION_CALL, 0);
+
+ if (res != 0) {
+ exit(1);
+ }
+
+ exit(exitCode);
+}
+
+#else
+
+static void checkserverExitFunction (int exitCode, void* data) {
+}
+
+#endif
+
////////////////////////////////////////////////////////////////////////////////
/// @brief startup function
////////////////////////////////////////////////////////////////////////////////
#ifdef _WIN32
-static void arangoshEntryFunction () {
+static void checkserverEntryFunction () {
int maxOpenFiles = 1024;
int res = 0;
@@ -79,42 +109,12 @@ static void arangoshEntryFunction () {
_exit(1);
}
- TRI_Application_Exit_SetExit(arangoshExitFunction);
+ TRI_Application_Exit_SetExit(checkserverExitFunction);
}
#else
-static void arangoshEntryFunction () {
-}
-
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief exit function
-////////////////////////////////////////////////////////////////////////////////
-
-#ifdef _WIN32
-
-static void arangoshExitFunction (int exitCode, void* data) {
- int res = 0;
-
- // ...........................................................................
- // TODO: need a terminate function for windows to be called and cleanup
- // any windows specific stuff.
- // ...........................................................................
-
- res = finaliseWindows(TRI_WIN_FINAL_WSASTARTUP_FUNCTION_CALL, 0);
-
- if (res != 0) {
- exit(1);
- }
-
- exit(exitCode);
-}
-
-#else
-
-static void arangoshExitFunction (int exitCode, void* data) {
+static void checkserverEntryFunction () {
}
#endif
@@ -145,7 +145,7 @@ static V8ClientConnection* CreateConnection (Endpoint* endpoint) {
int main (int argc, char* argv[]) {
int ret = EXIT_SUCCESS;
- arangoshEntryFunction();
+ checkserverEntryFunction();
TRIAGENS_C_INITIALISE(argc, argv);
TRIAGENS_REST_INITIALISE(argc, argv);
@@ -217,7 +217,7 @@ int main (int argc, char* argv[]) {
TRIAGENS_REST_SHUTDOWN;
- arangoshExitFunction(ret, NULL);
+ checkserverExitFunction(ret, NULL);
return ret;
}