Merge pull request #752 from HJZollner/develop

Prepare release v.2.6.0
schorschinho · Jul 15, 2024 · 440f108 · 440f108
2 parents 0903247 + 27fa75f
commit 440f108
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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);