Update build and test scripts for latest changes

Author: ali-ince

CMakeCPack.cmake

@@ -23,7 +23,7 @@ set(CPACK_PACKAGE_CHECKSUM "SHA256")
 set(CPACK_SOURCE_IGNORE_FILES "${PROJECT_BINARY_DIR};/.git/;.gitignore;menu.yml")
 set(CPACK_SOURCE_GENERATOR "ZIP;TGZ")
 set(CPACK_GENERATOR "ZIP;TGZ")
-set(CPACK_PACKAGE_DIRECTORY "${PROJECT_BINARY_DIR}/dist")
+set(CPACK_PACKAGE_DIRECTORY "${PROJECT_BINARY_DIR}/dist-package")
 
 if (UNIX)
     if (CMAKE_SYSTEM_NAME MATCHES Linux)

CMakeLists.txt

@@ -56,10 +56,6 @@ else ()
     set(LIBDIR_RELATIVE_PKGCONFIGDIR "../../lib")
 endif ()
 
-message(STATUS ${CMAKE_INSTALL_LIBDIR})
-message(STATUS ${CMAKE_INSTALL_BINDIR})
-message(STATUS ${CMAKE_INSTALL_INCLUDEDIR})
-
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})

COMPATIBILITY

@@ -1,8 +1,10 @@
 # This file holds the Neo4j server versions for which this driver is
 # compatible, one per line. Generally, only the most recent patch of
 # each version should be listed.
-3.3.2
-3.2.3
+3.5.0-beta02
+3.4.9
+3.3.7
+3.2.13
 
 # The following older server versions are disabled due to lack of
 # support for byte arrays.

make.cmd

@@ -28,54 +28,23 @@ Set "CMAKE_BUILD=%~2"
 
 If "%~1" == "MSVC" (
     Set "CMAKE_GENERATOR=Visual Studio 15 2017 Win64"
-    Set "VS_TOOLS_ARCH=x64"
-    Set "VS_TARGET_PLATFORM=x64"
 
     If "%~3" == "x86" (
         Set "CMAKE_GENERATOR=Visual Studio 15 2017"
-        Set "VS_TOOLS_ARCH=x86"
-        Set "VS_TARGET_PLATFORM=Win32"
     )
 )
 
-If "%~1" == "MSVC" (
-	REM Check if in Visual Studio Developer Command Prompt
-	If Not Defined VCINSTALLDIR (
-		For %%D In (Enterprise Professional Community BuildTools) Do (
-			If Exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\%%D\VC\Auxiliary\Build\vcvarsall.bat" (
-				Pushd %cd%
-				Call "C:\Program Files (x86)\Microsoft Visual Studio\2017\%%D\VC\Auxiliary\Build\vcvarsall.bat" %VS_TOOLS_ARCH%
-				If ERRORLEVEL 0 (
-					Popd
-					Goto :FoundVS
-				)
-				Popd
-			)
-		)
-	)
-
-	:FoundVS
-	If Not Defined VCINSTALLDIR (
-		Echo "Visual Studio 2017 Installation Location could not be determined."
-		Echo "Ensure you've it installed and run this script in Visual Studio Developer Command Prompt."
-		Goto :Failure
-	)
-)
-
 If "%~1" == "MINGW" (
     Set "CMAKE_GENERATOR=MinGW Makefiles"
 )
 
 Set SEABOLTDIR=%~dp0
-Pushd %SEABOLTDIR%
-
-cmake.exe -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=%CMAKE_BUILD% || Goto :Failure
+Set BUILDDIR=%SEABOLTDIR%\build
+Mkdir %BUILDDIR%
+Pushd %BUILDDIR%
 
-If "%~1" == "MSVC" (
-	msbuild.exe seabolt-all.sln /p:Platform=%VS_TARGET_PLATFORM% || Goto :Failure
-) Else (
-	mingw32-make.exe || Goto :Failure
-)
+cmake.exe -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=%CMAKE_BUILD% -DCMAKE_INSTALL_PREFIX=dist .. || Goto :Failure
+cmake.exe --build . --target install || Goto :Failure
 
 Popd
 Exit /b 0

make_debug.sh

@@ -1,13 +1,16 @@
 #!/usr/bin/env bash
 
 BASE=$(dirname $0)
+BUILD=${BASE}/build
 
-pushd ${BASE} 1> /dev/null
-cmake -DCMAKE_BUILD_TYPE=Debug .
+mkdir -p ${BUILD} 1>/dev/null
+
+pushd ${BUILD} 1> /dev/null
+cmake -D CMAKE_BUILD_TYPE=Debug -D CMAKE_INSTALL_PREFIX=dist  ..
 EXIT_STATUS=$?
 if [ "${EXIT_STATUS}" -eq "0" ]
 then
-    make
+    cmake --build . --target install
     EXIT_STATUS=$?
 fi
 popd 1> /dev/null

make_packages.sh

@@ -1,13 +1,16 @@
 #!/usr/bin/env bash
 
 BASE=$(dirname $0)
+BUILD=${BASE}/build
 
-pushd ${BASE} 1> /dev/null
-cmake -DCMAKE_BUILD_TYPE=Release .
+mkdir -p ${BUILD} 1>/dev/null
+
+pushd ${BUILD} 1> /dev/null
+cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=dist  ..
 EXIT_STATUS=$?
 if [ "${EXIT_STATUS}" -eq "0" ]
 then
-    make
+    cmake --build . --target install
     EXIT_STATUS=$?
 fi
 popd 1> /dev/null

make_release.sh

@@ -150,7 +150,7 @@ Function RunTests($Version)
         Write-Host "-- Checking server"
         $env:BOLT_PASSWORD=$Password
         $env:BOLT_PORT=$Port
-        & $BaseDir\build\bin\bolt.exe debug "UNWIND range(1, 10000) AS n RETURN n"
+        & $BaseDir\build\bin\seabolt-cli.exe debug "UNWIND range(1, 10000) AS n RETURN n"
         if ( $LASTEXITCODE -ne 0 )
         {
             throw @{ 
@@ -160,7 +160,7 @@ Function RunTests($Version)
         }
 
         Write-Host "-- Running tests"
-        & $BaseDir\build\bin\seabolt-integration-test.exe $TestArgs
+        & $BaseDir\build\bin\seabolt-test.exe $TestArgs
         if ( $LASTEXITCODE -ne 0 )
         {
             throw @{ 

run_tests.ps1

@@ -46,18 +46,8 @@ function check_boltkit
 
 function compile_debug
 {
-    if [ "${OPT_QUICK}" == "0" ]
-    then
-        make clean
-    fi
     echo "Compiling for debug"
-    cmake -DCMAKE_BUILD_TYPE=Debug .
-    if [ "$?" -ne "0" ]
-    then
-        echo "FATAL: Compilation failed."
-        exit ${COMPILATION_FAILED}
-    fi
-    make
+    ${BASE}/make_debug.sh
     if [ "$?" -ne "0" ]
     then
         echo "FATAL: Compilation failed."
@@ -68,14 +58,7 @@ function compile_debug
 function compile_release
 {
     echo "Compiling for release"
-    make clean
-    cmake -DCMAKE_BUILD_TYPE=Release .
-    if [ "$?" -ne "0" ]
-    then
-        echo "FATAL: Compilation failed."
-        exit ${COMPILATION_FAILED}
-    fi
-    make
+    ${BASE}/make_release.sh
     if [ "$?" -ne "0" ]
     then
         echo "FATAL: Compilation failed."
@@ -167,7 +150,7 @@ function run_tests
     if [ "${OPT_QUICK}" == "0" ]
     then
         echo "-- Checking server"
-        BOLT_PASSWORD="${PASSWORD}" BOLT_PORT="${BOLT_PORT}" ${BASE}/build/bin/bolt debug -a "UNWIND range(1, 10000) AS n RETURN n"
+        BOLT_PASSWORD="${PASSWORD}" BOLT_PORT="${BOLT_PORT}" ${BASE}/build/bin/seabolt-cli debug -a "UNWIND range(1, 10000) AS n RETURN n"
         if [ "$?" -ne "0" ]
         then
             echo "FATAL: Server checks failed."
@@ -176,7 +159,7 @@ function run_tests
     fi
 
     echo "-- Running tests"
-    BOLT_PORT="${BOLT_PORT}" ${BASE}/build/bin/seabolt-integration-test ${TEST_ARGS}
+    BOLT_PORT="${BOLT_PORT}" ${BASE}/build/bin/seabolt-test ${TEST_ARGS}
     if [ "$?" -ne "0" ]
     then
         echo "FATAL: Test execution failed."