diff --git a/doc/installation/checkInstallation.html b/doc/installation/checkInstallation.html index 14b0d50e..a9336bb5 100644 --- a/doc/installation/checkInstallation.html +++ b/doc/installation/checkInstallation.html @@ -57,7 +57,7 @@

CROSS-REFERENCE INFORMATION ^ <h2><a name=SUBFUNCTIONS ^

+
  • function res = interpretResults(results)
  • function str = myStr(InputStr,len)
  • function status = makeBinaryExecutable()
  • function printOrange(stringToPrint)

    • SOURCE CODE ^

    0001 function currVer = checkInstallation(developMode)
@@ -112,13 +112,13 @@ 
    SOURCE CODE ^for i=1:3
 0051                 if currVerNum(i)<newVerNum(i)
 0052                     fprintf([myStr('   > Latest RAVEN release available',40) '%f'])
-0053                     printOrange([newVer,'\n'])
+0053                     printOrange([newVer,'\n'])
 0054                     hasGit=isfolder(fullfile(ravenDir,'.git'));
 0055                     if hasGit
-0056                         printOrange('     Run git pull in your favourite git client\n')
-0057                         printOrange('     to get the latest RAVEN release\n');
+0056                         printOrange('     Run git pull in your favourite git client\n')
+0057                         printOrange('     to get the latest RAVEN release\n');
 0058                     else
-0059                         printOrange([myStr('     Instructions on how to upgrade',40) '%f'])
+0059                         printOrange([myStr('     Instructions on how to upgrade',40) '%f'])
 0060                         fprintf('<a href="https://github.com/SysBioChalmers/RAVEN/wiki/Installation#upgrade-to-latest-raven-release">here</a>\n');
 0061                     end
 0062                     break
@@ -128,8 +128,8 @@ 
    SOURCE CODE ^end
 0067         catch
 0068             fprintf([myStr('   > Checking for latest RAVEN release',40) '%f'])
-0069             printOrange('Fail\n');
-0070             printOrange('     Cannot reach GitHub for release info\n');
+0069             printOrange('Fail\n');
+0070             printOrange('     Cannot reach GitHub for release info\n');
 0071         end
 0072     end
 0073 else
@@ -156,12 +156,12 @@ 
    SOURCE CODE ^'Pass\n')   
 0096     catch
-0097         printOrange('Fail\n')
+0097         printOrange('Fail\n')
 0098         fprintf(['   You might have to rerun checkInstallation again\n'...
 0099                  '   next time you start up MATLAB\n'])        
 0100     end
 0101 catch
-0102     printOrange('Fail\n')
+0102     printOrange('Fail\n')
 0103 end
 0104 
 0105 if isunix
@@ -170,7 +170,7 @@ 
    SOURCE CODE ^if status == 0
 0109         fprintf('Pass\n')
 0110     else
-0111         printOrange('Fail\n')
+0111         printOrange('Fail\n')
 0112     end
 0113 end
 0114 
@@ -182,7 +182,7 @@ 
    SOURCE CODE ^'Pass\n')
 0122 catch
-0123     printOrange('Fail\n')
+0123     printOrange('Fail\n')
 0124 end
 0125 fprintf([myStr(' > Checking libSBML version',40) '%f'])
 0126 try
@@ -191,11 +191,11 @@ 
    SOURCE CODE ^% Only works in libSBML 5.17.0+
 0130         fprintf([libSBMLver.libSBML_version_string '\n']);
 0131     catch
-0132         printOrange('Fail\n')
+0132         printOrange('Fail\n')
 0133         fprintf('   An older libSBML version was found, update to version 5.17.0 or higher for a significant improvement of model import\n');
 0134     end
 0135 catch
-0136     printOrange('Fail\n')
+0136     printOrange('Fail\n')
 0137     fprintf('   Download libSBML from http://sbml.org/Software/libSBML/Downloading_libSBML and add to MATLAB path\n');
 0138 end
 0139 fprintf(' > Checking model import and export\n')
@@ -205,7 +205,7 @@ 
    SOURCE CODE ^if res(1).Passed == 1
 0144     fprintf('Pass\n')
 0145 else
-0146     printOrange('Fail\n')
+0146     printOrange('Fail\n')
 0147     addList = matlab.addons.installedAddons;
 0148     if any(strcmpi(addList.Name,'Text Analytics Toolbox'))
 0149         fprintf(['   Excel import/export is incompatible with MATLAB Text Analytics Toolbox.\n' ...
@@ -217,21 +217,21 @@ 
    SOURCE CODE ^if res(3).Passed == 1
 0156     fprintf('Pass\n')
 0157 else
-0158     printOrange('Fail\n')
+0158     printOrange('Fail\n')
 0159 end
 0160 
 0161 fprintf([myStr('   > Import SBML format',40) '%f'])
 0162 if res(2).Passed == 1
 0163     fprintf('Pass\n')
 0164 else
-0165     printOrange('Fail\n')
+0165     printOrange('Fail\n')
 0166 end
 0167 
 0168 fprintf([myStr('   > Export SBML format',40) '%f'])
 0169 if res(4).Passed == 1
 0170     fprintf('Pass\n')
 0171 else
-0172     printOrange('Fail\n')
+0172     printOrange('Fail\n')
 0173 end
 0174 
 0175 if res(1).Passed~=1 && res(3).Passed~=1 && exist('vaderSentimentScores.m','file')==2
@@ -259,28 +259,28 @@ 
    SOURCE CODE ^if res(1).Passed == 1
 0198     fprintf('Pass\n')
 0199 else
-0200     printOrange('Fail\n')
+0200     printOrange('Fail\n')
 0201 end
 0202 
 0203 fprintf([myStr('   > gurobi',40) '%f'])
 0204 if res(2).Passed == 1
 0205     fprintf('Pass\n')
 0206 else
-0207     printOrange('Fail\n')
+0207     printOrange('Fail\n')
 0208 end
 0209 
 0210 fprintf([myStr('   > soplex',40) '%f'])
 0211 if res(3).Passed == 1
 0212     fprintf('Pass\n')
 0213 else
-0214     printOrange('Fail\n')
+0214     printOrange('Fail\n')
 0215 end
 0216 
 0217 fprintf([myStr('   > cobra',40) '%f'])
 0218 if res(4).Passed == 1
 0219     fprintf('Pass\n')
 0220 else
-0221     printOrange('Fail\n')
+0221     printOrange('Fail\n')
 0222 end
 0223 fprintf([myStr(' > Set RAVEN solver',40) '%f'])
 0224 try
@@ -358,7 +358,7 @@ 
    SOURCE CODE ^'Pass\n');
 0297     res=true;
 0298 else
-0299     printOrange('Fail\n')
+0299     printOrange('Fail\n')
 0300     fprintf('   Download/compile the binary and rerun checkInstallation\n');
 0301     res=false;
 0302 end
@@ -400,7 +400,19 @@ 
    SOURCE CODE ^'Failed to make %s executable: %s ',binList{i},strip(cmdout))
 0339     end
 0340 end
-0341 end
    +0341 end +0342 +0343 function printOrange(stringToPrint) +0344 % printOrange +0345 % Duplicate of RAVEN/core/printOrange is also kept here, as this function +0346 % should be able to run before adding RAVEN to the MATLAB path. +0347 try useDesktop = usejava('desktop'); catch, useDesktop = false; end +0348 if useDesktop +0349 fprintf(['[\b' stringToPrint,']\b']) +0350 else +0351 fprintf(stringToPrint) +0352 end +0353 end
    Generated by m2html © 2005
    \ No newline at end of file diff --git a/installation/checkInstallation.m b/installation/checkInstallation.m index aa5223f1..d97dff16 100755 --- a/installation/checkInstallation.m +++ b/installation/checkInstallation.m @@ -339,3 +339,15 @@ end end end + +function printOrange(stringToPrint) +% printOrange +% Duplicate of RAVEN/core/printOrange is also kept here, as this function +% should be able to run before adding RAVEN to the MATLAB path. +try useDesktop = usejava('desktop'); catch, useDesktop = false; end +if useDesktop + fprintf(['[\b' stringToPrint,']\b']) +else + fprintf(stringToPrint) +end +end