8000 Merge branch 'devel' of github.com:arangodb/arangodb into devel · msand/arangodb@d2b48f0 · GitHub
[go: up one dir, main page]
Skip to content

Commit d2b48f0

Browse files
hkernbachhkernbach
committed
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2 parents 0bb383a + a1cdac2 commit d2b48f0

File tree

10 files changed

+433
-24
lines changed

10 files changed

+433
-24
lines changed

‎3rdParty/boost/1.58.0/boost/atomic.hpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#ifndef BOOST_ATOMIC_HPP
2+
#define BOOST_ATOMIC_HPP
3+
4+
// Copyright (c) 2011 Helge Bahmann
5+
//
6+
// Distributed under the Boost Software License, Version 1.0.
7+
// See accompanying file LICENSE_1_0.txt or copy at
8+
// http://www.boost.org/LICENSE_1_0.txt)
9+
10+
// This header includes all Boost.Atomic public headers
11+
12+
#include <boost/atomic/atomic.hpp>
13+
14+
#ifdef BOOST_HAS_PRAGMA_ONCE
15+
#pragma once
16+
#endif
17+
18+
#endif

‎3rdParty/boost/1.58.0/boost/memory_order.hpp

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#ifndef BOOST_MEMORY_ORDER_HPP_INCLUDED
2+
#define BOOST_MEMORY_ORDER_HPP_INCLUDED
3+
4+
// MS compatible compilers support #pragma once
5+
6+
#if defined(_MSC_VER) && (_MSC_VER >= 1020)
7+
# pragma once
8+
#endif
9+
10+
// boost/memory_order.hpp
11+
//
12+
// Defines enum boost::memory_order per the C++0x working draft
13+
//
14+
// Copyright (c) 2008, 2009 Peter Dimov
15+
//
16+
// Distributed under the Boost Software License, Version 1.0.
17+
// See accompanying file LICENSE_1_0.txt or copy at
18+
// http://www.boost.org/LICENSE_1_0.txt)
19+
20+
21+
namespace boost
22+
{
23+
24+
//
25+
// Enum values are chosen so that code that needs to insert
26+
// a trailing fence for acquire semantics can use a single
27+
// test such as:
28+
//
29+
// if( mo & memory_order_acquire ) { ...fence... }
30+
//
31+
// For leading fences one can use:
32+
//
33+
// if( mo & memory_order_release ) { ...fence... }
34+
//
35+
// Architectures such as Alpha that need a fence on consume
36+
// can use:
37+
//
38+
// if( mo & ( memory_order_acquire | memory_order_consume ) ) { ...fence... }
39+
//
40+
// The values are also in the order of increasing "strength"
41+
// of the fences so that success/failure orders can be checked
42+
// efficiently in compare_exchange methods.
43+
//
44+
45+
enum memory_order
46+
{
47+
memory_order_relaxed = 0,
48+
memory_order_consume = 1,
49+
memory_order_acquire = 2,
50+
memory_order_release = 4,
51+
memory_order_acq_rel = 6, // acquire | release
52+
memory_order_seq_cst = 14 // acq_rel | 8
53+
};
54+
55+
} // namespace boost
56+
57+
#endif // #ifndef BOOST_MEMORY_ORDER_HPP_INCLUDED

‎CMakeLists.txt

Lines changed: 45 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cmake_minimum_required(VERSION 2.6)
1515
################################################################################
1616

1717
if (NOT CMAKE_BUILD_TYPE)
18-
set(CMAKE_BUILD_TYPE Release CACHE string "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
18+
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE string "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
1919
endif ()
2020

2121
################################################################################
@@ -41,6 +41,18 @@ set(TEST_GEO_SUITE geo_suite)
4141

4242
set(V8_VERSION 4.3.61)
4343

44+
set(ARANGODB_DISPLAY_NAME "ArangoDB")
45+
set(ARANGODB_URL_INFO_ABOUT "http://www.arangodb.org")
46+
set(ARANGODB_CONTACT "hackers@arangodb.org")
47+
48+
set(ARANGODB_FRIENDLY_STRING "ArangoDB - the multi-purpose database")
49+
set(ARANGOB_FRIENDLY_STRING "ArangoBench - stresstester")
50+
set(ARANGO_DUMP_FRIENDLY_STRING "arangodump - export whole databases from ArangoDB to JSON")
51+
set(ARANGO_IMP_FRIENDLY_STRING "arangoimp - import CSV files into ArangoDB")
52+
set(ARANGO_RESTORE_HELP_LINK "arangrestore - import dumpfiles created with arangodump into ArangoDB")
53+
set(ARANGOSH_HELP_LINK "arangosh - commandline client of ArangoDB")
54+
55+
4456
################################################################################
4557
### @brief BUILD_PACKAGE
4658
###
@@ -271,7 +283,7 @@ if (USE_RELATIVE)
271283
set(TRI_SBINDIR "${CMAKE_INSTALL_PREFIX}/sbin")
272284
endif ()
273285

274-
else()
286+
else() # USE_RELATIVE
275287

276288
################################################################################
277289
### @brief SYSTEM CONFIGURATION DIRECTORY (/etc)
@@ -369,6 +381,28 @@ else()
369381
set(TRI_SBINDIR "${CMAKE_INSTALL_PREFIX}/sbin")
370382
endif ()
371383

384+
endif () # USE_RELATIVE
385+
386+
if (MSVC)
387+
################################################################################
388+
### @brief icon paths for windows
389+
################################################################################
390+
file(TO_NATIVE_PATH "${TRI_RESOURCEDIR}/Icons/arangodb.ico" RELATIVE_ARANGO_ICON)
391+
file(TO_NATIVE_PATH "${PROJECT_SOURCE_DIR}/Installation/Windows/Icons/arangodb.bmp" ARANGO_IMG)
392+
file(TO_NATIVE_PATH "${PROJECT_SOURCE_DIR}/Installation/Windows/Icons/arangodb.ico" ARANGO_ICON)
393+
394+
STRING(REGEX REPLACE "\\\\" "\\\\\\\\" ARANGO_IMG "${ARANGO_IMG}")
395+
STRING(REGEX REPLACE "\\\\" "\\\\\\\\" ARANGO_ICON "${ARANGO_ICON}")
396+
STRING(REGEX REPLACE "\\\\" "\\\\\\\\" RELATIVE_ARANGO_ICON "${RELATIVE_ARANGO_ICON}")
397+
398+
399+
################################################################################
400+
### @brief Versioning for windows
401+
################################################################################
402+
403+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/Installation/Windows/version)
404+
include("${PROJECT_SOURCE_DIR}/Installation/Windows/version/generate_product_version.cmake")
405+
372406
endif ()
373407

374408

@@ -892,13 +926,6 @@ if (MSVC)
892926
endif()
893927

894928

895-
file(TO_NATIVE_PATH "${TRI_RESOURCEDIR}/Icons/arangodb.ico" RELATIVE_ARANGO_ICON)
896-
file(TO_NATIVE_PATH "${PROJECT_SOURCE_DIR}/Installation/Windows/Icons/arangodb.bmp" ARANGO_IMG)
897-
file(TO_NATIVE_PATH "${PROJECT_SOURCE_DIR}/Installation/Windows/Icons/arangodb.ico" ARANGO_ICON)
898-
899-
STRING(REGEX REPLACE "\\\\" "\\\\\\\\" ARANGO_IMG "${ARANGO_IMG}")
900-
STRING(REGEX REPLACE "\\\\" "\\\\\\\\" ARANGO_ICON "${ARANGO_ICON}")
901-
STRING(REGEX REPLACE "\\\\" "\\\\\\\\" RELATIVE_ARANGO_ICON "${RELATIVE_ARANGO_ICON}")
902929

903930
message(STATUS "ARANGO_IMG: ${ARANGO_IMG}")
904931
message(STATUS "ARANGO_ICON: ${ARANGO_ICON}")
@@ -910,20 +937,20 @@ if (MSVC)
910937

911938
set(CPACK_NSIS_DEFINES "
912939
!define BITS ${BITS}
913-
!define TRI_FRIENDLY_SVC_NAME 'ArangoDB - the multi-purpose database'
940+
!define TRI_FRIENDLY_SVC_NAME '${ARANGODB_FRIENDLY_STRING}'
914941
!define TRI_AARDVARK_URL 'http://127.0.0.1:8529'
915942
")
916943

917-
set(CPACK_PACKAGE_ICON ${ARANGO_ICON})
944+
set(CPACK_PACKAGE_ICON ${ARANGO_ICON})
918945

919-
set(CPACK_NSIS_MODIFY_PATH ON)
920-
set(CPACK_NSIS_MUI_ICON ${ARANGO_ICON})
921-
set(CPACK_NSIS_MUI_UNIICON ${ARANGO_ICON})
946+
set(CPACK_NSIS_MODIFY_PATH ON)
947+
set(CPACK_NSIS_MUI_ICON ${ARANGO_ICON})
948+
set(CPACK_NSIS_MUI_UNIICON ${ARANGO_ICON})
922949
set(CPACK_NSIS_INSTALLED_ICON_NAME ${RELATIVE_ARANGO_ICON})
923-
set(CPACK_NSIS_DISPLAY_NAME, "ArangoDB")
924-
set(CPACK_NSIS_HELP_LINK "http://www.arangodb.org")
925-
set(CPACK_NSIS_URL_INFO_ABOUT "http://www.arangodb.org")
926-
set(CPACK_NSIS_CONTACT "hackers@arangodb.org")
950+
set(CPACK_NSIS_DISPLAY_NAME, ${ARANGODB_DISPLAY_NAME})
951+
set(CPACK_NSIS_HELP_LINK ${ARANGODB_HELP_LINK})
952+
set(CPACK_NSIS_URL_INFO_ABOUT ${ARANGODB_URL_INFO_ABOUT})
953+
set(CPACK_NSIS_CONTACT ${ARANGODB_CONTACT})
927954

928955
##############################################################################
929956
## etcd

‎GNUmakefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ remove-automagic:
7878
### @brief make love
7979
################################################################################
8080

81-
love:
81+
love:
8282
@echo ArangoDB loves you
8383

8484
## -----------------------------------------------------------------------------
@@ -328,7 +328,7 @@ winXX-cmake: checkcmake
328328
cd Build$(BITS) && cmake \
329329
-G "$(TARGET)" \
330330
-D "ARANGODB_VERSION=${VERSION}" \
331-
-D "CMAKE_BUILD_TYPE=RelWithDebInfo" \
331+
-D "CMAKE_BUILD_TYPE=RelWithDebInfo" \
332332
-D "BUILD_TYPE=RelWithDebInfo" \
333333
-D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \
334334
-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \
@@ -340,6 +340,7 @@ winXX-cmake: checkcmake
340340
..
341341

342342
winXX-build:
343+
cp Installation/Windows/Icons/arangodb.ico Build$(BITS)
343344
cd Build$(BITS) && cmake --build . --config $(BUILD_TARGET)
344345

345346
packXX:

‎Installation/Windows/version/VersionInfo.in

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
#pragma once
2+
3+
#ifndef PRODUCT_VERSION_MAJOR
4+
#define PRODUCT_VERSION_MAJOR @PRODUCT_VERSION_MAJOR@
5+
#endif
6+
7+
#ifndef PRODUCT_VERSION_MINOR
8+
#define PRODUCT_VERSION_MINOR @PRODUCT_VERSION_MINOR@
9+
#endif
10+
11+
#ifndef PRODUCT_VERSION_PATCH
12+
#define PRODUCT_VERSION_PATCH @PRODUCT_VERSION_PATCH@
13+
#endif
14+
15+
#ifndef PRODUCT_VERSION_BUILD
16+
#define PRODUCT_VERSION_BUILD @PRODUCT_VERSION_REVISION@
17+
#endif
18+
19+
#ifndef FILE_VERSION_MAJOR
20+
#define FILE_VERSION_MAJOR @PRODUCT_VERSION_MAJOR@
21+
#endif
22+
23+
#ifndef FILE_VERSION_MINOR
24+
#define FILE_VERSION_MINOR @PRODUCT_VERSION_MINOR@
25+
#endif
26+
27+
#ifndef FILE_VERSION_PATCH
28+
#define FILE_VERSION_PATCH @PRODUCT_VERSION_PATCH@
29+
#endif
30+
31+
#ifndef FILE_VERSION_BUILD
32+
#define FILE_VERSION_BUILD @PRODUCT_VERSION_REVISION@
33+
#endif
34+
35+
#ifndef __TO_STRING
36+
#define __TO_STRING_IMPL(x) #x
37+
#define __TO_STRING(x) __TO_STRING_IMPL(x)
38+
#endif
39+
40+
#define PRODUCT_VERSION_MAJOR_MINOR_STR __TO_STRING(PRODUCT_VERSION_MAJOR) "." __TO_STRING(PRODUCT_VERSION_MINOR)
41+
#define PRODUCT_VERSION_MAJOR_MINOR_PATCH_STR PRODUCT_VERSION_MAJOR_MINOR_STR "." __TO_STRING(PRODUCT_VERSION_PATCH)
42+
#define PRODUCT_VERSION_FULL_STR PRODUCT_VERSION_MAJOR_MINOR_PATCH_STR "." __TO_STRING(PRODUCT_VERSION_BUILD)
43+
#define PRODUCT_VERSION_RESOURCE PRODUCT_VERSION_MAJOR,PRODUCT_VERSION_MINOR,PRODUCT_VERSION_PATCH,PRODUCT_VERSION_BUILD
44+
#define PRODUCT_VERSION_RESOURCE_STR PRODUCT_VERSION_FULL_STR "\0"
45+
46+
#define FILE_VERSION_MAJOR_MINOR_STR __TO_STRING(FILE_VERSION_MAJOR) "." __TO_STRING(FILE_VERSION_MINOR)
47+
#define FILE_VERSION_MAJOR_MINOR_PATCH_STR FILE_VERSION_MAJOR_MINOR_STR "." __TO_STRING(FILE_VERSION_PATCH)
48+
#define FILE_VERSION_FULL_STR FILE_VERSION_MAJOR_MINOR_PATCH_STR "." __TO_STRING(FILE_VERSION_BUILD)
49+
#define FILE_VERSION_RESOURCE FILE_VERSION_MAJOR,FILE_VERSION_MINOR,FILE_VERSION_PATCH,FILE_VERSION_BUILD
50+
#define FILE_VERSION_RESOURCE_STR FILE_VERSION_FULL_STR "\0"
51+
52+
#ifndef PRODUCT_INON
53+
#define PRODUCT_ICON "@PRODUCT_ICON@"
54+
#endif
55+
56+
#ifndef PRODUCT_COMMENTS
57+
#define PRODUCT_COMMENTS "@PRODUCT_COMMENTS@\0"
58+
#endif
59+
60+
#ifndef PRODUCT_COMPANY_NAME
61+
#define PRODUCT_COMPANY_NAME "@PRODUCT_COMPANY_NAME@\0"
62+
#endif
63+
64+
#ifndef PRODUCT_COMPANY_COPYRIGHT
65+
#define PRODUCT_COMPANY_COPYRIGHT "@PRODUCT_COMPANY_COPYRIGHT@\0"
66+
#endif
67+
68+
#ifndef PRODUCT_FILE_DESCRIPTION
69+
#define PRODUCT_FILE_DESCRIPTION "@PRODUCT_FILE_DESCRIPTION@\0"
70+
#endif
71+
72+
#ifndef PRODUCT_INTERNAL_NAME
73+
#define PRODUCT_INTERNAL_NAME "@PRODUCT_NAME@\0"
74+
#endif
75+
76+
#ifndef PRODUCT_ORIGINAL_FILENAME
77+
#define PRODUCT_ORIGINAL_FILENAME "@PRODUCT_ORIGINAL_FILENAME@\0"
78+
#endif
79+
80+
#ifndef PRODUCT_BUNDLE
81+
#define PRODUCT_BUNDLE "@PRODUCT_BUNDLE@\0"
82+
#endif

‎Installation/Windows/version/VersionResource.rc

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#include "VersionInfo.h"
2+
#include "winres.h"
3+
4+
IDI_ICON1 ICON PRODUCT_ICON
5+
6+
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
7+
8+
VS_VERSION_INFO VERSIONINFO
9+
FILEVERSION FILE_VERSION_RESOURCE
10+
PRODUCTVERSION PRODUCT_VERSION_RESOURCE
11+
FILEFLAGSMASK 0x3fL
12+
#ifdef _DEBUG
13+
FILEFLAGS 0x1L
14+
#else
15+
FILEFLAGS 0x0L
16+
#endif
17+
FILEOS 0x4L
18+
FILETYPE 0x1L
19+
FILESUBTYPE 0x0L
20+
BEGIN
21+
BLOCK "StringFileInfo"
22+
BEGIN
23+
BLOCK "041904b0"
24+
BEGIN
25+
VALUE "Comments", PRODUCT_COMMENTS
26+
VALUE "CompanyName", PRODUCT_COMPANY_NAME
27+
VALUE "FileDescription", PRODUCT_FILE_DESCRIPTION
28+
VALUE "FileVersion", FILE_VERSION_RESOURCE_STR
29+
VALUE "InternalName", PRODUCT_INTERNAL_NAME
30+
VALUE "LegalCopyright", PRODUCT_COMPANY_COPYRIGHT
31+
VALUE "OriginalFilename", PRODUCT_ORIGINAL_FILENAME
32+
VALUE "ProductName", PRODUCT_BUNDLE
33+
VALUE "ProductVersion", PRODUCT_VERSION_RESOURCE_STR
34+
END
35+
END
36+
BLOCK "VarFileInfo"
37+
BEGIN
38+
VALUE "Translation", 0x419, 1200
39+
END
40+
END

0 commit comments

Comments
 (0)
0