From b6906e840fb585d76fa7366027d98270ccae3f53 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Wed, 15 Feb 2017 15:55:20 +0100 Subject: [PATCH] move symbol server to the build.sh --- Installation/Jenkins/build.sh | 14 ++++++++++++++ cmake/packages/nsis.cmake | 10 ---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Installation/Jenkins/build.sh b/Installation/Jenkins/build.sh index 19b2925eab..b2fcd09280 100755 --- a/Installation/Jenkins/build.sh +++ b/Installation/Jenkins/build.sh @@ -243,6 +243,13 @@ while [ $# -gt 0 ]; do CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DV8_TARGET_ARCHS=Release" ;; + --symsrv) + shift + SYMSRV=1 + SYMSRVDIR=$1 + shift + ;; + --gold) GOLD=1 shift @@ -596,6 +603,13 @@ if test -n "${TARGET_DIR}"; then if [ -n "$CPACK" -a -n "${TARGET_DIR}" ]; then ${PACKAGE_MAKE} copy_packages || exit 1 ${PACKAGE_MAKE} clean_packages || exit 1 + if test "${SYMSRV}" -eq 1; then + echo "Storing symbols:" + export LIST="`pwd`/pdbfiles_list.txt" + find `pwd`/bin/ -name *pdb |grep -v Release |grep -v Debug |grep -v 3rdParty |grep -v vc120.pdb |cygpath -f - --windows > ${LIST} + + symstore.exe add /f @`cygpath --windows ${LIST}` /s "`cygpath --windows ${SYMSRVDIR}`" /t ArangoDB /compress + fi else # we re-use a generic cpack tarball: ${PACKAGE_MAKE} TGZ_package diff --git a/cmake/packages/nsis.cmake b/cmake/packages/nsis.cmake index f1ccc02412..b43a8b43ec 100644 --- a/cmake/packages/nsis.cmake +++ b/cmake/packages/nsis.cmake @@ -115,13 +115,3 @@ add_custom_target(remove_packages list(APPEND CLEAN_PACKAGES_LIST remove_packages) -# set(SYMSRVDIR $ENV{SYMSRV}) -# if (NOT ${SYMSRVDIR} STREQUAL "") -# -# message("Storing symbols:") -# include(../../arangod/CMakeList.txt) -# add_custom_command(TARGET ${BIN_ARANGOD} POST_BUILD -# WORKING_DIRECTORY ${PROJECT_BINARY_DIR} -# COMMAND "find -name \\*pdb |grep -v Release |grep -v Debug |grep -v 3rdParty |grep -v vc120.pdb > pdbfiles_list.txt" -# COMMAND "symstore.exe add /f '@${PROJECT_BINARY_DIR}/pdbfiles_list.txt' /s '${SYMSRVDIR}' /t ArangoDB /compress") -# endif()