R2019b fix (#9)

Update to R2019b Signed-off-by: SrikanthPagadarai <srikanth.pagadarai@analog.com> Signed-off-by: Travis F. Collins <travis.collins@analog.com>
analogdevicesinc · Oct 24, 2019 · 574c261 · 574c261
1 parent 8218f95
commit 574c261
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 22 deletions.
diff --git a/+adi/Contents.m b/+adi/Contents.m
@@ -1,5 +1,5 @@
 % Analog Devices, Inc. Transceiver Toolbox
-% Version 19.1.1 (R2019a)
+% Version 19.2.1 (R2019b)
 %
 % ==== Table of Contents (TOC) ====
 %

diff --git a/+adi/Version.m b/+adi/Version.m
@@ -4,8 +4,8 @@
     properties(Constant)
         HDL = 'hdl_2018_r2';
         Vivado = '2018.2';
-        MATLAB = 'R2019a';
-        Release = '19.1.1';
+        MATLAB = 'R2019b';
+        Release = '19.2.1';
     end
     properties(Dependent)
         VivadoShort

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ build:2018_R2:
      - matlab
     stage: build
     script:
-     - export MLRELEASE=R2019a
+     - export MLRELEASE=R2019b
      - ./CI/scripts/dockermake build
      - ./CI/scripts/dockermake doc
      - ./CI/scripts/dockermake add_libad9361
@@ -57,7 +57,7 @@ build:master:
     stage: build
     script:
      - export HDLBRANCH=hdl_2018_r2
-     - export MLRELEASE=R2019a
+     - export MLRELEASE=R2019b
      - ./CI/scripts/dockermake build
      - export HDLBRANCH=
      - export MLRELEASE=
@@ -70,55 +70,55 @@ build:master:
 test:2018_R2_ZED:
     extends: .hdl_tests
     script:
-     - export MLRELEASE=R2019a
+     - export MLRELEASE=R2019b
      - export BOARD=zed
      - ./CI/scripts/dockermake test
 
 # Test HWA no install zc702
 test:2018_R2_ZC702:
     extends: .hdl_tests
     script:
-     - export MLRELEASE=R2019a
+     - export MLRELEASE=R2019b
      - export BOARD=zc702
      - ./CI/scripts/dockermake test
 
 # Test HWA no install zc706
 test:2018_R2_ZC706:
     extends: .hdl_tests
     script:
-     - export MLRELEASE=R2019a
+     - export MLRELEASE=R2019b
      - export BOARD=zc706
      - ./CI/scripts/dockermake test
 
 # Test HWA no install zcu102
 test:2018_R2_ZCU102:
     extends: .hdl_tests
     script:
-     - export MLRELEASE=R2019a
+     - export MLRELEASE=R2019b
      - export BOARD=zcu102
      - ./CI/scripts/dockermake test
 
 # Test HWA no install adrv9361
 test:2018_R2_ADRV9361:
     extends: .hdl_tests
     script:
-     - export MLRELEASE=R2019a
+     - export MLRELEASE=R2019b
      - export BOARD=adrv9361
      - ./CI/scripts/dockermake test
 
 # Test HWA no install adrv9364
 test:2018_R2_ADRV9364:
     extends: .hdl_tests
     script:
-     - export MLRELEASE=R2019a
+     - export MLRELEASE=R2019b
      - export BOARD=adrv9364
      - ./CI/scripts/dockermake test
 
 # Test HWA with install
 test_installer:2018_R2_Installer:
     extends: .hdl_tests
     script:
-     - export MLRELEASE=R2019a
+     - export MLRELEASE=R2019b
      - cp mltbx/* .
      - pwd
      - ls
@@ -149,7 +149,7 @@ test:targeting_demos:
     dependencies:
      - build:2018_R2
     script:
-     - export MLRELEASE=R2019a
+     - export MLRELEASE=R2019b
      - ./CI/scripts/dockermake test_targeting_demos
     artifacts:
         when: always
@@ -167,7 +167,7 @@ test_hardware:Streaming_Hardware:
     dependencies:
      - build:2018_R2
     script:
-     - export MLRELEASE=R2019a
+     - export MLRELEASE=R2019b
      - cd CI/scripts
      - make test_streaming
     artifacts:
@@ -186,7 +186,7 @@ test_hardware:EVM_Hardware:
     dependencies:
      - build:2018_R2
     script:
-     - export MLRELEASE=R2019a
+     - export MLRELEASE=R2019b
      - cd CI/scripts
      - make test_evm
     artifacts:

diff --git a/CI/scripts/Makefile b/CI/scripts/Makefile
@@ -8,7 +8,7 @@ SHELL := /bin/bash
 MLFLAGS := -nodisplay -nodesktop -nosplash
 
 ifeq ($(MLRELEASE),)
-MLRELEASE := R2019a
+MLRELEASE := R2019b
 endif
 
 ifeq ($(HDLBRANCH),)

diff --git a/CI/scripts/genTlbx.m b/CI/scripts/genTlbx.m
@@ -4,7 +4,7 @@ function genTlbx(examples)
     examples = 0;
 end
 
-version = '19.1.1';
+version = '19.2.1';
 ml = ver('MATLAB');
 ml = ml.Release(2:end-1);
 

diff --git a/README.md b/README.md
@@ -12,15 +12,15 @@ As with many open source packages, we use [GitHub](https://github.com/analogdevi
 
 | HDL Branch        | GitHub master status  | MATLAB Release |  Installer Package  |
 |:-----------------------:|:---------------------:|:-------:|:-------------------:|
-| 2018_R2                 | [![pipeline status](https://gitlab.com/tfcollins/TransceiverToolbox/badges/master/pipeline.svg)](https://gitlab.com/tfcollins/TransceiverToolbox/commits/master) | 2019a | <a href="https://gitlab.com/tfcollins/TransceiverToolbox/-/jobs/artifacts/master/download?job=deploy"><img src="https://upload.wikimedia.org/wikipedia/commons/2/21/Matlab_Logo.png" data-canonical-src="https://upload.wikimedia.org/wikipedia/commons/2/21/Matlab_Logo.png" height="40" /></a>|
+| 2018_R2                 | [![pipeline status](https://gitlab.com/tfcollins/TransceiverToolbox/badges/master/pipeline.svg)](https://gitlab.com/tfcollins/TransceiverToolbox/commits/master) | 2019b | <a href="https://gitlab.com/tfcollins/TransceiverToolbox/-/jobs/artifacts/master/download?job=deploy"><img src="https://upload.wikimedia.org/wikipedia/commons/2/21/Matlab_Logo.png" data-canonical-src="https://upload.wikimedia.org/wikipedia/commons/2/21/Matlab_Logo.png" height="40" /></a>|
 
 If you use it, and like it - please let us know. If you use it, and hate it - please let us know that too.
 
 ## Supported Tools and Releases
 
 We provide support across two releases of MATLAB. This does not mean older releases will not work but they are not maintained. Currently supported tools are:
-- Bug fixes only: MATLAB R2018b with Vivado 2017.4 from the [MathWorks_tools](https://github.com/analogdevicesinc/MathWorks_tools) repository
-- Bug fixes and new features: MATLAB R2019a with Vivado 2018.2
+- Bug fixes only: MATLAB R2019a with Vivado 2018.2
+- Bug fixes and new features: MATLAB R2019b with Vivado 2018.2
 
 ## Support and Documentation
 

diff --git a/hdl/vendor/AnalogDevices/Contents.m b/hdl/vendor/AnalogDevices/Contents.m
@@ -1,2 +1,2 @@
 % HDL Coder BSP: Analog Devices Inc
-% Version 19.1.1 (R2019a) 1-August-2019
+% Version 19.2.1 (R2019b) 1-August-2019
diff --git a/info.xml b/info.xml
@@ -8,7 +8,7 @@
     <!-- Supply the following six elements in the order specified -->
     <!-- (Required) Release of MATLAB. Not currently used but required -->
     <!-- to parse the file -->
-    <matlabrelease>R2019a</matlabrelease>
+    <matlabrelease>R2019b</matlabrelease>
     <!-- (Required) Title of toolbox. Appears in the Contents pane -->
     <name>Analog Devices, Inc. Transceiver Toolbox</name>
     <!-- (Required) Label for the toolbox. pick one: -->

diff --git a/test/DemoTests.m b/test/DemoTests.m
@@ -26,6 +26,8 @@ function setupVivado(~)
                     vivado = '2017.4';
                 case '(R2019a)'
                     vivado = '2018.2';
+                case '(R2019b)'
+                    vivado = '2018.2';
             end
             if ispc
                 hdlsetuptoolpath('ToolName', 'Xilinx Vivado', ...