Merge branch 'master' into ecb-master

externals/x13/installx13.m

@@ -25,8 +25,17 @@ if ~exist('x13.zip','file')
         urlwrite('http://www.dynare.org/x13/x13.zip', 'x13.zip');
     end
     unzip('x13.zip');
-    movefile('binaries/linux','./linux');
-    movefile('binaries/osx','./osx');
-    movefile('binaries/windows','./windows');
-    rmdir('binaries');
+    if ismac()
+        mkdir osx
+        movefile('binaries/osx/*','./osx');
+    elseif isunix()
+        mkdir linux
+        movefile('binaries/linux/*','./linux');
+    elseif ispc()
+        mkdir windows
+        movefile('binaries/windows/*','./windows');
+    else
+        error('X13 is not available for the current platform!')
+    end
+    rmdir('binaries', 's');
 end

externals/x13/uninstallx13.m

 function uninstallx13()
 
-% Uninstalls CENSUS X13 binaries (Windows and Linux).
+% Uninstalls CENSUS X13 binaries (Windows, OSX and Linux).
 
 % Copyright (C) 2017 Dynare Team
 %
@@ -23,9 +23,13 @@ if exist('x13.zip','file')
 end
 
 if exist('linux','dir')
-    rmdir('linux')
+    rmdir('linux', 's')
 end
 
 if exist('windows','dir')
-    rmdir('windows')
+    rmdir('windows', 's')
 end
+
+if exist('osx','dir')
+    rmdir('osx', 's')
+end
\ No newline at end of file

externals/x13/updatex13.m

+function updatex13()
+
+% Uninstalls CENSUS X13 binaries (Windows, OSX and Linux).
+
+% Copyright (C) 2017 Dynare Team
+%
+% This code is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+%
+% Dynare dseries submodule is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
+
+
+if exist('x13.zip','file')
+    delete('x13.zip')
+end
+
+installx13();
\ No newline at end of file