Merge branch 'solaris' of https://github.com/arangodb/arangodb into solaris

3rdParty/V8/CMakeLists.txt

@@ -51,6 +51,7 @@ list(APPEND V8_GYP_ARGS
     --generator-output=${V8_TARGET_DIR}
     -Dv8_target_arch=${V8_PROC_ARCH}
     -Dbyteorder=${ENDIANESS}
+    -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
 )
 
 if (DEBUG)
@@ -67,7 +68,6 @@ set(V8_COMPILE_ARGS
   builddir=${V8_TARGET_DIR}/${V8_TARGET_ARCH}
   CC=${CMAKE_C_COMPILER}
   CXX=${CMAKE_CXX_COMPILER}
-  PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
   )
 
 
@@ -147,25 +147,9 @@ if (MSBUILD)
     WORKING_DIRECTORY ${V8_DIR}/build
     SOURCE_DIR "${V8_DIR}"
     CONFIGURE_COMMAND ${PYTHON_EXECUTABLE} ${GYP_MAIN} ${V8_GYP_ARGS}
-    BUILD_COMMAND msbuild all.sln /t:v8 /p:Configuration=Debug /p:Platform=${MS_TARGET_PLATFORM}
+    BUILD_COMMAND 
     INSTALL_COMMAND "")
 
-  # cmake eats semicolons or quotes them or, or, or so we can't use /t:a;b;c
-  ExternalProject_Add_Step(v8_build v8_build_v8
-    WORKING_DIRECTORY ${V8_DIR}/build
-    COMMAND msbuild all.sln /t:v8 /p:Configuration=Debug /p:Platform=${MS_TARGET_PLATFORM}
-    DEPENDEES configure
-    DEPENDERS build)
-  ExternalProject_Add_Step(v8_build v8_build_v8_libbase
-    WORKING_DIRECTORY ${V8_DIR}/build
-    COMMAND msbuild all.sln /t:v8_libbase /p:Configuration=Debug /p:Platform=${MS_TARGET_PLATFORM}
-    DEPENDEES configure
-    DEPENDERS build)
-  ExternalProject_Add_Step(v8_build v8_build_v8_libplatform
-    WORKING_DIRECTORY ${V8_DIR}/build
-    COMMAND msbuild all.sln /t:v8_libplatform /p:Configuration=Debug /p:Platform=${MS_TARGET_PLATFORM}
-    DEPENDEES configure
-    DEPENDERS build)
 
   # and now ICU...
   ExternalProject_Add_Step(v8_build icu_build_icudata
@@ -186,6 +170,22 @@ if (MSBUILD)
     DEPENDEES configure
     DEPENDERS build)
 
+  # cmake eats semicolons or quotes them or, or, or so we can't use /t:a;b;c
+  ExternalProject_Add_Step(v8_build v8_build_v8
+    WORKING_DIRECTORY ${V8_DIR}/build
+    COMMAND msbuild all.sln /t:v8 /p:Configuration=Debug /p:Platform=${MS_TARGET_PLATFORM}
+    DEPENDEES configure
+    DEPENDERS build)
+  ExternalProject_Add_Step(v8_build v8_build_v8_libbase
+    WORKING_DIRECTORY ${V8_DIR}/build
+    COMMAND msbuild all.sln /t:v8_libbase /p:Configuration=Debug /p:Platform=${MS_TARGET_PLATFORM}
+    DEPENDEES configure
+    DEPENDERS build)
+  ExternalProject_Add_Step(v8_build v8_build_v8_libplatform
+    WORKING_DIRECTORY ${V8_DIR}/build
+    COMMAND msbuild all.sln /t:v8_libplatform /p:Configuration=Debug /p:Platform=${MS_TARGET_PLATFORM}
+    DEPENDEES configure
+    DEPENDERS build)
 
 else()
   ExternalProject_Add(v8_build

3rdParty/V8/V8-4.3.61/src/d8.gyp

@@ -128,7 +128,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
           ],
           'action': [
-            '$(PYTHON_EXECUTABLE)',
+            '<(PYTHON_EXECUTABLE)>',
             '../tools/js2c.py',
             '<@(_outputs)',
             'D8',

3rdParty/V8/V8-4.3.61/test/cctest/cctest.gyp

@@ -320,7 +320,7 @@
             '<(generated_file)',
           ],
           'action': [
-            '$(PYTHON_EXECUTABLE)',
+            '<(PYTHON_EXECUTABLE)>',
             '../../tools/js2c.py',
             '<@(_outputs)',
             'TEST',  # type

3rdParty/V8/V8-4.3.61/tools/gyp/v8.gyp

@@ -1738,7 +1738,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
           ],
           'action': [
-            '$(PYTHON_EXECUTABLE)',
+            '<(PYTHON_EXECUTABLE)>',
             '../../tools/js2c.py',
             '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
             'CORE',
@@ -1757,7 +1757,7 @@
         {
           'action_name': 'js2c_experimental',
           'inputs': [
-            '$(PYTHON_EXECUTABLE)',
+            '<(PYTHON_EXECUTABLE)>',
             '../../tools/js2c.py',
             '<@(experimental_library_files)',
           ],
@@ -1765,7 +1765,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
           ],
           'action': [
-            '$(PYTHON_EXECUTABLE)',
+            '<(PYTHON_EXECUTABLE)>',
             '../../tools/js2c.py',
             '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
             'EXPERIMENTAL',