added oldfasta and column parameter to dist.seqs so you can append distances to an...

[mothur.git] / mothur.cpp

diff --git a/mothur.cpp b/mothur.cpp
index d674ff40470a6f485153d8ee90044ae878dfc427..eb5e8f92c105f708d56a6d4ce681e94aaa0453c3 100644 (file)
--- a/mothur.cpp
+++ b/mothur.cpp
@@ -12,7 +12,6 @@
 #include "globaldata.hpp"
 #include "mothurout.h"
 
-
 /**************************************************************************************************/
 
 GlobalData* GlobalData::_uniqueInstance = 0;
@@ -72,10 +71,42 @@ int main(int argc, char *argv[]){
                        m->mothurOutEndLine(); m->mothurOutEndLine();
                #endif
                
+               #ifdef MOTHUR_FILES
+                       string temp = MOTHUR_FILES; 
+                       
+                       //add / to name if needed
+                       string lastChar = temp.substr(temp.length()-1);
+                       #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+                               if (lastChar != "/") { temp += "/"; }
+                       #else
+                               if (lastChar != "\\") { temp += "\\"; } 
+                       #endif
+                       
+                       temp = getFullPathName(temp);
+                       m->setDefaultPath(temp);
+                       
+                       m->mothurOutJustToLog("Using default file location " + temp);
+                       m->mothurOutEndLine(); m->mothurOutEndLine();
+               #endif
+               
+               #ifdef BIT_VERSION
+                       m->mothurOutJustToLog("Running 64Bit Version");
+                       m->mothurOutEndLine(); m->mothurOutEndLine();
+               #else
+                       m->mothurOutJustToLog("Running 32Bit Version");
+                       m->mothurOutEndLine(); m->mothurOutEndLine();
+               #endif
+               
+               //get releaseDate from Make
+               string releaseDate = RELEASE_DATE; 
+               string mothurVersion = VERSION; 
+               m->setReleaseDate(releaseDate);
+               m->setVersion(mothurVersion);
+               
                //header
-               m->mothurOut("mothur v.1.9");
+               m->mothurOut("mothur v." + mothurVersion);
                m->mothurOutEndLine();          
-               m->mothurOut("Last updated: 4/16/2010");
+               m->mothurOut("Last updated: " + releaseDate);
                m->mothurOutEndLine();  
                m->mothurOutEndLine();          
                m->mothurOut("by");