From 3955db5842e02bf1a70e1290cdc9b4b75c9aaeea Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau <antoine.regimbeau@c-s.fr> Date: Thu, 16 May 2019 17:40:26 +0200 Subject: [PATCH] Remove old stuff from java --- Packaging/CMakeLists.txt | 2 -- Packaging/Files/uninstall_otb.bat | 1 - Packaging/Files/uninstall_otb.sh | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Packaging/CMakeLists.txt b/Packaging/CMakeLists.txt index 3b6c473fde..65c599be71 100644 --- a/Packaging/CMakeLists.txt +++ b/Packaging/CMakeLists.txt @@ -204,8 +204,6 @@ install_importlibs() install_python_bindings() -install_java_bindings() - install_share_dirs() install_cmake_files() diff --git a/Packaging/Files/uninstall_otb.bat b/Packaging/Files/uninstall_otb.bat index cc112505c1..6ca7b67208 100644 --- a/Packaging/Files/uninstall_otb.bat +++ b/Packaging/Files/uninstall_otb.bat @@ -37,7 +37,6 @@ rd /S /Q lib\otb del /S /Q lib\otb* del /S /Q lib\python\*otbApplication.* || exit 1 -del /S /Q lib\java\org.otb.application.jar || exit 1 del /S /Q bin\otb* || exit 1 del /S /Q bin\monteverdi.exe || exit 1 del /S /Q bin\mapla.exe || exit 1 diff --git a/Packaging/Files/uninstall_otb.sh b/Packaging/Files/uninstall_otb.sh index d160333f40..be82c406e6 100755 --- a/Packaging/Files/uninstall_otb.sh +++ b/Packaging/Files/uninstall_otb.sh @@ -21,7 +21,7 @@ set -e rm -fr OUT_DIR/include/OTB-* rm -f OUT_DIR/lib/{libotb*,libOTB*} -rm -fr OUT_DIR/lib/{otb,python/*otbApplication*,java/org.otb.application.jar} +rm -fr OUT_DIR/lib/{otb,python/*otbApplication*} rm -fr OUT_DIR/lib/cmake/OTB-* rm -fr OUT_DIR/share/otb/ rm -fv OUT_DIR/bin/{otb*,monteverdi,mapla} -- GitLab