Merge pull request #64 from datajoint/stage

Fix MATLAB version check for code path releases
datajoint · Nov 5, 2020 · f7461b8 · f7461b8
2 parents ad7eeab + aca59a4
commit f7461b8
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ win.*
 .DS_Store
 macos*
 *.prj
-matlab.prf
+matlab.prf
+*.mltbx
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![View mym on File Exchange](https://www.mathworks.com/matlabcentral/images/matlab-file-exchange.svg)](https://www.mathworks.com/matlabcentral/fileexchange/81208-mym)
+
 ## mym
 
 MySQL API for MATLAB with support for BLOB objects

diff --git a/distribution/mexa64/mym.mexa64 b/distribution/mexa64/mym.mexa64
diff --git a/distribution/mexmaci64/mym.mexmaci64 b/distribution/mexmaci64/mym.mexmaci64
diff --git a/distribution/mexw64/mym.mexw64 b/distribution/mexw64/mym.mexw64
diff --git a/local-docker-compose.yml b/local-docker-compose.yml
@@ -92,9 +92,9 @@ services:
           disp(mym('version'));\
         "
         cd "$${ORIG_DIR}"
-        # Copy preferences
-        cp /tmp/matlab.prf /home/muser/.matlab/${MATLAB_VERSION}/matlab.prf
-        # Interactive Jupyter Notebook environment
+        ## Copy preferences
+        # cp /tmp/matlab.prf /home/muser/.matlab/${MATLAB_VERSION}/matlab.prf
+        ## Interactive Jupyter Notebook environment
         jupyter notebook
     mac_address: $MATLAB_HOSTID
     volumes:
@@ -103,6 +103,6 @@ services:
       - /tmp/.X11-unix:/tmp/.X11-unix:rw
       ## Additional mounts may go here
       # - ./notebook:/home/muser/notebooks
-      - ./matlab.prf:/tmp/matlab.prf
+      # - ./matlab.prf:/tmp/matlab.prf
 networks:
   main:
diff --git a/mym.m b/mym.m
@@ -1,6 +1,6 @@
 % setupMYM (invoked only first time to set path and removes itself)
 function varargout = mym(varargin)
-    warning('mYm:Setup:FirstInvokation', 'Setting mym to path as first invokation.');
+    warning('mYm:Setup:FirstInvocation', 'Setting mym to path as first invocation.');
     % determine state
     origDir = pwd;
     ext = dbstack;
@@ -10,7 +10,7 @@
     % add to mex-path as appropriate (persist)
     toolboxName = 'mym';
     s = settings;
-    if verLessThan('matlab', '9.2')
+    if verLessThan('matlab', '9.5')
         toolboxRoot = [strrep(s.matlab.addons.InstallationFolder.ActiveValue, '\', '/') ...
                        '/Toolboxes/' toolboxName '/code'];
     else

diff --git a/mym.mltbx b/mym.mltbx
diff --git a/src/mym.h b/src/mym.h
@@ -34,7 +34,7 @@
 // mym version information
 #define MYM_VERSION_MAJOR 2
 #define MYM_VERSION_MINOR 7
-#define MYM_VERSION_BUGFIX 3
+#define MYM_VERSION_BUGFIX 4
 
 
 // some local defintion