github
/
Rebel
зеркало из https://github.com/github/Rebel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Move to specta/specta, specta/expecta, and XCTest

This commit is contained in:
Matt Diephouse 2014-07-02 16:12:28 -04:00
Родитель 58a781255f
Коммит 8ba5942e8b
4 изменённых файлов: 21 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
.gitmodules поставляемый
Просмотреть файл

@ -1,9 +1,9 @@
[submodule "External/specta"] [submodule "External/specta"]
path = External/specta path = External/specta
url = https://github.com/github/specta.git url = https://github.com/specta/specta.git
[submodule "External/expecta"] [submodule "External/expecta"]
path = External/expecta path = External/expecta
url = https://github.com/github/expecta.git url = https://github.com/specta/expecta.git
[submodule "External/xcconfigs"] [submodule "External/xcconfigs"]
path = External/xcconfigs path = External/xcconfigs
url = https://github.com/jspahrsummers/xcconfigs.git url = https://github.com/jspahrsummers/xcconfigs.git

2
External/expecta поставляемый

@ -1 +1 @@
Subproject commit dc270cfa343a4d1482a5b0c221106086eb8134d4 Subproject commit 9a124336f3d7ecac9f00a5313b42cd480bc8a0d5

2
External/specta поставляемый

@ -1 +1 @@
Subproject commit 19358f4257e363cad308d8e1038d8140888bf953 Subproject commit 6eef3072d96a583438f12e379cdd62add9cd7ce6

31
Rebel.xcodeproj/project.pbxproj
Просмотреть файл

@ -60,7 +60,6 @@
D088BEFC16747EE1004B2665 /* NSFont+RBLFallbackAdditionsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D088BEFB16747EE1004B2665 /* NSFont+RBLFallbackAdditionsSpec.m */; }; D088BEFC16747EE1004B2665 /* NSFont+RBLFallbackAdditionsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D088BEFB16747EE1004B2665 /* NSFont+RBLFallbackAdditionsSpec.m */; };
D09AE4E315C5F45200ECAD10 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D09AE4E215C5F45200ECAD10 /* Cocoa.framework */; }; D09AE4E315C5F45200ECAD10 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D09AE4E215C5F45200ECAD10 /* Cocoa.framework */; };
D09AE4ED15C5F45200ECAD10 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D09AE4EB15C5F45200ECAD10 /* InfoPlist.strings */; }; D09AE4ED15C5F45200ECAD10 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D09AE4EB15C5F45200ECAD10 /* InfoPlist.strings */; };
D09AE4F915C5F45300ECAD10 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D09AE4F815C5F45300ECAD10 /* SenTestingKit.framework */; };
D09AE4FA15C5F45300ECAD10 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D09AE4E215C5F45200ECAD10 /* Cocoa.framework */; }; D09AE4FA15C5F45300ECAD10 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D09AE4E215C5F45200ECAD10 /* Cocoa.framework */; };
D09AE4FD15C5F45300ECAD10 /* Rebel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D09AE4DF15C5F45200ECAD10 /* Rebel.framework */; }; D09AE4FD15C5F45300ECAD10 /* Rebel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D09AE4DF15C5F45200ECAD10 /* Rebel.framework */; };
D09AE50315C5F45300ECAD10 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D09AE50115C5F45300ECAD10 /* InfoPlist.strings */; }; D09AE50315C5F45300ECAD10 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D09AE50115C5F45300ECAD10 /* InfoPlist.strings */; };
@ -170,8 +169,7 @@
D09AE4EC15C5F45200ECAD10 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; }; D09AE4EC15C5F45200ECAD10 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
D09AE4EE15C5F45200ECAD10 /* Rebel-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Rebel-Prefix.pch"; sourceTree = "<group>"; }; D09AE4EE15C5F45200ECAD10 /* Rebel-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Rebel-Prefix.pch"; sourceTree = "<group>"; };
D09AE4EF15C5F45200ECAD10 /* Rebel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Rebel.h; sourceTree = "<group>"; }; D09AE4EF15C5F45200ECAD10 /* Rebel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Rebel.h; sourceTree = "<group>"; };
D09AE4F715C5F45300ECAD10 /* RebelTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RebelTests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; D09AE4F715C5F45300ECAD10 /* RebelTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RebelTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
D09AE4F815C5F45300ECAD10 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
D09AE50015C5F45300ECAD10 /* RebelTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "RebelTests-Info.plist"; sourceTree = "<group>"; }; D09AE50015C5F45300ECAD10 /* RebelTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "RebelTests-Info.plist"; sourceTree = "<group>"; };
D09AE50215C5F45300ECAD10 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; }; D09AE50215C5F45300ECAD10 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
D0E91C561603CC7600D23E93 /* RBLClipView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RBLClipView.h; sourceTree = "<group>"; }; D0E91C561603CC7600D23E93 /* RBLClipView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RBLClipView.h; sourceTree = "<group>"; };
@ -209,7 +207,6 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
301569981602161400E3BE46 /* QuartzCore.framework in Frameworks */, 301569981602161400E3BE46 /* QuartzCore.framework in Frameworks */,
D09AE4F915C5F45300ECAD10 /* SenTestingKit.framework in Frameworks */,
D09AE4FA15C5F45300ECAD10 /* Cocoa.framework in Frameworks */, D09AE4FA15C5F45300ECAD10 /* Cocoa.framework in Frameworks */,
D09AE4FD15C5F45300ECAD10 /* Rebel.framework in Frameworks */, D09AE4FD15C5F45300ECAD10 /* Rebel.framework in Frameworks */,
D4ACA4CB18DB95F900EBD899 /* libExpecta.a in Frameworks */, D4ACA4CB18DB95F900EBD899 /* libExpecta.a in Frameworks */,
@ -380,7 +377,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
D09AE4DF15C5F45200ECAD10 /* Rebel.framework */, D09AE4DF15C5F45200ECAD10 /* Rebel.framework */,
D09AE4F715C5F45300ECAD10 /* RebelTests.octest */, D09AE4F715C5F45300ECAD10 /* RebelTests.xctest */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
@ -392,7 +389,6 @@
D4ACA4CA18DB95F900EBD899 /* libExpecta.a */, D4ACA4CA18DB95F900EBD899 /* libExpecta.a */,
306A81EC1601F44200BF45F3 /* QuartzCore.framework */, 306A81EC1601F44200BF45F3 /* QuartzCore.framework */,
D09AE4E215C5F45200ECAD10 /* Cocoa.framework */, D09AE4E215C5F45200ECAD10 /* Cocoa.framework */,
D09AE4F815C5F45300ECAD10 /* SenTestingKit.framework */,
D0E91C5A1603CDC300D23E93 /* QuartzCore.framework */, D0E91C5A1603CDC300D23E93 /* QuartzCore.framework */,
88347E7216F2145900872A0A /* WebKit.framework */, 88347E7216F2145900872A0A /* WebKit.framework */,
D09AE4E415C5F45200ECAD10 /* Other Frameworks */, D09AE4E415C5F45200ECAD10 /* Other Frameworks */,
@ -532,8 +528,8 @@
); );
name = RebelTests; name = RebelTests;
productName = RebelTests; productName = RebelTests;
productReference = D09AE4F715C5F45300ECAD10 /* RebelTests.octest */; productReference = D09AE4F715C5F45300ECAD10 /* RebelTests.xctest */;
productType = "com.apple.product-type.bundle"; productType = "com.apple.product-type.bundle.unit-test";
}; };
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
@ -541,6 +537,7 @@
D09AE4D515C5F45200ECAD10 /* Project object */ = { D09AE4D515C5F45200ECAD10 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastTestingUpgradeCheck = 0510;
LastUpgradeCheck = 0500; LastUpgradeCheck = 0500;
ORGANIZATIONNAME = GitHub; ORGANIZATIONNAME = GitHub;
}; };
@ -694,7 +691,10 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = D08BB2E815CB307200CC9868 /* Mac-Application.xcconfig */; baseConfigurationReference = D08BB2E815CB307200CC9868 /* Mac-Application.xcconfig */;
buildSettings = { buildSettings = {
FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\""; FRAMEWORK_SEARCH_PATHS = (
"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
"$(inherited)",
);
GCC_PREFIX_HEADER = "RebelTests/RebelTests-Prefix.pch"; GCC_PREFIX_HEADER = "RebelTests/RebelTests-Prefix.pch";
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
External/specta/src, External/specta/src,
@ -703,7 +703,6 @@
INFOPLIST_FILE = "RebelTests/RebelTests-Info.plist"; INFOPLIST_FILE = "RebelTests/RebelTests-Info.plist";
OTHER_LDFLAGS = "-all_load"; OTHER_LDFLAGS = "-all_load";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = octest;
}; };
name = Profile; name = Profile;
}; };
@ -763,7 +762,10 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = D08BB2E815CB307200CC9868 /* Mac-Application.xcconfig */; baseConfigurationReference = D08BB2E815CB307200CC9868 /* Mac-Application.xcconfig */;
buildSettings = { buildSettings = {
FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\""; FRAMEWORK_SEARCH_PATHS = (
"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
"$(inherited)",
);
GCC_PREFIX_HEADER = "RebelTests/RebelTests-Prefix.pch"; GCC_PREFIX_HEADER = "RebelTests/RebelTests-Prefix.pch";
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
External/specta/src, External/specta/src,
@ -772,7 +774,6 @@
INFOPLIST_FILE = "RebelTests/RebelTests-Info.plist"; INFOPLIST_FILE = "RebelTests/RebelTests-Info.plist";
OTHER_LDFLAGS = "-all_load"; OTHER_LDFLAGS = "-all_load";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = octest;
}; };
name = Debug; name = Debug;
}; };
@ -780,7 +781,10 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = D08BB2E815CB307200CC9868 /* Mac-Application.xcconfig */; baseConfigurationReference = D08BB2E815CB307200CC9868 /* Mac-Application.xcconfig */;
buildSettings = { buildSettings = {
FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\""; FRAMEWORK_SEARCH_PATHS = (
"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
"$(inherited)",
);
GCC_PREFIX_HEADER = "RebelTests/RebelTests-Prefix.pch"; GCC_PREFIX_HEADER = "RebelTests/RebelTests-Prefix.pch";
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
External/specta/src, External/specta/src,
@ -789,7 +793,6 @@
INFOPLIST_FILE = "RebelTests/RebelTests-Info.plist"; INFOPLIST_FILE = "RebelTests/RebelTests-Info.plist";
OTHER_LDFLAGS = "-all_load"; OTHER_LDFLAGS = "-all_load";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = octest;
}; };
name = Release; name = Release;
}; };