Changeset 143 for prextra

Timestamp:

01/06/20 11:58:06 (5 years ago)

Author:

bduin

Message:

 

File:

• prextra/prtools_export.m (modified) (6 diffs)

prextra/prtools_export.m

@@ -43 +43 @@
 
 % get rid of prtools in the path
-r = which('fisherc');
-if ~isempty(r)
-  rmpath(r);
+prtools_path = which('fisherc');
+if ~isempty(prtools_path)
+  prtools_path = fileparts(prtools_path);
+  rmpath(prtools_path);
 end
 
@@ -73 +74 @@
 addpath(fullfile(pwd,'prtools'))
 pver  = prtver;
-fprintf(1,'    Present PRTools version is %s\n',pver{1}.Version);
-pver_new = input(['    Give new version number: [' pver{1}.Version '] '],'s');
-if isempty(pver_new)
-  pver_new = pver{1}.Version;
-end
-set_version_in_Contents(pver_new);
-% Commit version change
-if isunix
-  s = unix(['svn ci ' fullfile('prtools','Contents.m')]);
-elseif ispc
-  fprintf(1,'    Tortoise will pop up to commit change version number in Contents, find it and click OK 2x')
-  s = dos(['TortoiseProc.exe /command:commit /path:' fullfile('prtools','Contents.m')]);
-  fprintf(1,'\n');
-  input('    Ready to continue?');
-else 
-  error(['svn commit not implemented for Mac'])
+pver = pver{1}.Version;
+fprintf(1,'    Present PRTools version is %s\n',pver);
+pver_new = input(['    Give new version number: [' pver '] '],'s');
+if ~isempty(pver_new)
+  set_version_in_Contents(pver_new);
+  pver = pver_new;
+  % Commit version change
+  if isunix
+    s = unix(['svn ci ' fullfile('prtools','Contents.m')]);
+  elseif ispc
+    fprintf(1,'    Tortoise will pop up to commit change version number in Contents, find it and click OK 2x')
+    s = dos(['TortoiseProc.exe /command:commit /path:' fullfile('prtools','Contents.m')]);
+    fprintf(1,'\n');
+    input('    Ready to continue?');
+  else 
+    error(['svn commit not implemented for Mac'])
+  end
 end
   
@@ -130 +132 @@
 copyfile('Install_notes.txt',exporttemp,'f');
 copyfile('Release_notes.txt',exporttemp,'f');
-exppfiles = ['prtex' pver_new '.' today '.zip'];
-mfiles = ['prtools' pver_new '.' today '.zip'];
+exppfiles = ['prtex' pver '.' today '.zip'];
+mfiles = ['prtools' pver '.' today '.zip'];
 zip(exppfiles,{'prtools','License.txt','Install_notes.txt','Release_notes.txt'},exporttemp);
 zip(mfiles,[fullfile(prtmp,'prtools') '/*']);
+
+% Clean and reconstruct path
+rmpath(fullfile(prtmp,'prtools'));
 rmdir(prtmp,'s');
+if ~isempty(prtools_path)
+  addpath(prtools_path);
+end
   
 if doit
@@ -143 +151 @@
   mput(ftpsite,exppfiles);
   rename(ftpsite,exppfiles,'prtools.zip');
-  disp('export files have been stored on the website.')
-  disp('Please check and adjust release notes and known problems on website')
+  disp('    export files have been stored on the website.')
+  disp('    Please check and adjust release notes and known problems on website')
   close(ftpsite)
   
@@ -152 +160 @@
   if s
     delete(exppfiles);
-    disp(['export files have been backed-up in ' exportdir])
+    disp(['    export files have been backed-up in ' exportdir])
   else
     disp(mess); 
@@ -159 +167 @@
   if s
     delete(mfiles);
-    disp(['m-files have been backed-up in ' exportdir])
+    disp(['    m-files have been backed-up in ' exportdir])
   else
     disp(mess); 
   end
+else
+  fprintf(1,'    The zip-files have been created in exportdir.\n');
+  fprintf(1,'    They have not been copied to the website!\n');
+  fprintf(1,'    If needed, rerun with flag set.\n');
 end