Merge pull request #310 from datajoint/stage2

Add erd.m back into DataJoint Toolbox

Author: Chris Turner

+dj/version.m

@@ -1,7 +1,7 @@
 function varargout = version
 % report DataJoint version
 
-v = struct('major',3,'minor',3,'bugfix',2);
+v = struct('major',3,'minor',3,'bugfix',3);
 
 if nargout
     varargout{1}=v;

LNX-docker-compose.yml

@@ -62,13 +62,13 @@ services:
                         'relational database.'],\
                        docs,\
                        {'.vscode', '.git', '*.env', '.gitignore', '.travis.yml', 'tests',\
-                        'docs-parts', 'mym', 'erd.m', '*docker-compose.yml', 'LICENSE.txt',\
+                        'docs-parts', 'mym', '*docker-compose.yml', 'LICENSE.txt',\
                         'matlab.prf', 'package.m', 'README.md'},\
                        @() strjoin(arrayfun(@(x) num2str(x),\
                                             cell2mat(struct2cell(dj.version)),\
                                             'uni', false),\
                                    '.'),\
-                       {'+dj'});\
+                       {'+dj', 'erd.m'});\
           matlab.addons.toolbox.installToolbox('DataJoint.mltbx');\
           cd(getenv('ORIG_DIR'));\
           addpath('tests');\

local-docker-compose.yml

@@ -74,13 +74,13 @@ services:
                         'relational database.'],\
                        docs,\
                        {'.vscode', '.git', '*.env', '.gitignore', '.travis.yml', 'tests',\
-                        'docs-parts', 'mym', 'erd.m', '*docker-compose.yml', 'LICENSE.txt',\
+                        'docs-parts', 'mym', '*docker-compose.yml', 'LICENSE.txt',\
                         'matlab.prf', 'package.m', 'README.md'},\
                        @() strjoin(arrayfun(@(x) num2str(x),\
                                             cell2mat(struct2cell(dj.version)),\
                                             'uni', false),\
                                    '.'),\
-                       {'+dj'});\
+                       {'+dj', 'erd.m'});\
           matlab.addons.toolbox.installToolbox('DataJoint.mltbx');\
           cd(tempdir);\
           disp(dj.version);\