Skip to content

Commit

Permalink
Remove remaining MATLAB bits from CI intrastructure
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
rgetz committed May 8, 2020
1 parent b6b2354 commit 50974b3
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 15 deletions.
6 changes: 1 addition & 5 deletions CI/travis/before_deploy
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion README_BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
8 changes: 0 additions & 8 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down
1 change: 0 additions & 1 deletion iio-config.h.cmakein
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 50974b3

Please sign in to comment.