Permalink
Browse files

Starting vsearch capability for Windows

Vsearch disclaimer: This is a pre-release of VSEARCH 2.3.1 for 64-bit Windows. The binary is compiled with the mingw-w64 cross compiler. Not tested well. Not for production. Feel free to try it out!
  • Loading branch information...
1 parent 0a2af8a commit 7ee85e37daa5bd7a768df8e897049409aefe0c6a @mothur-westcott mothur-westcott committed Dec 8, 2016
Showing with 7 additions and 5 deletions.
  1. +7 −5 source/commands/clustercommand.cpp
@@ -268,10 +268,10 @@ ClusterCommand::ClusterCommand(string option) {
if ((method == "agc") || (method == "dgc")) {
if (fastafile == "") { m->mothurOut("[ERROR]: You must provide a fasta file when using the agc or dgc clustering methods, aborting\n."); abort = true;}
}
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
-#else
- if ((method == "agc") || (method == "dgc")) { m->mothurOut("[ERROR]: The agc and dgc clustering methods are not available for Windows, aborting\n."); abort = true; }
-#endif
+//#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
+//#else
+// if ((method == "agc") || (method == "dgc")) { m->mothurOut("[ERROR]: The agc and dgc clustering methods are not available for Windows, aborting\n."); abort = true; }
+//#endif
//bool cutoffSet = false;
temp = validParameter.validFile(parameters, "cutoff", false);
@@ -412,10 +412,12 @@ int ClusterCommand::runVsearchCluster(){
ableToOpen = m->openInputFile((uLocation + ".exe"), in2, "no error"); in2.close();
#endif
- if(ableToOpen == 1) { m->mothurOut("[ERROR]: " + uLocation + " file does not exist. mothur requires the vsearch executable."); m->mothurOutEndLine(); abort = true; }
+ if(ableToOpen == 1) { m->mothurOut("[ERROR]: " + uLocation + " file does not exist. mothur requires the vsearch executable."); m->mothurOutEndLine(); m->control_pressed = true; }
else { m->mothurOut("Found vsearch in your path, using " + uLocation + "\n");vsearchLocation = uLocation; }
}else { vsearchLocation = vsearchCommand; }
+ if (m->control_pressed) { return 0; }
+
vsearchLocation = m->getFullPathName(vsearchLocation);
string vsearchFastafile = ""; VsearchFileParser* vParse;

0 comments on commit 7ee85e3

Please sign in to comment.