Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

updated Windows build

This commit is contained in:
Jan Steemann 2013-11-20 15:37:11 +01:00
parent a2152af99c
commit fb9f9f7d26
6 changed files with 52 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
VS2012/Arangod Binary/Arangod Binary.vcxproj
View File

@ -246,8 +246,6 @@
<ClCompile Include="..\..\arangod\HashIndex\hash-index.c" />
<ClCompile Include="..\..\arangod\IndexIterators\index-iterator.c" />
<ClCompile Include="..\..\arangod\IndexOperators\index-operator.c" />
<ClCompile Include="..\..\arangod\PriorityQueue\pqueueindex.c" />
<ClCompile Include="..\..\arangod\PriorityQueue\priorityqueue.c" />
<ClCompile Include="..\..\arangod\Replication\ContinuousSyncer.cpp" />
<ClCompile Include="..\..\arangod\Replication\InitialSyncer.cpp" />
<ClCompile Include="..\..\arangod\Replication\replication-static.cpp" />
@ -292,7 +290,6 @@
<ClCompile Include="..\..\arangod\VocBase\replication-logger.c" />
<ClCompile Include="..\..\arangod\VocBase\replication-master.c" />
<ClCompile Include="..\..\arangod\VocBase\server.c" />
<ClCompile Include="..\..\arangod\VocBase\shape-collection.c" />
<ClCompile Include="..\..\arangod\VocBase\synchroniser.c" />
<ClCompile Include="..\..\arangod\VocBase\transaction.c" />
<ClCompile Include="..\..\arangod\VocBase\update-policy.c" />
@ -342,8 +339,6 @@
<ClInclude Include="..\..\arangod\HashIndex\hash-index.h" />
<ClInclude Include="..\..\arangod\IndexIterators\index-iterator.h" />
<ClInclude Include="..\..\arangod\IndexOperators\index-operator.h" />
<ClInclude Include="..\..\arangod\PriorityQueue\pqueueindex.h" />
<ClInclude Include="..\..\arangod\PriorityQueue\priorityqueue.h" />
<ClInclude Include="..\..\arangod\Replication\ContinuousSyncer.h" />
<ClInclude Include="..\..\arangod\Replication\InitialSyncer.h" />
<ClInclude Include="..\..\arangod\Replication\replication-static.h" />
@ -400,7 +395,6 @@
<ClInclude Include="..\..\arangod\VocBase\replication-logger.h" />
<ClInclude Include="..\..\arangod\VocBase\replication-master.h" />
<ClInclude Include="..\..\arangod\VocBase\server.h" />
<ClInclude Include="..\..\arangod\VocBase\shape-collection.h" />
<ClInclude Include="..\..\arangod\VocBase\synchroniser.h" />
<ClInclude Include="..\..\arangod\VocBase\transaction.h" />
<ClInclude Include="..\..\arangod\VocBase\update-policy.h" />

24
VS2012/Arangod Binary/Arangod Binary.vcxproj.filters
View File

@ -37,12 +37,6 @@
<Filter Include="IndexIterators Header">
<UniqueIdentifier>{b0dd276d-71b6-4991-a4b2-5524256eb6e5}</UniqueIdentifier>
</Filter>
<Filter Include="PriorityQueue Source">
<UniqueIdentifier>{120b3084-35a3-4c63-9dd3-5dd5962475e0}</UniqueIdentifier>
</Filter>
<Filter Include="PriorityQueue Header">
<UniqueIdentifier>{e1c38b70-c0da-49f9-a438-654573b89d12}</UniqueIdentifier>
</Filter>
<Filter Include="RestHandler Header">
<UniqueIdentifier>{bdf04799-3349-4e2d-8270-9e3b17a27613}</UniqueIdentifier>
</Filter>
@ -207,12 +201,6 @@
<ClCompile Include="..\..\arangod\IndexOperators\index-operator.c">
<Filter>IndexOperators Source</Filter>
</ClCompile>
<ClCompile Include="..\..\arangod\PriorityQueue\pqueueindex.c">
<Filter>PriorityQueue Source</Filter>
</ClCompile>
<ClCompile Include="..\..\arangod\PriorityQueue\priorityqueue.c">
<Filter>PriorityQueue Source</Filter>
</ClCompile>
<ClCompile Include="..\..\arangod\SkipLists\skiplist.c">
<Filter>Skiplists Source</Filter>
</ClCompile>
@ -264,9 +252,6 @@
<ClCompile Include="..\..\arangod\VocBase\primary-collection.c">
<Filter>VocBase Source</Filter>
</ClCompile>
<ClCompile Include="..\..\arangod\VocBase\shape-collection.c">
<Filter>VocBase Source</Filter>
</ClCompile>
<ClCompile Include="..\..\arangod\VocBase\synchroniser.c">
<Filter>VocBase Source</Filter>
</ClCompile>
@ -485,12 +470,6 @@
<ClInclude Include="..\..\arangod\IndexOperators\index-operator.h">
<Filter>IndexOperators Header</Filter>
</ClInclude>
<ClInclude Include="..\..\arangod\PriorityQueue\pqueueindex.h">
<Filter>PriorityQueue Header</Filter>
</ClInclude>
<ClInclude Include="..\..\arangod\PriorityQueue\priorityqueue.h">
<Filter>PriorityQueue Header</Filter>
</ClInclude>
<ClInclude Include="..\..\arangod\RestHandler\RestBatchHandler.h">
<Filter>RestHandler Header</Filter>
</ClInclude>
@ -557,9 +536,6 @@
<ClInclude Include="..\..\arangod\VocBase\primary-collection.h">
<Filter>VocBase Header</Filter>
</ClInclude>
<ClInclude Include="..\..\arangod\VocBase\shape-collection.h">
<Filter>VocBase Header</Filter>
</ClInclude>
<ClInclude Include="..\..\arangod\VocBase\synchroniser.h">
<Filter>VocBase Header</Filter>
</ClInclude>

1
VS2012/Installer/arango32.xml
View File

@ -28,6 +28,7 @@
<File Id='arangodRestoreEXE' Name='arangorestore.exe' Source='arangorestore32.exe' Vital='yes' />
<File Id='arangodDumpEXE' Name='arangodump.exe' Source='arangodump32.exe' Vital='yes' />
<File Id='arangodBenchEXE' Name='arangob.exe' Source='arangob32.exe' Vital='yes' />
<File Id='checkserverEXE' Name='checkserver.exe' Source='checkserver32.exe' Vital='yes' />
<File Id='arangodConf' Name='arangod.conf' Source='arangod.conf' Vital='yes' />
<File Id='arangoShellConf' Name='arangosh.conf' Source='arangosh.conf' Vital='yes' />

1
VS2012/Installer/arango64.xml
View File

@ -28,6 +28,7 @@
<File Id='arangodRestoreEXE' Name='arangorestore.exe' Source='arangorestore64.exe' Vital='yes' />
<File Id='arangodDumpEXE' Name='arangodump.exe' Source='arangodump64.exe' Vital='yes' />
<File Id='arangodBenchEXE' Name='arangob.exe' Source='arangob64.exe' Vital='yes' />
<File Id='checkserverEXE' Name='checkserver.exe' Source='checkserver64.exe' Vital='yes' />
<File Id='arangodConf' Name='arangod.conf' Source='arangod.conf' Vital='yes' />
<File Id='arangoShellConf' Name='arangosh.conf' Source='arangosh.conf' Vital='yes' />

15
VS2012/arango.sln
View File

@ -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

70
arangosh/V8Client/check-server.cpp
View File

@ -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;
}