Fixed issue #69: Building with spaces in path.

end2endzone · Apr 16, 2021 · 3dcb7e4 · 3dcb7e4
1 parent 5ca6c85
commit 3dcb7e4
Show file tree

Hide file tree

Showing 13 changed files with 103 additions and 83 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,7 @@
 Changes for 0.9.2:
 
 * Fixed issue #68: Simplify building process with scripts and INSTALL documentation (again).
+* Fixed issue #69: Building with spaces in path.
 
 
 Changes for 0.9.1:

diff --git a/ci/linux/build_all_debug.sh b/ci/linux/build_all_debug.sh
@@ -3,12 +3,12 @@ set -e
 
 # Set RAPIDASSIST_SOURCE_DIR root directory
 if [ "$RAPIDASSIST_SOURCE_DIR" = "" ]; then
-  RESTORE_DIRECTORY=$PWD
+  RESTORE_DIRECTORY="$PWD"
   cd "$(dirname "$0")"
   cd ../..
-  export RAPIDASSIST_SOURCE_DIR=$PWD
+  export RAPIDASSIST_SOURCE_DIR="$PWD"
   echo "RAPIDASSIST_SOURCE_DIR set to '$RAPIDASSIST_SOURCE_DIR'."
-  cd $RESTORE_DIRECTORY
+  cd "$RESTORE_DIRECTORY"
   unset RESTORE_DIRECTORY
 fi
 
@@ -17,7 +17,7 @@ export RAPIDASSIST_BUILD_TYPE=Debug
 echo "RAPIDASSIST_BUILD_TYPE set to '$RAPIDASSIST_BUILD_TYPE'."
 
 # Call all build scripts one by one.
-cd $RAPIDASSIST_SOURCE_DIR/ci/linux && ./install_googletest.sh;
-cd $RAPIDASSIST_SOURCE_DIR/ci/linux && ./build_library.sh;
-cd $RAPIDASSIST_SOURCE_DIR/ci/linux && ./build_client.sh;
-cd $RAPIDASSIST_SOURCE_DIR/ci/linux && ./test_script.sh;
+cd "$RAPIDASSIST_SOURCE_DIR/ci/linux" && ./install_googletest.sh;
+cd "$RAPIDASSIST_SOURCE_DIR/ci/linux" && ./build_library.sh;
+cd "$RAPIDASSIST_SOURCE_DIR/ci/linux" && ./build_client.sh;
+cd "$RAPIDASSIST_SOURCE_DIR/ci/linux" && ./test_script.sh;
diff --git a/ci/linux/build_all_release.sh b/ci/linux/build_all_release.sh
@@ -3,12 +3,12 @@ set -e
 
 # Set RAPIDASSIST_SOURCE_DIR root directory
 if [ "$RAPIDASSIST_SOURCE_DIR" = "" ]; then
-  RESTORE_DIRECTORY=$PWD
+  RESTORE_DIRECTORY="$PWD"
   cd "$(dirname "$0")"
   cd ../..
-  export RAPIDASSIST_SOURCE_DIR=$PWD
+  export RAPIDASSIST_SOURCE_DIR="$PWD"
   echo "RAPIDASSIST_SOURCE_DIR set to '$RAPIDASSIST_SOURCE_DIR'."
-  cd $RESTORE_DIRECTORY
+  cd "$RESTORE_DIRECTORY"
   unset RESTORE_DIRECTORY
 fi
 
@@ -17,7 +17,7 @@ export RAPIDASSIST_BUILD_TYPE=Release
 echo "RAPIDASSIST_BUILD_TYPE set to '$RAPIDASSIST_BUILD_TYPE'."
 
 # Call all build scripts one by one.
-cd $RAPIDASSIST_SOURCE_DIR/ci/linux && ./install_googletest.sh;
-cd $RAPIDASSIST_SOURCE_DIR/ci/linux && ./build_library.sh;
-cd $RAPIDASSIST_SOURCE_DIR/ci/linux && ./build_client.sh;
-cd $RAPIDASSIST_SOURCE_DIR/ci/linux && ./test_script.sh;
+cd "$RAPIDASSIST_SOURCE_DIR/ci/linux" && ./install_googletest.sh;
+cd "$RAPIDASSIST_SOURCE_DIR/ci/linux" && ./build_library.sh;
+cd "$RAPIDASSIST_SOURCE_DIR/ci/linux" && ./build_client.sh;
+cd "$RAPIDASSIST_SOURCE_DIR/ci/linux" && ./test_script.sh;
diff --git a/ci/linux/build_client.sh b/ci/linux/build_client.sh
@@ -9,28 +9,28 @@ fi
 
 # Set RAPIDASSIST_SOURCE_DIR root directory
 if [ "$RAPIDASSIST_SOURCE_DIR" = "" ]; then
-  RESTORE_DIRECTORY=$PWD
+  RESTORE_DIRECTORY="$PWD"
   cd "$(dirname "$0")"
   cd ../..
-  export RAPIDASSIST_SOURCE_DIR=$PWD
+  export RAPIDASSIST_SOURCE_DIR="$PWD"
   echo "RAPIDASSIST_SOURCE_DIR set to '$RAPIDASSIST_SOURCE_DIR'."
-  cd $RESTORE_DIRECTORY
+  cd "$RESTORE_DIRECTORY"
   unset RESTORE_DIRECTORY
 fi
 
 # Prepare CMAKE parameters
-export CMAKE_INSTALL_PREFIX=$RAPIDASSIST_SOURCE_DIR/install
+export CMAKE_INSTALL_PREFIX="$RAPIDASSIST_SOURCE_DIR/install"
 unset CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$RAPIDASSIST_SOURCE_DIR/third_parties/googletest/install"
 export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$RAPIDASSIST_SOURCE_DIR/install"
 
 echo ============================================================================
 echo Generating RapidAssist client example...
 echo ============================================================================
-cd $RAPIDASSIST_SOURCE_DIR/client
+cd "$RAPIDASSIST_SOURCE_DIR/client"
 mkdir -p build
 cd build
-cmake -DCMAKE_BUILD_TYPE=$RAPIDASSIST_BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" ..
+cmake -DCMAKE_BUILD_TYPE=$RAPIDASSIST_BUILD_TYPE -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" ..
 
 echo ============================================================================
 echo Compiling RapidAssist client example...

diff --git a/ci/linux/build_library.sh b/ci/linux/build_library.sh
@@ -9,27 +9,27 @@ fi
 
 # Set RAPIDASSIST_SOURCE_DIR root directory
 if [ "$RAPIDASSIST_SOURCE_DIR" = "" ]; then
-  RESTORE_DIRECTORY=$PWD
+  RESTORE_DIRECTORY="$PWD"
   cd "$(dirname "$0")"
   cd ../..
-  export RAPIDASSIST_SOURCE_DIR=$PWD
+  export RAPIDASSIST_SOURCE_DIR="$PWD"
   echo "RAPIDASSIST_SOURCE_DIR set to '$RAPIDASSIST_SOURCE_DIR'."
-  cd $RESTORE_DIRECTORY
+  cd "$RESTORE_DIRECTORY"
   unset RESTORE_DIRECTORY
 fi
 
 # Prepare CMAKE parameters
-export CMAKE_INSTALL_PREFIX=$RAPIDASSIST_SOURCE_DIR/install
+export CMAKE_INSTALL_PREFIX="$RAPIDASSIST_SOURCE_DIR/install"
 unset CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$RAPIDASSIST_SOURCE_DIR/third_parties/googletest/install"
 
 echo ============================================================================
 echo Generating RapidAssist library...
 echo ============================================================================
-cd $RAPIDASSIST_SOURCE_DIR
+cd "$RAPIDASSIST_SOURCE_DIR"
 mkdir -p build
 cd build
-cmake -DCMAKE_BUILD_TYPE=$RAPIDASSIST_BUILD_TYPE -DRAPIDASSIST_BUILD_TEST=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" ..
+cmake -DCMAKE_BUILD_TYPE=$RAPIDASSIST_BUILD_TYPE -DRAPIDASSIST_BUILD_TEST=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" ..
 
 echo ============================================================================
 echo Compiling RapidAssist library...

diff --git a/ci/linux/install_googletest.sh b/ci/linux/install_googletest.sh
@@ -9,25 +9,25 @@ fi
 
 # Set RAPIDASSIST_SOURCE_DIR root directory
 if [ "$RAPIDASSIST_SOURCE_DIR" = "" ]; then
-  RESTORE_DIRECTORY=$PWD
+  RESTORE_DIRECTORY="$PWD"
   cd "$(dirname "$0")"
   cd ../..
-  export RAPIDASSIST_SOURCE_DIR=$PWD
+  export RAPIDASSIST_SOURCE_DIR="$PWD"
   echo "RAPIDASSIST_SOURCE_DIR set to '$RAPIDASSIST_SOURCE_DIR'."
-  cd $RESTORE_DIRECTORY
+  cd "$RESTORE_DIRECTORY"
   unset RESTORE_DIRECTORY
 fi
 
 # Prepare CMAKE parameters
-export CMAKE_INSTALL_PREFIX=$RAPIDASSIST_SOURCE_DIR/third_parties/googletest/install
+export CMAKE_INSTALL_PREFIX="$RAPIDASSIST_SOURCE_DIR/third_parties/googletest/install"
 unset CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;"
 
 echo ============================================================================
 echo Cloning googletest into $RAPIDASSIST_SOURCE_DIR/third_parties/googletest
 echo ============================================================================
-mkdir -p $RAPIDASSIST_SOURCE_DIR/third_parties
-cd $RAPIDASSIST_SOURCE_DIR/third_parties
+mkdir -p "$RAPIDASSIST_SOURCE_DIR/third_parties"
+cd "$RAPIDASSIST_SOURCE_DIR/third_parties"
 git clone "https://github.com/google/googletest.git"
 cd googletest
 echo
@@ -41,7 +41,7 @@ echo Compiling googletest...
 echo ============================================================================
 mkdir -p build
 cd build
-cmake -DCMAKE_BUILD_TYPE=$RAPIDASSIST_BUILD_TYPE -DBUILD_SHARED_LIBS=OFF -DBUILD_GMOCK=OFF -DBUILD_GTEST=ON -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" ..
+cmake -DCMAKE_BUILD_TYPE=$RAPIDASSIST_BUILD_TYPE -DBUILD_SHARED_LIBS=OFF -DBUILD_GMOCK=OFF -DBUILD_GTEST=ON -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" ..
 cmake --build . -- -j4
 echo
 

diff --git a/ci/linux/test_script.sh b/ci/linux/test_script.sh
@@ -9,19 +9,19 @@ fi
 
 # Set RAPIDASSIST_SOURCE_DIR root directory
 if [ "$RAPIDASSIST_SOURCE_DIR" = "" ]; then
-  RESTORE_DIRECTORY=$PWD
+  RESTORE_DIRECTORY="$PWD"
   cd "$(dirname "$0")"
   cd ../..
-  export RAPIDASSIST_SOURCE_DIR=$PWD
+  export RAPIDASSIST_SOURCE_DIR="$PWD"
   echo "RAPIDASSIST_SOURCE_DIR set to '$RAPIDASSIST_SOURCE_DIR'."
-  cd $RESTORE_DIRECTORY
+  cd "$RESTORE_DIRECTORY"
   unset RESTORE_DIRECTORY
 fi
 
 echo ============================================================================
 echo Testing RapidAssist library...
 echo ============================================================================
-cd $RAPIDASSIST_SOURCE_DIR/build/bin;
+cd "$RAPIDASSIST_SOURCE_DIR/build/bin"
 if [ "$RAPIDASSIST_BUILD_TYPE" = "Debug" ]; then
   ./rapidassist_unittest-d || true; #do not fail build even if a test fails.
 else

diff --git a/ci/windows/build_all_debug.bat b/ci/windows/build_all_debug.bat
@@ -1,13 +1,16 @@
 @echo off
 
 :: Set RAPIDASSIST_SOURCE_DIR root directory
+setlocal enabledelayedexpansion
 if "%RAPIDASSIST_SOURCE_DIR%"=="" (
-  cd /d %~dp0
+  :: Delayed expansion is required within parentheses https://superuser.com/questions/78496/variables-in-batch-file-not-being-set-when-inside-if
+  cd /d "%~dp0"
   cd ..\..
-  set RAPIDASSIST_SOURCE_DIR=%CD%
-  echo RAPIDASSIST_SOURCE_DIR set to '%RAPIDASSIST_SOURCE_DIR%'.
-  cd /d %~dp0
+  set RAPIDASSIST_SOURCE_DIR=!CD!
+  cd ..\..
+  echo RAPIDASSIST_SOURCE_DIR set to '!RAPIDASSIST_SOURCE_DIR!'.
 )
+endlocal & set RAPIDASSIST_SOURCE_DIR=%RAPIDASSIST_SOURCE_DIR%
 
 :: Set build configuration parameters
 set Configuration=Debug
@@ -17,16 +20,16 @@ echo Building RapidAssist for Windows in %Configuration%, %Platform% configurati
 echo.
 
 :: Return back to scripts folder
-cd /d %~dp0
+cd /d "%~dp0"
 
 :: Call windows scripts one by one.
-call %RAPIDASSIST_SOURCE_DIR%\ci\windows\install_googletest.bat
+call "%RAPIDASSIST_SOURCE_DIR%\ci\windows\install_googletest.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%
-call %RAPIDASSIST_SOURCE_DIR%\ci\windows\build_library.bat
+call "%RAPIDASSIST_SOURCE_DIR%\ci\windows\build_library.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%
-call %RAPIDASSIST_SOURCE_DIR%\ci\windows\build_client.bat
+call "%RAPIDASSIST_SOURCE_DIR%\ci\windows\build_client.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%
-call %RAPIDASSIST_SOURCE_DIR%\ci\windows\test_script.bat
+call "%RAPIDASSIST_SOURCE_DIR%\ci\windows\test_script.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%
 
 :: Press a key to continue

diff --git a/ci/windows/build_all_release.bat b/ci/windows/build_all_release.bat
@@ -1,13 +1,16 @@
 @echo off
 
 :: Set RAPIDASSIST_SOURCE_DIR root directory
+setlocal enabledelayedexpansion
 if "%RAPIDASSIST_SOURCE_DIR%"=="" (
-  cd /d %~dp0
+  :: Delayed expansion is required within parentheses https://superuser.com/questions/78496/variables-in-batch-file-not-being-set-when-inside-if
+  cd /d "%~dp0"
   cd ..\..
-  set RAPIDASSIST_SOURCE_DIR=%CD%
-  echo RAPIDASSIST_SOURCE_DIR set to '%RAPIDASSIST_SOURCE_DIR%'.
-  cd /d %~dp0
+  set RAPIDASSIST_SOURCE_DIR=!CD!
+  cd ..\..
+  echo RAPIDASSIST_SOURCE_DIR set to '!RAPIDASSIST_SOURCE_DIR!'.
 )
+endlocal & set RAPIDASSIST_SOURCE_DIR=%RAPIDASSIST_SOURCE_DIR%
 
 :: Set build configuration parameters
 set Configuration=Release
@@ -17,16 +20,16 @@ echo Building RapidAssist for Windows in %Configuration%, %Platform% configurati
 echo.
 
 :: Return back to scripts folder
-cd /d %~dp0
+cd /d "%~dp0"
 
 :: Call windows scripts one by one.
-call %RAPIDASSIST_SOURCE_DIR%\ci\windows\install_googletest.bat
+call "%RAPIDASSIST_SOURCE_DIR%\ci\windows\install_googletest.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%
-call %RAPIDASSIST_SOURCE_DIR%\ci\windows\build_library.bat
+call "%RAPIDASSIST_SOURCE_DIR%\ci\windows\build_library.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%
-call %RAPIDASSIST_SOURCE_DIR%\ci\windows\build_client.bat
+call "%RAPIDASSIST_SOURCE_DIR%\ci\windows\build_client.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%
-call %RAPIDASSIST_SOURCE_DIR%\ci\windows\test_script.bat
+call "%RAPIDASSIST_SOURCE_DIR%\ci\windows\test_script.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%
 
 :: Press a key to continue

diff --git a/ci/windows/build_client.bat b/ci/windows/build_client.bat
@@ -11,13 +11,16 @@ if "%Platform%"=="" (
 )
 
 :: Set RAPIDASSIST_SOURCE_DIR root directory
+setlocal enabledelayedexpansion
 if "%RAPIDASSIST_SOURCE_DIR%"=="" (
-  cd /d %~dp0
+  :: Delayed expansion is required within parentheses https://superuser.com/questions/78496/variables-in-batch-file-not-being-set-when-inside-if
+  cd /d "%~dp0"
   cd ..\..
-  set RAPIDASSIST_SOURCE_DIR=%CD%
-  echo RAPIDASSIST_SOURCE_DIR set to '%RAPIDASSIST_SOURCE_DIR%'.
-  cd /d %~dp0
+  set RAPIDASSIST_SOURCE_DIR=!CD!
+  cd ..\..
+  echo RAPIDASSIST_SOURCE_DIR set to '!RAPIDASSIST_SOURCE_DIR!'.
 )
+endlocal & set RAPIDASSIST_SOURCE_DIR=%RAPIDASSIST_SOURCE_DIR%
 
 :: Prepare CMAKE parameters
 set CMAKE_INSTALL_PREFIX=%RAPIDASSIST_SOURCE_DIR%\install
@@ -28,10 +31,10 @@ set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%RAPIDASSIST_SOURCE_DIR%\install
 echo ============================================================================
 echo Generating RapidAssist client example...
 echo ============================================================================
-cd /d %RAPIDASSIST_SOURCE_DIR%\client
+cd /d "%RAPIDASSIST_SOURCE_DIR%\client"
 mkdir build >NUL 2>NUL
 cd build
-cmake -DCMAKE_GENERATOR_PLATFORM=%Platform% -T %PlatformToolset% -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DCMAKE_PREFIX_PATH="%CMAKE_PREFIX_PATH%" ..
+cmake -DCMAKE_GENERATOR_PLATFORM=%Platform% -T %PlatformToolset% -DCMAKE_INSTALL_PREFIX="%CMAKE_INSTALL_PREFIX%" -DCMAKE_PREFIX_PATH="%CMAKE_PREFIX_PATH%" ..
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo ============================================================================
@@ -42,4 +45,4 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 echo.
 
 ::Return to launch folder
-cd /d %~dp0
+cd /d "%~dp0"
diff --git a/ci/windows/build_library.bat b/ci/windows/build_library.bat
@@ -11,13 +11,16 @@ if "%Platform%"=="" (
 )
 
 :: Set RAPIDASSIST_SOURCE_DIR root directory
+setlocal enabledelayedexpansion
 if "%RAPIDASSIST_SOURCE_DIR%"=="" (
-  cd /d %~dp0
+  :: Delayed expansion is required within parentheses https://superuser.com/questions/78496/variables-in-batch-file-not-being-set-when-inside-if
+  cd /d "%~dp0"
   cd ..\..
-  set RAPIDASSIST_SOURCE_DIR=%CD%
-  echo RAPIDASSIST_SOURCE_DIR set to '%RAPIDASSIST_SOURCE_DIR%'.
-  cd /d %~dp0
+  set RAPIDASSIST_SOURCE_DIR=!CD!
+  cd ..\..
+  echo RAPIDASSIST_SOURCE_DIR set to '!RAPIDASSIST_SOURCE_DIR!'.
 )
+endlocal & set RAPIDASSIST_SOURCE_DIR=%RAPIDASSIST_SOURCE_DIR%
 
 :: Prepare CMAKE parameters
 set CMAKE_INSTALL_PREFIX=%RAPIDASSIST_SOURCE_DIR%\install
@@ -27,10 +30,10 @@ set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%RAPIDASSIST_SOURCE_DIR%\third_parties
 echo ============================================================================
 echo Generating RapidAssist library...
 echo ============================================================================
-cd /d %RAPIDASSIST_SOURCE_DIR%
+cd /d "%RAPIDASSIST_SOURCE_DIR%"
 mkdir build >NUL 2>NUL
 cd build
-cmake -DCMAKE_GENERATOR_PLATFORM=%Platform% -T %PlatformToolset% -DRAPIDASSIST_BUILD_TEST=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DCMAKE_PREFIX_PATH="%CMAKE_PREFIX_PATH%" ..
+cmake -DCMAKE_GENERATOR_PLATFORM=%Platform% -T %PlatformToolset% -DRAPIDASSIST_BUILD_TEST=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="%CMAKE_INSTALL_PREFIX%" -DCMAKE_PREFIX_PATH="%CMAKE_PREFIX_PATH%" ..
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo ============================================================================
@@ -48,4 +51,4 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 echo.
 
 ::Return to launch folder
-cd /d %~dp0
+cd /d "%~dp0"