diff --git a/.gitignore b/.gitignore index 569f38d8..fb5f1bec 100644 --- a/.gitignore +++ b/.gitignore @@ -15,10 +15,7 @@ projects/VS2010/TestCatch/_UpgradeReport_Files/ projects/VS2010/TestCatch/TestCatch/TestCatch.vcxproj.filters projects/VisualStudio/TestCatch/UpgradeLog.XML UpgradeLog.XML -projects/XCode4/iOSTest/Build/Intermediates/PrecompiledHeaders -projects/XCode4/iOSTest/Build/Products/Debug-iphonesimulator/iOSTest.app.dSYM/Contents/Resources/DWARF -projects/XCode4/iOSTest/Build -projects/XCode4/CatchSelfTest/DerivedData -projects/XCode4/OCTest/DerivedData +Resources/DWARF +projects/XCode/iOSTest/Build *.pyc -projects/XCode4/iOSTest/DerivedData +DerivedData diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj b/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj similarity index 100% rename from projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj rename to projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.xcworkspace/xcshareddata/CatchSelfTest.xccheckout b/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.xcworkspace/xcshareddata/CatchSelfTest.xccheckout new file mode 100644 index 00000000..149325a9 --- /dev/null +++ b/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.xcworkspace/xcshareddata/CatchSelfTest.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 034502BF-F920-4DB6-82F5-71E61E50118C + IDESourceControlProjectName + CatchSelfTest + IDESourceControlProjectOriginsDictionary + + 01DD8CA9-7DC3-46BC-B998-EFF40EA3485F + ssh://github.com/philsquared/Catch.git + + IDESourceControlProjectPath + projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 01DD8CA9-7DC3-46BC-B998-EFF40EA3485F + ../../../../.. + + IDESourceControlProjectURL + ssh://github.com/philsquared/Catch.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + 01DD8CA9-7DC3-46BC-B998-EFF40EA3485F + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 01DD8CA9-7DC3-46BC-B998-EFF40EA3485F + IDESourceControlWCCName + Catch + + + + diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest/CatchSelfTest.1 b/projects/XCode/CatchSelfTest/CatchSelfTest/CatchSelfTest.1 similarity index 100% rename from projects/XCode4/CatchSelfTest/CatchSelfTest/CatchSelfTest.1 rename to projects/XCode/CatchSelfTest/CatchSelfTest/CatchSelfTest.1 diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest/catch_text.cpp b/projects/XCode/CatchSelfTest/CatchSelfTest/catch_text.cpp similarity index 100% rename from projects/XCode4/CatchSelfTest/CatchSelfTest/catch_text.cpp rename to projects/XCode/CatchSelfTest/CatchSelfTest/catch_text.cpp diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.pbxproj b/projects/XCode/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.pbxproj similarity index 100% rename from projects/XCode4/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.pbxproj rename to projects/XCode/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.pbxproj diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/projects/XCode/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from projects/XCode4/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to projects/XCode/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/projects/XCode/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.xcworkspace/xcshareddata/CatchSelfTestSingle.xccheckout b/projects/XCode/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.xcworkspace/xcshareddata/CatchSelfTestSingle.xccheckout new file mode 100644 index 00000000..fd24e72b --- /dev/null +++ b/projects/XCode/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.xcworkspace/xcshareddata/CatchSelfTestSingle.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 3A514CAE-B659-4429-93A3-39F9C0349EC4 + IDESourceControlProjectName + CatchSelfTestSingle + IDESourceControlProjectOriginsDictionary + + 01DD8CA9-7DC3-46BC-B998-EFF40EA3485F + ssh://github.com/philsquared/Catch.git + + IDESourceControlProjectPath + projects/XCode4/CatchSelfTest/CatchSelfTestSingle.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 01DD8CA9-7DC3-46BC-B998-EFF40EA3485F + ../../../../.. + + IDESourceControlProjectURL + ssh://github.com/philsquared/Catch.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + 01DD8CA9-7DC3-46BC-B998-EFF40EA3485F + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 01DD8CA9-7DC3-46BC-B998-EFF40EA3485F + IDESourceControlWCCName + Catch + + + + diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTestSingle/dummy.txt b/projects/XCode/CatchSelfTest/CatchSelfTestSingle/dummy.txt similarity index 100% rename from projects/XCode4/CatchSelfTest/CatchSelfTestSingle/dummy.txt rename to projects/XCode/CatchSelfTest/CatchSelfTestSingle/dummy.txt diff --git a/projects/XCode4/OCTest/OCTest.xcodeproj/project.pbxproj b/projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj similarity index 100% rename from projects/XCode4/OCTest/OCTest.xcodeproj/project.pbxproj rename to projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj diff --git a/projects/XCode4/OCTest/OCTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from projects/XCode4/OCTest/OCTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/xcshareddata/OCTest.xccheckout b/projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/xcshareddata/OCTest.xccheckout new file mode 100644 index 00000000..2480364e --- /dev/null +++ b/projects/XCode/OCTest/OCTest.xcodeproj/project.xcworkspace/xcshareddata/OCTest.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 2F99C19E-ADF6-4D99-86C7-7A7830677E7D + IDESourceControlProjectName + OCTest + IDESourceControlProjectOriginsDictionary + + DE66138E-2FC7-4C1B-9901-82CBF6694223 + ssh://github.com/philsquared/Catch.git + + IDESourceControlProjectPath + projects/XCode4/OCTest/OCTest.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + DE66138E-2FC7-4C1B-9901-82CBF6694223 + ../../../../.. + + IDESourceControlProjectURL + ssh://github.com/philsquared/Catch.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + DE66138E-2FC7-4C1B-9901-82CBF6694223 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + DE66138E-2FC7-4C1B-9901-82CBF6694223 + IDESourceControlWCCName + Catch + + + + diff --git a/projects/XCode4/OCTest/OCTest/CatchOCTestCase.h b/projects/XCode/OCTest/OCTest/CatchOCTestCase.h similarity index 100% rename from projects/XCode4/OCTest/OCTest/CatchOCTestCase.h rename to projects/XCode/OCTest/OCTest/CatchOCTestCase.h diff --git a/projects/XCode4/OCTest/OCTest/CatchOCTestCase.mm b/projects/XCode/OCTest/OCTest/CatchOCTestCase.mm similarity index 100% rename from projects/XCode4/OCTest/OCTest/CatchOCTestCase.mm rename to projects/XCode/OCTest/OCTest/CatchOCTestCase.mm diff --git a/projects/XCode4/OCTest/OCTest/Main.mm b/projects/XCode/OCTest/OCTest/Main.mm similarity index 100% rename from projects/XCode4/OCTest/OCTest/Main.mm rename to projects/XCode/OCTest/OCTest/Main.mm diff --git a/projects/XCode4/OCTest/OCTest/OCTest.1 b/projects/XCode/OCTest/OCTest/OCTest.1 similarity index 100% rename from projects/XCode4/OCTest/OCTest/OCTest.1 rename to projects/XCode/OCTest/OCTest/OCTest.1 diff --git a/projects/XCode4/OCTest/OCTest/OCTest.mm b/projects/XCode/OCTest/OCTest/OCTest.mm similarity index 100% rename from projects/XCode4/OCTest/OCTest/OCTest.mm rename to projects/XCode/OCTest/OCTest/OCTest.mm diff --git a/projects/XCode4/OCTest/OCTest/TestObj.h b/projects/XCode/OCTest/OCTest/TestObj.h similarity index 100% rename from projects/XCode4/OCTest/OCTest/TestObj.h rename to projects/XCode/OCTest/OCTest/TestObj.h diff --git a/projects/XCode4/OCTest/OCTest/TestObj.m b/projects/XCode/OCTest/OCTest/TestObj.m similarity index 100% rename from projects/XCode4/OCTest/OCTest/TestObj.m rename to projects/XCode/OCTest/OCTest/TestObj.m diff --git a/projects/XCode4/iOSTest/iOSTest.xcodeproj/project.pbxproj b/projects/XCode/iOSTest/iOSTest.xcodeproj/project.pbxproj similarity index 100% rename from projects/XCode4/iOSTest/iOSTest.xcodeproj/project.pbxproj rename to projects/XCode/iOSTest/iOSTest.xcodeproj/project.pbxproj diff --git a/projects/XCode4/iOSTest/iOSTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/projects/XCode/iOSTest/iOSTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from projects/XCode4/iOSTest/iOSTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to projects/XCode/iOSTest/iOSTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/projects/XCode4/iOSTest/iOSTest/OCTest.mm b/projects/XCode/iOSTest/iOSTest/OCTest.mm similarity index 100% rename from projects/XCode4/iOSTest/iOSTest/OCTest.mm rename to projects/XCode/iOSTest/iOSTest/OCTest.mm diff --git a/projects/XCode4/iOSTest/iOSTest/TestObj.h b/projects/XCode/iOSTest/iOSTest/TestObj.h similarity index 100% rename from projects/XCode4/iOSTest/iOSTest/TestObj.h rename to projects/XCode/iOSTest/iOSTest/TestObj.h diff --git a/projects/XCode4/iOSTest/iOSTest/TestObj.m b/projects/XCode/iOSTest/iOSTest/TestObj.m similarity index 100% rename from projects/XCode4/iOSTest/iOSTest/TestObj.m rename to projects/XCode/iOSTest/iOSTest/TestObj.m diff --git a/projects/XCode4/iOSTest/iOSTest/en.lproj/InfoPlist.strings b/projects/XCode/iOSTest/iOSTest/en.lproj/InfoPlist.strings similarity index 100% rename from projects/XCode4/iOSTest/iOSTest/en.lproj/InfoPlist.strings rename to projects/XCode/iOSTest/iOSTest/en.lproj/InfoPlist.strings diff --git a/projects/XCode4/iOSTest/iOSTest/iOSTest-Info.plist b/projects/XCode/iOSTest/iOSTest/iOSTest-Info.plist similarity index 100% rename from projects/XCode4/iOSTest/iOSTest/iOSTest-Info.plist rename to projects/XCode/iOSTest/iOSTest/iOSTest-Info.plist diff --git a/projects/XCode4/iOSTest/iOSTest/iOSTest-Prefix.pch b/projects/XCode/iOSTest/iOSTest/iOSTest-Prefix.pch similarity index 100% rename from projects/XCode4/iOSTest/iOSTest/iOSTest-Prefix.pch rename to projects/XCode/iOSTest/iOSTest/iOSTest-Prefix.pch diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/xcuserdata/Phil.xcuserdatad/xcschemes/xcschememanagement.plist b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/xcuserdata/Phil.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index c66f61d7..00000000 --- a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/xcuserdata/Phil.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SchemeUserState - - CatchSelfTest.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - 4A6D0C1F149B3D3B00DB3EAA - - primary - - - - -