From 546e9fd68ee74ec5319e660043f6791d6dc049fd Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Fri, 5 Jan 2018 13:29:00 +0100 Subject: [PATCH] build client path the same way in the client package as in the server package. (#4227) (#4231) --- cmake/packages/client/nsis.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cmake/packages/client/nsis.txt b/cmake/packages/client/nsis.txt index ed893ad2b6..1935691b59 100644 --- a/cmake/packages/client/nsis.txt +++ b/cmake/packages/client/nsis.txt @@ -136,6 +136,8 @@ file(TO_NATIVE_PATH "resources/Icons/arangodb.ico" RELATIVE_ARANGO_ICON) file(TO_NATIVE_PATH "${ICON_PATH}arangodb.bmp" ARANGO_IMG) file(TO_NATIVE_PATH "${ICON_PATH}/arangodb.ico" ARANGO_ICON) +STRING(REGEX REPLACE "/" "\\\\\\\\" W_SBIN_DIR "${CMAKE_INSTALL_SBINDIR}") +STRING(REGEX REPLACE "/" "\\\\\\\\" W_BIN_DIR "${CMAKE_INSTALL_BINDIR}") STRING(REGEX REPLACE "\\\\" "\\\\\\\\" RELATIVE_ARANGO_ICON "${RELATIVE_ARANGO_ICON}") STRING(REGEX REPLACE "\\\\" "\\\\\\\\" ARANGO_IMG "${ARANGO_IMG}") STRING(REGEX REPLACE "\\\\" "\\\\\\\\" ARANGO_ICON "${ARANGO_ICON}") @@ -148,18 +150,22 @@ set(CPACK_NSIS_INSTALLED_ICON_NAME ${RELATIVE_ARANGO_ICON}) message(STATUS "RELATIVE_ARANGO_ICON: ${RELATIVE_ARANGO_ICON}") message(STATUS "ARANGO_IMG: ${ARANGO_IMG}") message(STATUS "ARANGO_ICON: ${ARANGO_ICON}") +message(STATUS "W_SBIN_DIR: ${W_SBIN_DIR} ${CMAKE_INSTALL_SBINDIR} ") +message(STATUS "W_BIN_DIR: ${W_BIN_DIR} ${CMAKE_INSTALL_BINDIR} ") # versioning set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${W_INSTALL_FILES}/version") include("${W_INSTALL_FILES}/version/generate_product_version.cmake") + + set(CPACK_ARANGODB_NSIS_DEFINES " !define BITS ${BITS} !define TRI_FRIENDLY_SVC_NAME '${ARANGODB_FRIENDLY_STRING}' - !define TRI_AARDVARK_URL 'http://127.0.0.1:8529' - !define SBIN_DIR '${CMAKE_INSTALL_SBINDIR}' - !define BIN_DIR '${CMAKE_INSTALL_BINDIR}' + !define TRI_AARDVARK_URL 'http://127.0.0.1:8529/_db/_system/_admin/aardvark/index.html' + !define SBIN_DIR '${W_SBIN_DIR}' + !define BIN_DIR '${W_BIN_DIR}' ")