From 50974b3e6cd8a7b693ecdfcc2a6724ac6e4cb3c3 Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Fri, 8 May 2020 08:14:49 -0400 Subject: [PATCH] Remove remaining MATLAB bits from CI intrastructure This removes anything hanging around that referenced the MATLAB bindings, since they are now completely integrated, and now are not seperate anymore. Signed-off-by: Robin Getz --- CI/travis/before_deploy | 6 +----- README_BUILD.md | 1 - appveyor.yml | 8 -------- iio-config.h.cmakein | 1 - 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/CI/travis/before_deploy b/CI/travis/before_deploy index 9d3fd0553..80bf03151 100755 --- a/CI/travis/before_deploy +++ b/CI/travis/before_deploy @@ -96,7 +96,7 @@ check_file tar.gz if [ -n "${temp}" ] ; then deploy=$(expr ${deploy} + 1) if [ -z "${TARGET_TGZ}" ] ; then - echo Add the MATLAB bindings into the tar file + echo updating tar file ( cd $(dirname ${temp}) if [ -d tarball_fixup ] ; then @@ -110,10 +110,6 @@ if [ -n "${temp}" ] ; then tar -xzf ${TRAVIS_BUILD_DIR}/${temp} fi - mkdir -p usr/include usr/lib/matlab/iio - cp ${TRAVIS_BUILD_DIR}/bindings/matlab/iio-wrapper.h usr/include/ - cp ${TRAVIS_BUILD_DIR}/bindings/matlab/*.m usr/lib/matlab/iio/ - if [ "$TRAVIS_OS_NAME" = "osx" ] ; then cd usr/lib ln -fs ../../Library/Frameworks/iio.framework/iio libiio.dylib diff --git a/README_BUILD.md b/README_BUILD.md index c5f53c575..fcb7bbd45 100644 --- a/README_BUILD.md +++ b/README_BUILD.md @@ -43,7 +43,6 @@ when configuring libiio with cmake, there are a few optional settings that you c Cmake Options | Default | Description | ------------------- | ------- | ---------------------------------------------- | `CSHARP_BINDINGS` | OFF | Install C# bindings | -`MATLAB_BINDINGS` | OFF | Install MATLAB bindings | `PYTHON_BINDINGS` | OFF | Install PYTHON bindings | `WITH_DOC` | OFF | Generate documentation with Doxygen and Sphinx | `WITH_MAN` | OFF | Generate and install man pages | diff --git a/appveyor.yml b/appveyor.yml index ea21a0378..1bca5f653 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -167,14 +167,6 @@ build_script: - copy "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvcr120.dll" c:\%ARCHIVE_NAME%\MS32 - copy "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcr120.dll" c:\%ARCHIVE_NAME%\MS64 - - xcopy /S bindings\matlab c:\%ARCHIVE_NAME%\MS32\matlab\ - - xcopy /S bindings\matlab c:\%ARCHIVE_NAME%\MS64\matlab\ - - xcopy /S bindings\matlab c:\%ARCHIVE_NAME%\MinGW32\matlab\ - - xcopy /S bindings\matlab c:\%ARCHIVE_NAME%\MinGW64\matlab\ - - del c:\%ARCHIVE_NAME%\MS32\matlab\CMakeLists.txt - - del c:\%ARCHIVE_NAME%\MS64\matlab\CMakeLists.txt - - del c:\%ARCHIVE_NAME%\MinGW32\matlab\CMakeLists.txt - - del c:\%ARCHIVE_NAME%\MinGW64\matlab\CMakeLists.txt - copy c:\projects\libiio\CI\travis\zip.txt c:\%ARCHIVE_NAME%\README.txt - 7z a "c:\libiio.zip" c:\%ARCHIVE_NAME% diff --git a/iio-config.h.cmakein b/iio-config.h.cmakein index 92742f2ed..1cdd196af 100644 --- a/iio-config.h.cmakein +++ b/iio-config.h.cmakein @@ -12,7 +12,6 @@ #cmakedefine WITH_NETWORK_BACKEND #cmakedefine WITH_USB_BACKEND #cmakedefine WITH_SERIAL_BACKEND -#cmakedefine WITH_MATLAB_BINDINGS_API #cmakedefine WITH_NETWORK_GET_BUFFER #cmakedefine WITH_NETWORK_EVENTFD