remove v8 dependency for arangoimp

DoKittle · Jun 18, 2015 · 9929e6c · 9929e6c
1 parent 10f7b61
commit 9929e6c
Show file tree

Hide file tree

Showing 6 changed files with 265 additions and 161 deletions.
diff --git a/arangosh/CMakeLists.txt b/arangosh/CMakeLists.txt
@@ -97,16 +97,13 @@ add_executable(
     ${BIN_ARANGOIMP}
     ArangoShell/ArangoClient.cpp
     V8Client/ImportHelper.cpp
-    V8Client/V8ClientConnection.cpp
     V8Client/arangoimp.cpp
 )
 
 target_link_libraries(
     ${BIN_ARANGOIMP}
-    ${LIB_ARANGO_V8}
     ${LIB_ARANGO_CLIENT}
     ${LIB_ARANGO}
-    ${V8_LIBS}
     ${ICU_LIBS}
     ${BT_LIBS}
     ${ZLIB_LIBS}

diff --git a/arangosh/Makefile.files b/arangosh/Makefile.files
@@ -47,16 +47,13 @@ bin_arangoimp_CPPFLAGS = \
 	$(AM_CPPFLAGS) 
 
 bin_arangoimp_LDADD = \
-	lib/libarango_v8.a \
 	lib/libarango_client.a \
 	lib/libarango.a \
-	$(LIBS) \
-	@V8_LIBS@
+	$(LIBS) 
 
 bin_arangoimp_SOURCES = \
 	arangosh/ArangoShell/ArangoClient.cpp \
 	arangosh/V8Client/ImportHelper.cpp \
-	arangosh/V8Client/V8ClientConnection.cpp \
 	arangosh/V8Client/arangoimp.cpp
 
 ################################################################################

diff --git a/arangosh/V8Client/arangodump.cpp b/arangosh/V8Client/arangodump.cpp
@@ -304,7 +304,7 @@ static string GetArangoVersion () {
 
   SimpleHttpResult* response = Client->request(HttpRequest::HTTP_REQUEST_GET,
                                                "/_api/version",
-                                               0,
+                                               nullptr,
                                                0,
                                                headers);