From 27fa75f59f1bd7d74c84363b7d933f7cfb7dd461 Mon Sep 17 00:00:00 2001 From: Helge <47348963+HJZollner@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:58:52 -0400 Subject: [PATCH] Prepare release v.2.6.0 Preparation for release --- GUI/Osprey.m | 2 +- GUI/osp_Toolbox_Check.m | 2 +- job/OspreyJob.m | 2 +- utilities/CompileOspreyStandalone.m | 10 +++++----- utilities/osp_CheckRunPreviousModule.m | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/GUI/Osprey.m b/GUI/Osprey.m index 0aa985f7..fa19fa20 100644 --- a/GUI/Osprey.m +++ b/GUI/Osprey.m @@ -30,7 +30,7 @@ logoFcn = @()imread('osprey.png', 'BackgroundColor', gui.colormap.Background); logoBanner = uiw.utility.loadIcon(logoFcn); % Here the intro banner is created -gui.d = uiw.dialog.About('Name', 'Osprey','Version','2.5.0','Date', 'April 7, 2023',... +gui.d = uiw.dialog.About('Name', 'Osprey','Version','2.6.0','Date', 'July 15, 2024',... 'Timeout', 3,'CustomText', 'Osprey is provided by Johns Hopkins University.',... 'ContactInfo', 'gabamrs@gmail.com','LogoCData', logoBanner); diff --git a/GUI/osp_Toolbox_Check.m b/GUI/osp_Toolbox_Check.m index d6ec369c..0e0d6144 100644 --- a/GUI/osp_Toolbox_Check.m +++ b/GUI/osp_Toolbox_Check.m @@ -32,7 +32,7 @@ % 2020-05-15: First version of the code. %% % 1. SAVE OSPREY VERSION%%% %%% 1. SAVE OSPREY VERSION%%% -OspreyVersion = 'Osprey 2.5.0'; +OspreyVersion = 'Osprey 2.6.0'; fprintf(['Timestamp %s ' OspreyVersion ' ' Module '\n'], datestr(now,'mmmm dd, yyyy HH:MM:SS')); hasSPM = 1; % For the compiled GUI %% % 2. GET SPMPATH AND TOOLBOXES%%% diff --git a/job/OspreyJob.m b/job/OspreyJob.m index dc5a64a4..b78b0190 100755 --- a/job/OspreyJob.m +++ b/job/OspreyJob.m @@ -781,7 +781,7 @@ %%% 7. SET FLAGS AND VERSION %%% MRSCont.flags.didJob = 1; MRSCont.loadedJob = jobFile; -MRSCont.ver.Osp = 'Osprey 2.5.0'; +MRSCont.ver.Osp = 'Osprey 2.6.0'; %%% 8. CHECK IF OUTPUT STRUCTURE ALREADY EXISTS IN OUTPUT FOLDER %%% diff --git a/utilities/CompileOspreyStandalone.m b/utilities/CompileOspreyStandalone.m index ed323d81..64c64b6a 100644 --- a/utilities/CompileOspreyStandalone.m +++ b/utilities/CompileOspreyStandalone.m @@ -202,7 +202,7 @@ function CompileOspreyStandalone(OutputDir,SPM12Dir,CreateHBCD, CreateCMD, Creat 'OutputDir',OutputDirHBCD,... 'ExecutableIcon',fullfile(OspreyDir, 'graphics','osprey.gif'),... 'ExecutableSplashScreen',fullfile(OspreyDir, 'graphics','osprey.gif'),... - 'ExecutableVersion','2.5.0',... + 'ExecutableVersion','2.6.0',... 'ExecutableName','OspreyHBCD',... 'AdditionalFiles',{ fullfile(SPM12Dir),... fullfile(OspreyDir,'coreg'),... @@ -243,7 +243,7 @@ function CompileOspreyStandalone(OutputDir,SPM12Dir,CreateHBCD, CreateCMD, Creat 'OutputDir',OutputDirCmd,... 'ExecutableIcon',fullfile(OspreyDir, 'graphics','osprey.gif'),... 'ExecutableSplashScreen',fullfile(OspreyDir, 'graphics','osprey.gif'),... - 'ExecutableVersion','2.5.0',... + 'ExecutableVersion','2.6.0',... 'ExecutableName','OspreyCMD',... 'AdditionalFiles',{ fullfile(SPM12Dir),... fullfile(OspreyDir,'coreg'),... @@ -279,7 +279,7 @@ function CompileOspreyStandalone(OutputDir,SPM12Dir,CreateHBCD, CreateCMD, Creat compiler.package.installer(buildResults,'OutputDir',fullfile(OspreyDir,'OspreyCMD_installer'), 'InstallerName', 'OspreyCMD_install', 'RuntimeDelivery', 'installer',... 'AuthorCompany','The Johns Hopkins University', 'Description', 'Installer for Osprey CMD version',... 'InstallationNotes', 'Thank you for downloading Osprey. This installer will allow you to run the Osprey CMD as a standalone application. Please copy the "basissets" folder into the "application" folder after the installation.',... - 'Version', '2.5.0', 'ApplicationName','OspreyCMD') + 'Version', '2.6.0', 'ApplicationName','OspreyCMD') end %% 4. GUI export @@ -292,7 +292,7 @@ function CompileOspreyStandalone(OutputDir,SPM12Dir,CreateHBCD, CreateCMD, Creat 'OutputDir',OutputDirGUI,... 'ExecutableIcon',fullfile(OspreyDir, 'graphics','osprey.gif'),... 'ExecutableSplashScreen',fullfile(OspreyDir, 'graphics','osprey.gif'),... - 'ExecutableVersion','2.5.0',... + 'ExecutableVersion','2.6.0',... 'ExecutableName','Osprey',... 'AdditionalFiles',{fullfile(WidgetsDir),... fullfile(GUILayoutDir),... @@ -335,7 +335,7 @@ function CompileOspreyStandalone(OutputDir,SPM12Dir,CreateHBCD, CreateCMD, Creat compiler.package.installer(buildResults,'OutputDir',fullfile(OutputDirGUI,'OspreyGUI_installer'), 'InstallerName', 'OspreyGUI_install', 'RuntimeDelivery', 'web',... 'AuthorCompany','The Johns Hopkins University', 'Description', 'Installer for Osprey GUI version',... 'InstallationNotes', 'Thank you for downloading Osprey. This installer will allow you to run the Osprey GUI as a standalone application. Please copy the "basissets" folder into the "application" folder after the installation',... - 'Version', '2.5.0', 'ApplicationName','OspreyGUI') + 'Version', '2.6.0', 'ApplicationName','OspreyGUI') end end \ No newline at end of file diff --git a/utilities/osp_CheckRunPreviousModule.m b/utilities/osp_CheckRunPreviousModule.m index b41fb9b6..6c5e9751 100644 --- a/utilities/osp_CheckRunPreviousModule.m +++ b/utilities/osp_CheckRunPreviousModule.m @@ -74,7 +74,7 @@ end %Do the toolbox check here -OspreyVersion = 'Osprey 2.5.0'; +OspreyVersion = 'Osprey 2.6.0'; hasSPM = 1; [hasSPM,OspreyVersion ] = osp_Toolbox_Check (module,MRSCont.flags.isGUI);