250906.222013.CST archnorma: revise add_save_path and uninstall_prima

Author: zaikunzhang

.development

@@ -9,7 +9,6 @@ function uninstall_prima(path_string_stamp)
 interfaces = fullfile(matd, 'interfaces'); % Directory of the interfaces
 mexdir = fullfile(interfaces, 'private'); % The private subdirectory of the interfaces
 tests = fullfile(matd, 'tests'); % Directory containing some tests
-tools = fullfile(matd, 'setup_tools'); % Directory containing some tools
 
 % Remove the compiled MEX files.
 clean_mex(mexdir);
@@ -18,15 +17,16 @@ function uninstall_prima(path_string_stamp)
 orig_warning_state = warning;
 warning('off', 'MATLAB:rmpath:DirNotFound'); % Maybe the paths were not added. We do not want to see this warning.
 warning('off', 'MATLAB:SavePath:PathNotSaved'); % Maybe we do not have the permission to save path.
-rmpath(interfaces, tests, tools);
+rmpath(interfaces, tests);
 savepath;
 warning(orig_warning_state); % Restore the behavior of displaying warnings
 
 % Removing the line possibly added to the user startup script
 user_startup = fullfile(userpath,'startup.m');
 if exist(user_startup, 'file')
     add_path_string = sprintf('addpath(''%s'');', interfaces);
-    full_add_path_string = sprintf('%s\t%s %s', add_path_string, '%', path_string_stamp);
+    % full_add_path_string must match the string with the same name defined in the setup script.
+    full_add_path_string = sprintf('%s %s %s', add_path_string, '%', path_string_stamp);
     try
         del_str_ln(user_startup, full_add_path_string);
     catch

matlab/setup_tools/uninstall_prima.m

@@ -186,6 +186,14 @@
 
 end
 
+% Uninstall the solvers installed by the test
+cd(fullfile(test_dir, 'prima'));
+setup('uninstall');
+if strcmpi(options.competitor, 'archiva') || strcmpi(options.competitor, 'norma')
+    cd(fullfile(test_dir, options.competitor));
+    setup('uninstall');
+end
+
 setpath(oldpath);  % Restore the path to oldpath.
 cd(olddir);  % Go back to olddir.
 fprintf('\nCurrently in %s\n\n', pwd());

matlab/tests/profile.m

@@ -108,6 +108,12 @@ function verify(varargin)
 
 end
 
+% Uninstall the solvers installed by the test
+cd(fullfile(test_dir, 'prima'));
+setup('uninstall');
+cd(fullfile(test_dir, 'norma'));
+setup('uninstall');
+
 setpath(oldpath);  % Restore the path to oldpath.
 cd(olddir);  % Go back to olddir.
 fprintf('\nCurrently in %s\n\n', pwd());

matlab/tests/verify.m

@@ -116,7 +116,7 @@ function setup(varargin)
 % Uninstall the package if requested.
 if strcmp(action, 'uninstall')
     uninstall_prima(package_name);
-    % `rmpath(tools)` is not needed, as `uninstall_prima` already does it.
+    rmpath(tools);
     return
 end
 
@@ -281,7 +281,7 @@ function setup(varargin)
 if ~path_saved && numel(userpath) > 0
     user_startup = fullfile(userpath, 'startup.m');
     add_path_string = sprintf('addpath(''%s'');', path_string);
-    full_add_path_string = sprintf('%s  %s %s', add_path_string, '%', path_string_stamp);
+    full_add_path_string = sprintf('%s %s %s', add_path_string, '%', path_string_stamp);
 
     % First, check whether full_add_path_string already exists in user_startup or not.
     if exist(user_startup, 'file')