From d1a19bd7f3f615c018b5035d1964f94d8526a333 Mon Sep 17 00:00:00 2001 From: Rashad Kanavath Date: Fri, 4 Aug 2017 15:14:57 +0200 Subject: [PATCH] BUG: selftester and uninstall scripts are moved to tools --- Packaging/Files/selftester.bat | 2 +- Packaging/Files/uninstall_otb.bat | 2 +- Packaging/Files/uninstall_otb.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Packaging/Files/selftester.bat b/Packaging/Files/selftester.bat index 2d164c84b4..988786829c 100755 --- a/Packaging/Files/selftester.bat +++ b/Packaging/Files/selftester.bat @@ -87,7 +87,7 @@ goto :eof :check_binary setlocal type NUL > tmp.log -bin\otb_loader.exe %1 > tmp.log 2>&1 +tools\otb_loader.exe %1 > tmp.log 2>&1 call :nb_tmp_lines if %nb_tmp_lines_out% gtr 0 ( echo ERROR : otb_loader.exe %1 diff --git a/Packaging/Files/uninstall_otb.bat b/Packaging/Files/uninstall_otb.bat index a4a04280c0..070ac5b4f4 100644 --- a/Packaging/Files/uninstall_otb.bat +++ b/Packaging/Files/uninstall_otb.bat @@ -1,6 +1,6 @@ :: uninstall script for OTB set CUR_DIR=%~dp0 -cmake -S OUT_DIR/cmake_uninstall_otb.cmake -DMY_INSTALL_DIR=%CUR_DIR% -DCMAKE_COMMAND=cmake +cmake -S OUT_DIR/tools/cmake_uninstall_otb.cmake -DMY_INSTALL_DIR=%CUR_DIR% -DCMAKE_COMMAND=cmake del %CUR_DIR%mapla.bat del %CUR_DIR%monteverdi.bat echo "OTB is now uninstalled from %CUR_DIR%" diff --git a/Packaging/Files/uninstall_otb.sh b/Packaging/Files/uninstall_otb.sh index 11432ed747..325bb60ec1 100755 --- a/Packaging/Files/uninstall_otb.sh +++ b/Packaging/Files/uninstall_otb.sh @@ -21,7 +21,7 @@ set -e CMAKE=$(which cmake) -$CMAKE -S OUT_DIR/cmake_uninstall_otb.cmake -DMY_INSTALL_DIR=OUT_DIR -DCMAKE_COMMAND=$CMAKE +$CMAKE -S OUT_DIR/tools/cmake_uninstall_otb.cmake -DMY_INSTALL_DIR=OUT_DIR -DCMAKE_COMMAND=$CMAKE rm -f OUT_DIR/mapla.sh rm -f OUT_DIR/monteverdi.sh echo "OTB is now uninstalled from OUT_DIR" -- GitLab