Merge pull request #755 from HJZollner/develop

Update compile script

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.6.0','Date', 'July 15, 2024',...
+gui.d = uiw.dialog.About('Name', 'Osprey','Version','2.6.1','Date', 'July 15, 2024',...
 'Timeout', 3,'CustomText', 'Osprey is provided by Johns Hopkins University.',...
 'ContactInfo', '[email protected]','LogoCData', logoBanner);
 

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.6.0';
+OspreyVersion = 'Osprey 2.6.1';
 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%%%

job/OspreyJob.m

@@ -781,7 +781,7 @@
 %%% 7. SET FLAGS AND VERSION %%%
 MRSCont.flags.didJob        = 1;
 MRSCont.loadedJob           = jobFile;
-MRSCont.ver.Osp             = 'Osprey 2.6.0';
+MRSCont.ver.Osp             = 'Osprey 2.6.1';
 
 
 %%% 8. CHECK IF OUTPUT STRUCTURE ALREADY EXISTS IN OUTPUT FOLDER %%%

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.6.0',...
+    'ExecutableVersion','2.6.1',...
     '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.6.0',...
+    'ExecutableVersion','2.6.1',...
     'ExecutableName','OspreyCMD',...
     'AdditionalFiles',{ fullfile(SPM12Dir),...
                        fullfile(OspreyDir,'coreg'),...
@@ -273,15 +273,17 @@ function CompileOspreyStandalone(OutputDir,SPM12Dir,CreateHBCD, CreateCMD, Creat
 
 
     buildResults = compiler.build.standaloneApplication (opts);
-end
 
-if PackageInstaller
-    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.6.0', 'ApplicationName','OspreyCMD')
+    if PackageInstaller
+        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.6.1', 'ApplicationName','OspreyCMD')
+    end
 end
 
+
+
 %% 4. GUI export
 % Compile GUI Osprey which is only working if you supplied the path to the
 % widgets and GUI Layout Toolboxes
@@ -292,7 +294,7 @@ function CompileOspreyStandalone(OutputDir,SPM12Dir,CreateHBCD, CreateCMD, Creat
         'OutputDir',OutputDirGUI,...
         'ExecutableIcon',fullfile(OspreyDir, 'graphics','osprey.gif'),...
         'ExecutableSplashScreen',fullfile(OspreyDir, 'graphics','osprey.gif'),...
-        'ExecutableVersion','2.6.0',...
+        'ExecutableVersion','2.6.1',...
         'ExecutableName','Osprey',...
         'AdditionalFiles',{fullfile(WidgetsDir),...
                            fullfile(GUILayoutDir),...
@@ -329,13 +331,14 @@ function CompileOspreyStandalone(OutputDir,SPM12Dir,CreateHBCD, CreateCMD, Creat
 
 
     buildResults = compiler.build.standaloneApplication(opts);
-end
 
-if PackageInstaller
-    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.6.0', 'ApplicationName','OspreyGUI')
+    if PackageInstaller
+        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.6.1', 'ApplicationName','OspreyGUI')
+    end
 end
 
+
 end

utilities/osp_CheckRunPreviousModule.m

@@ -74,7 +74,7 @@
 end
 
 %Do the toolbox check here
-OspreyVersion = 'Osprey 2.6.0';
+OspreyVersion = 'Osprey 2.6.1';
 hasSPM = 1;
 [hasSPM,OspreyVersion ] = osp_Toolbox_Check (module,MRSCont.flags.isGUI);