added subsample, tiers and processors to tree.shared command. removed bootstrap.share...

[mothur.git] / Mothur.xcodeproj / project.pbxproj

diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
index 2088e3791a7a7602e0a8015c06606afad8dc5d52..0e170bca666d877d35499134d28bc26e595f350c 100644 (file)
--- a/Mothur.xcodeproj/project.pbxproj
+++ b/Mothur.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
        archiveVersion = 1;
        classes = {
        };
-       objectVersion = 45;
+       objectVersion = 46;
        objects = {
 
 /* Begin PBXBuildFile section */
@@ -77,7 +77,6 @@
                A7E9B88C12D37EC400DA6239 /* blastdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B66412D37EC400DA6239 /* blastdb.cpp */; };
                A7E9B88D12D37EC400DA6239 /* boneh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B66612D37EC400DA6239 /* boneh.cpp */; };
                A7E9B88E12D37EC400DA6239 /* bootstrap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B66812D37EC400DA6239 /* bootstrap.cpp */; };
-               A7E9B88F12D37EC400DA6239 /* bootstrapsharedcommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B66A12D37EC400DA6239 /* bootstrapsharedcommand.cpp */; };
                A7E9B89012D37EC400DA6239 /* bstick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B66C12D37EC400DA6239 /* bstick.cpp */; };
                A7E9B89112D37EC400DA6239 /* calculator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B66E12D37EC400DA6239 /* calculator.cpp */; };
                A7E9B89212D37EC400DA6239 /* canberra.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B67012D37EC400DA6239 /* canberra.cpp */; };
@@ -112,7 +111,7 @@
                A7E9B8B012D37EC400DA6239 /* commandfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B6AF12D37EC400DA6239 /* commandfactory.cpp */; };
                A7E9B8B112D37EC400DA6239 /* commandoptionparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B6B112D37EC400DA6239 /* commandoptionparser.cpp */; };
                A7E9B8B212D37EC400DA6239 /* completelinkage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B6B412D37EC400DA6239 /* completelinkage.cpp */; };
-               A7E9B8B312D37EC400DA6239 /* consensuscommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B6B512D37EC400DA6239 /* consensuscommand.cpp */; };
+               A7E9B8B312D37EC400DA6239 /* consensus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B6B512D37EC400DA6239 /* consensus.cpp */; };
                A7E9B8B412D37EC400DA6239 /* consensusseqscommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B6B712D37EC400DA6239 /* consensusseqscommand.cpp */; };
                A7E9B8B512D37EC400DA6239 /* corraxescommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B6B912D37EC400DA6239 /* corraxescommand.cpp */; };
                A7E9B8B612D37EC400DA6239 /* coverage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E9B6BB12D37EC400DA6239 /* coverage.cpp */; };
@@ -527,8 +526,6 @@
                A7E9B66712D37EC400DA6239 /* boneh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = boneh.h; sourceTree = "<group>"; };
                A7E9B66812D37EC400DA6239 /* bootstrap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bootstrap.cpp; sourceTree = "<group>"; };
                A7E9B66912D37EC400DA6239 /* bootstrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bootstrap.h; sourceTree = "<group>"; };
-               A7E9B66A12D37EC400DA6239 /* bootstrapsharedcommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bootstrapsharedcommand.cpp; sourceTree = "<group>"; };
-               A7E9B66B12D37EC400DA6239 /* bootstrapsharedcommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bootstrapsharedcommand.h; sourceTree = "<group>"; };
                A7E9B66C12D37EC400DA6239 /* bstick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bstick.cpp; sourceTree = "<group>"; };
                A7E9B66D12D37EC400DA6239 /* bstick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bstick.h; sourceTree = "<group>"; };
                A7E9B66E12D37EC400DA6239 /* calculator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = calculator.cpp; sourceTree = "<group>"; };
@@ -600,8 +597,8 @@
                A7E9B6B212D37EC400DA6239 /* commandoptionparser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = commandoptionparser.hpp; sourceTree = SOURCE_ROOT; };
                A7E9B6B312D37EC400DA6239 /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = "<group>"; };
                A7E9B6B412D37EC400DA6239 /* completelinkage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = completelinkage.cpp; sourceTree = SOURCE_ROOT; };
-               A7E9B6B512D37EC400DA6239 /* consensuscommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = consensuscommand.cpp; sourceTree = "<group>"; };
-               A7E9B6B612D37EC400DA6239 /* consensuscommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = consensuscommand.h; sourceTree = "<group>"; };
+               A7E9B6B512D37EC400DA6239 /* consensus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = consensus.cpp; sourceTree = "<group>"; };
+               A7E9B6B612D37EC400DA6239 /* consensus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = consensus.h; sourceTree = "<group>"; };
                A7E9B6B712D37EC400DA6239 /* consensusseqscommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = consensusseqscommand.cpp; sourceTree = "<group>"; };
                A7E9B6B812D37EC400DA6239 /* consensusseqscommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = consensusseqscommand.h; sourceTree = "<group>"; };
                A7E9B6B912D37EC400DA6239 /* corraxescommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = corraxescommand.cpp; sourceTree = "<group>"; };
@@ -1132,6 +1129,8 @@
                                A7DAAFA3133A254E003956EB /* commandparameter.h */,
                                A7E9B6B412D37EC400DA6239 /* completelinkage.cpp */,
                                A7E9BA4212D3960D00DA6239 /* containers */,
+                               A7E9B6B612D37EC400DA6239 /* consensus.h */,
+                               A7E9B6B512D37EC400DA6239 /* consensus.cpp */,
                                A7AACFBA132FE008003D6C4D /* currentfile.h */,
                                A7E9B6C912D37EC400DA6239 /* display.h */,
                                A7E9B6D112D37EC400DA6239 /* dlibshuff.cpp */,
@@ -1308,8 +1307,6 @@
                                A71CB15E130B04A2001E7287 /* anosimcommand.cpp */,
                                A7E9B66112D37EC300DA6239 /* binsequencecommand.h */,
                                A7E9B66012D37EC300DA6239 /* binsequencecommand.cpp */,
-                               A7E9B66B12D37EC400DA6239 /* bootstrapsharedcommand.h */,
-                               A7E9B66A12D37EC400DA6239 /* bootstrapsharedcommand.cpp */,
                                A7E9B67312D37EC400DA6239 /* catchallcommand.h */,
                                A7E9B67212D37EC400DA6239 /* catchallcommand.cpp */,
                                A7E9B67B12D37EC400DA6239 /* chimerabellerophoncommand.h */,
@@ -1350,8 +1347,6 @@
                                A7E9B6A812D37EC400DA6239 /* collectcommand.cpp */,
                                A7E9B6AD12D37EC400DA6239 /* collectsharedcommand.h */,
                                A7E9B6AC12D37EC400DA6239 /* collectsharedcommand.cpp */,
-                               A7E9B6B612D37EC400DA6239 /* consensuscommand.h */,
-                               A7E9B6B512D37EC400DA6239 /* consensuscommand.cpp */,
                                A7E9B6B812D37EC400DA6239 /* consensusseqscommand.h */,
                                A7E9B6B712D37EC400DA6239 /* consensusseqscommand.cpp */,
                                A7C3DC0A14FE457500FE1924 /* cooccurrencecommand.h */,
@@ -1938,10 +1933,11 @@
                08FB7793FE84155DC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        attributes = {
+                               LastUpgradeCheck = 0420;
                                ORGANIZATIONNAME = "Schloss Lab";
                        };
                        buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "Mothur" */;
-                       compatibilityVersion = "Xcode 3.1";
+                       compatibilityVersion = "Xcode 3.2";
                        developmentRegion = English;
                        hasScannedForEncodings = 1;
                        knownRegions = (
@@ -1978,7 +1974,6 @@
                                A7E9B88C12D37EC400DA6239 /* blastdb.cpp in Sources */,
                                A7E9B88D12D37EC400DA6239 /* boneh.cpp in Sources */,
                                A7E9B88E12D37EC400DA6239 /* bootstrap.cpp in Sources */,
-                               A7E9B88F12D37EC400DA6239 /* bootstrapsharedcommand.cpp in Sources */,
                                A7E9B89012D37EC400DA6239 /* bstick.cpp in Sources */,
                                A7E9B89112D37EC400DA6239 /* calculator.cpp in Sources */,
                                A7E9B89212D37EC400DA6239 /* canberra.cpp in Sources */,
@@ -2013,7 +2008,7 @@
                                A7E9B8B012D37EC400DA6239 /* commandfactory.cpp in Sources */,
                                A7E9B8B112D37EC400DA6239 /* commandoptionparser.cpp in Sources */,
                                A7E9B8B212D37EC400DA6239 /* completelinkage.cpp in Sources */,
-                               A7E9B8B312D37EC400DA6239 /* consensuscommand.cpp in Sources */,
+                               A7E9B8B312D37EC400DA6239 /* consensus.cpp in Sources */,
                                A7E9B8B412D37EC400DA6239 /* consensusseqscommand.cpp in Sources */,
                                A7E9B8B512D37EC400DA6239 /* corraxescommand.cpp in Sources */,
                                A7E9B8B612D37EC400DA6239 /* coverage.cpp in Sources */,
@@ -2319,7 +2314,6 @@
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                COPY_PHASE_STRIP = NO;
                                GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
                                INSTALL_PATH = /usr/local/bin;
@@ -2373,7 +2367,6 @@
                                        "-lncurses",
                                        "-lreadline",
                                );
-                               PREBINDING = NO;
                                SDKROOT = macosx10.6;
                                USER_HEADER_SEARCH_PATHS = "";
                        };
@@ -2411,7 +2404,6 @@
                                        "-lncurses",
                                        "-lreadline",
                                );
-                               PREBINDING = NO;
                                SDKROOT = macosx10.6;
                        };
                        name = Release;