Changeset 133

Timestamp:

11/25/19 13:54:21 (5 years ago)

Author:

bduin

Message:

 

File:

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

prextra/prtools_export.m

@@ -104 +104 @@
 end
 
-% Create export version in dir2
+% Create export version in dir2, RD: not needed anymore from 2019
 today = datestr(date,'ddmmmyy');
-exporttemp = fullfile(prtmp,['prtex' pver_new '.' today]);
-mkdir(exporttemp);
-dir1 = fileparts(which('fisherc'));
-dir2 = fullfile(exporttemp,'prtools');
-mkdir(dir2);
-copydirm(dir1,dir2); % copy main dir
-copydirm(fullfile(dir1,'private'),fullfile(dir2,'private'),'all'); % copy private as it is
-copydirm(fullfile(dir1,'@prdataset'),fullfile(dir2,'@prdataset'),'%'); % copy headers only
-copydirm(fullfile(dir1,'@prdatafile'),fullfile(dir2,'@prdatafile'),'%'); % copy headers only
-copydirm(fullfile(dir1,'@prmapping'),fullfile(dir2,'@prmapping'),'%'); % copy headers only
-
-% Generate pcodes
-fprintf(1,'    Generating pcodes ... \n');
-cd(fullfile(dir2,'@prdataset')); pcode(fullfile(dir1,'@prdataset'));  % generate pcode in dir2/@dataset
-cd(fullfile(dir2,'@prdatafile')); pcode(fullfile(dir1,'@prdatafile')); % generate pcode in dir2/@datafile
-cd(fullfile(dir2,'@prmapping')); pcode(fullfile(dir1,'@prmapping'));  % generate pcode in dir2/@mapping
+% exporttemp = fullfile(prtmp,['prtex' pver_new '.' today]);
+% mkdir(exporttemp);
+% dir1 = fileparts(which('fisherc'));
+% dir2 = fullfile(exporttemp,'prtools');
+% mkdir(dir2);
+% copydirm(dir1,dir2); % copy main dir
+% copydirm(fullfile(dir1,'private'),fullfile(dir2,'private'),'all'); % copy private as it is
+% copydirm(fullfile(dir1,'@prdataset'),fullfile(dir2,'@prdataset'),'%'); % copy headers only
+% copydirm(fullfile(dir1,'@prdatafile'),fullfile(dir2,'@prdatafile'),'%'); % copy headers only
+% copydirm(fullfile(dir1,'@prmapping'),fullfile(dir2,'@prmapping'),'%'); % copy headers only
+
+% Generate pcodes. RD: we stopped this in 2019
+% fprintf(1,'    Generating pcodes ... \n');
+% cd(fullfile(dir2,'@prdataset')); pcode(fullfile(dir1,'@prdataset'));  % generate pcode in dir2/@dataset
+% cd(fullfile(dir2,'@prdatafile')); pcode(fullfile(dir1,'@prdatafile')); % generate pcode in dir2/@datafile
+% cd(fullfile(dir2,'@prmapping')); pcode(fullfile(dir1,'@prmapping'));  % generate pcode in dir2/@mapping
 
 % Create zip-files
 fprintf(1,'    Creating zip files ... \n');
+exporttemp = prtmp; % RD: starting 2019, no separate exporttemp is needed
 cd(exportdir);
 copyfile('License.txt',exporttemp,'f');
 copyfile('Install_notes.txt',exporttemp,'f');
 copyfile('Release_notes.txt',exporttemp,'f');
-pfiles = ['prtex' pver_new '.' today '.zip'];
+exppfiles = ['prtex' pver_new '.' today '.zip'];
 mfiles = ['prtools' pver_new '.' today '.zip'];
-zip(pfiles,{'prtools','License.txt','Install_notes.txt','Release_notes.txt'},exporttemp);
+zip(exppfiles,{'prtools','License.txt','Install_notes.txt','Release_notes.txt'},exporttemp);
 zip(mfiles,[fullfile(prtmp,'prtools') '/*']);
 rmdir(prtmp,'s');
@@ -137 +138 @@
 if doit
   fprintf(1,'    FTP PRTools zip-file to website ... \n');
-  % store p-files on website
+  % store export files on website
   ftpsite = ftp('prtools.tudelft.nl','prlab','0iX7&b3c');
   cd(ftpsite,'httpdocs/files');
-  mput(ftpsite,pfiles);
-  rename(ftpsite,pfiles,'prtools.zip');
-  disp('p-files have been stored on the website.')
+  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')
   close(ftpsite)
   
   % backup p-files and m-files
-  fprintf(1,'    Storing backups of mfiles and p-files ... \n');
-  [s,mess] = copyfile(pfiles,fullfile(exportdir,'prtools_old_export'));
+  fprintf(1,'    Storing backups of mfiles and export files ... \n');
+  [s,mess] = copyfile(exppfiles,fullfile(exportdir,'prtools_old_export'));
   if s
-    delete(pfiles);
-    disp(['p-files have been backed-up in ' exportdir])
+    delete(exppfiles);
+    disp(['export files have been backed-up in ' exportdir])
   else
     disp(mess);