p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More error checking and few bugfixes.

This commit is contained in:
Marc Garcia Puig 2018-05-23 16:01:17 +02:00
parent 080b7a1d5a
commit 71310533be
6 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -77,7 +77,7 @@ clean_linux:
@rm -Rf $(BASE_BUILD_FOLDER) $(INSTALL_FOLDER) Doxygen
clean_windows:
-@rd /s /q "$(BASE_BUILD_FOLDER)" "$(INSTALL_FOLDER)" Doxygen 2>nul
-@rd /s /q "$(BASE_BUILD_FOLDER)" "$(INSTALL_FOLDER)" Doxygen
### Test #######################################################################
@ -101,4 +101,4 @@ kill_test_clients:
@echo "Kill echo client"
@kill `cat echo_client.pid` && rm echo_client.pid
@echo "Kill carla client"
@kill `cat carla_client.pid` && rm carla_client.pid
@kill `cat carla_client.pid` && rm carla_client.pid

7
Rebuild.bat
View File

@ -39,6 +39,13 @@ start %CARLA_FOLDER%CarlaUE4.uproject
:success
goto eof
:error_git
echo %FILE_N% [GIT ERROR] An error ocurred while executing the git.
echo %FILE_N% [GIT ERROR] Possible causes:
echo %FILE_N% - Make sure "git" is installed.
echo %FILE_N% - Make sure it is available on your Windows "path".
goto bad_exit
:compiling_error
echo.
echo.

8
Setup.bat
View File

@ -80,9 +80,11 @@ goto success
:success
echo.
echo.
echo #############################
echo # IMPORTANT #
echo #############################
echo ###########
echo # SUCCESS #
echo ###########
echo.
echo IMPORTANT!
echo.
echo All the CARLA library dependences should be installed now.
echo (You can remove all "*-src" folders in %INSTALLATION_DIR% directory)

17
Util/InstallersWin/install_boost.bat
View File

@ -48,6 +48,7 @@ if not exist "%B_SRC_DIR%" (
call git clone --depth=1 -b %B_VERSION% ^
--recurse-submodules -j8 ^
https://github.com/boostorg/boost.git %B_SRC_DIR%
if errorlevel 1 goto error_git
echo.
) else (
echo %FILE_N% Not cloning boost because already exists a folder called "%B_SRC%".
@ -88,7 +89,7 @@ cd %BUILD_DIR%
rem Remove the downloaded protobuf source because is no more needed
rem if you want to keep the source just delete the following command.
rem @rd /s /q %B_SRC_DIR% 2>nul
rem @rd /s /q %B_SRC_DIR%
goto success
@ -102,12 +103,22 @@ goto success
echo %FILE_N% Delete "%B_INSTALL_DIR%" if you want to force a rebuild.
goto good_exit
:error_git
echo.
echo %FILE_N% [GIT ERROR] An error ocurred while executing the git.
echo %FILE_N% [GIT ERROR] Possible causes:
echo %FILE_N% - Make sure "git" is installed.
echo %FILE_N% - Make sure it is available on your Windows "path".
goto bad_exit
:error_bootstrap
echo %FILE_N% [ERROR] An error ocurred while executing the "bootstrap.bat".
echo.
echo %FILE_N% [BOOTSTRAP ERROR] An error ocurred while executing "bootstrap.bat".
goto bad_exit
:error_install
echo %FILE_N% [ERROR] An error ocurred while installing.
echo.
echo %FILE_N% [B2 ERROR] An error ocurred while installing using "b2.exe".
goto bad_exit
:good_exit

26
Util/InstallersWin/install_proto.bat
View File

@ -41,7 +41,9 @@ if not exist "%P_SRC_DIR%" (
echo %FILE_N% Cloning Protobuf - version "%P_VERSION%"...
echo.
call git clone --depth=1 -b %P_VERSION% https://github.com/google/protobuf.git %P_SRC_DIR%
if errorlevel 1 goto error_git
echo.
) else (
echo %FILE_N% Not cloning protobuf because already exists a folder called "%P_SRC%".
)
@ -71,7 +73,7 @@ if errorlevel 1 goto error_install
rem Remove the downloaded protobuf source because is no more needed
rem if you want to keep the source just delete the following command.
rem rd /s /q %P_SRC_DIR% 2>nul
rem rd /s /q %P_SRC_DIR%
goto success
@ -85,12 +87,30 @@ goto success
echo %FILE_N% Delete "%P_INSTALL_DIR%" if you want to force a rebuild.
goto good_exit
:error_git
echo.
echo %FILE_N% [GIT ERROR] An error ocurred while executing the git.
echo %FILE_N% [GIT ERROR] Possible causes:
echo %FILE_N% - Make sure "git" is installed.
echo %FILE_N% - Make sure it is available on your Windows "path".
goto bad_exit
:error_cmake
echo %FILE_N% [ERROR] An error ocurred while executing the cmake.
echo.
echo %FILE_N% [CMAKE ERROR] An error ocurred while executing the cmake.
echo %FILE_N% [CMAKE ERROR] Possible causes:
echo %FILE_N% - Make sure "CMake" is installed.
echo %FILE_N% - Make sure it is available on your Windows "path".
goto bad_exit
:error_install
echo %FILE_N% [ERROR] An error ocurred while installing.
echo.
echo %FILE_N% [NMAKE ERROR] An error ocurred while installing using NMake.
echo %FILE_N% [NMAKE ERROR] Possible causes:
echo %FILE_N% - Make sure you have Visual Studio installed.
echo %FILE_N% - Make sure you have the "x64 Visual C++ Toolset" in your path.
echo %FILE_N% For example using the "Visual Studio x64 Native Tools Command Prompt",
echo %FILE_N% or the "vcvarsall.bat".
goto bad_exit
:good_exit

2
Util/cmake/CarlaServer/CMakeLists.txt
View File

@ -61,8 +61,6 @@ if (UNIX)
elseif (WIN32)
# Setup boost.
# add_definitions(-DBOOST_AUTO_LINK_NOMANGLE)
# set(Boost_USE_STATIC_LIBS ON)
include_directories("${CARLA_BOOST_INSTALL_PATH}/boost-1_64")
file(GLOB Boost_System_Static_Libraries "${CARLA_BOOST_INSTALL_PATH}/lib/libboost_system*.lib")
file(GLOB Boost_DateTime_Static_Libraries "${CARLA_BOOST_INSTALL_PATH}/lib/libboost_date_time*.lib")