Skip to content

C
cocoapods
Commit d0ffe31e authored by Fabio Pelosin's avatar Fabio Pelosin
Browse files
Options

[XCConfigIntegrator] Downcase the name of the build configurations

parent d897a371
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 20 deletions
examples/AFNetworking Example/AFNetworking Mac Example.xcodeproj/project.pbxproj
View file @ d0ffe31e
......@@ -19,8 +19,8 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
118DF2C9405612B45655D94E /* Pods-AFNetworking Example.Release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AFNetworking Example.Release.xcconfig"; path = "Pods/Pods-AFNetworking Example.Release.xcconfig"; sourceTree = "<group>"; };
1BC0FB7006F49381520A8545 /* Pods-AFNetworking Example.Debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AFNetworking Example.Debug.xcconfig"; path = "Pods/Pods-AFNetworking Example.Debug.xcconfig"; sourceTree = "<group>"; };
1489BC7C65DCCDA21BD9C10D /* Pods-AFNetworking Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AFNetworking Example.release.xcconfig"; path = "Pods/Pods-AFNetworking Example.release.xcconfig"; sourceTree = "<group>"; };
206C0CA2FCD1CCE9783CC39F /* Pods-AFNetworking Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AFNetworking Example.debug.xcconfig"; path = "Pods/Pods-AFNetworking Example.debug.xcconfig"; sourceTree = "<group>"; };
6935B1E417A24F0E958977ED /* libPods-AFNetworking Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-AFNetworking Example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
B304CCE7177D58DD00F4FC85 /* adn.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = adn.cer; sourceTree = SOURCE_ROOT; };
F8129BFB1591061B009BFE23 /* AFNetworking Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "AFNetworking Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
......@@ -61,8 +61,8 @@
F8129C051591061B009BFE23 /* Classes */,
F8129BFE1591061B009BFE23 /* Frameworks */,
F8129BFC1591061B009BFE23 /* Products */,
1BC0FB7006F49381520A8545 /* Pods-AFNetworking Example.Debug.xcconfig */,
118DF2C9405612B45655D94E /* Pods-AFNetworking Example.Release.xcconfig */,
206C0CA2FCD1CCE9783CC39F /* Pods-AFNetworking Example.debug.xcconfig */,
1489BC7C65DCCDA21BD9C10D /* Pods-AFNetworking Example.release.xcconfig */,
);
indentWidth = 4;
sourceTree = "<group>";
......@@ -298,7 +298,7 @@
};
F8129C1A1591061B009BFE23 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 1BC0FB7006F49381520A8545 /* Pods-AFNetworking Example.Debug.xcconfig */;
baseConfigurationReference = 206C0CA2FCD1CCE9783CC39F /* Pods-AFNetworking Example.debug.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
......@@ -312,7 +312,7 @@
};
F8129C1B1591061B009BFE23 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 118DF2C9405612B45655D94E /* Pods-AFNetworking Example.Release.xcconfig */;
baseConfigurationReference = 1489BC7C65DCCDA21BD9C10D /* Pods-AFNetworking Example.release.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
......
examples/AFNetworking Example/AFNetworking iOS Example.xcodeproj/project.pbxproj
View file @ d0ffe31e
......@@ -33,6 +33,8 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
08ACA902EBEF3347432C3442 /* Pods-AFNetworking iOS Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AFNetworking iOS Example.release.xcconfig"; path = "Pods/Pods-AFNetworking iOS Example.release.xcconfig"; sourceTree = "<group>"; };
17E95B75D4453CE0BA3028FF /* Pods-AFNetworking iOS Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AFNetworking iOS Example.debug.xcconfig"; path = "Pods/Pods-AFNetworking iOS Example.debug.xcconfig"; sourceTree = "<group>"; };
2982AD3117107C0000FFF048 /* adn.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = adn.cer; sourceTree = SOURCE_ROOT; };
50ABD6EC159FC2CE001BE42C /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
7384432FCC95B62DB577C5D3 /* Pods-AFNetworking iOS Example.Release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AFNetworking iOS Example.Release.xcconfig"; path = "Pods/Pods-AFNetworking iOS Example.Release.xcconfig"; sourceTree = "<group>"; };
......@@ -133,6 +135,8 @@
F8E469611395739C00DB05C8 /* Products */,
B5BF8B2301C54A4C220FBB61 /* Pods-AFNetworking iOS Example.Debug.xcconfig */,
7384432FCC95B62DB577C5D3 /* Pods-AFNetworking iOS Example.Release.xcconfig */,
17E95B75D4453CE0BA3028FF /* Pods-AFNetworking iOS Example.debug.xcconfig */,
08ACA902EBEF3347432C3442 /* Pods-AFNetworking iOS Example.release.xcconfig */,
);
indentWidth = 4;
sourceTree = "<group>";
......@@ -358,7 +362,7 @@
};
F8E469821395739D00DB05C8 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = B5BF8B2301C54A4C220FBB61 /* Pods-AFNetworking iOS Example.Debug.xcconfig */;
baseConfigurationReference = 17E95B75D4453CE0BA3028FF /* Pods-AFNetworking iOS Example.debug.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
......@@ -380,7 +384,7 @@
};
F8E469831395739D00DB05C8 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7384432FCC95B62DB577C5D3 /* Pods-AFNetworking iOS Example.Release.xcconfig */;
baseConfigurationReference = 08ACA902EBEF3347432C3442 /* Pods-AFNetworking iOS Example.release.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
......
lib/cocoapods/target.rb
View file @ d0ffe31e
......@@ -85,7 +85,7 @@ module Pod
#
def xcconfig_path(variant = nil)
if variant
support_files_root + "#{label}.#{variant}.xcconfig"
support_files_root + "#{label}.#{variant.downcase}.xcconfig"
else
support_files_root + "#{label}.xcconfig"
end
......
cocoapods-integration-specs @ a25af1f9
Subproject commit 40b03ee32f6f2d7935ee7bd7b0379ca550ad828c
Subproject commit a25af1f983d611cc1e709680ed9af26e9fa3bb29
spec/unit/installer/target_installer/aggregate_target_installer_spec.rb
View file @ d0ffe31e
......@@ -48,10 +48,10 @@ module Pod
"Pods-dummy.m",
"Pods-environment.h",
"Pods-resources.sh",
"Pods.AppStore.xcconfig",
"Pods.Debug.xcconfig",
"Pods.Release.xcconfig",
"Pods.Test.xcconfig"
"Pods.appstore.xcconfig",
"Pods.debug.xcconfig",
"Pods.release.xcconfig",
"Pods.test.xcconfig"
]
end
......
spec/unit/installer/user_project_integrator/target_integrator/xcconfig_integrator_spec.rb
View file @ d0ffe31e
......@@ -37,7 +37,7 @@ module Pod
it 'sets the Pods xcconfig as the base config for each build configuration' do
XCConfigIntegrator.integrate(@pod_bundle, [@target])
@target.build_configurations.each do |config|
xcconfig_file = @project.files.find { |f| f.path == @pod_bundle.xcconfig_relative_path(config) }
xcconfig_file = @project.files.find { |f| f.path == @pod_bundle.xcconfig_relative_path(config.name) }
config.base_configuration_reference.should == xcconfig_file
end
end
......
spec/unit/library_spec.rb
View file @ d0ffe31e
......@@ -36,7 +36,7 @@ module Pod
end
it "returns the absolute path of the xcconfig file" do
@lib.xcconfig_path("Release").to_s.should.include?('Pods/Pods.Release.xcconfig')
@lib.xcconfig_path("Release").to_s.should.include?('Pods/Pods.release.xcconfig')
end
it "returns the absolute path of the resources script" do
......@@ -66,7 +66,7 @@ module Pod
end
it "returns the path of the xcconfig file relative to the user project" do
@lib.xcconfig_relative_path("Release").should == 'Pods/Pods.Release.xcconfig'
@lib.xcconfig_relative_path("Release").should == 'Pods/Pods.release.xcconfig'
end
end
......
spec/unit/target/aggregate_target_spec.rb
View file @ d0ffe31e
......@@ -35,7 +35,7 @@ module Pod
end
it "returns the absolute path of the xcconfig file" do
@target.xcconfig_path("Release").to_s.should.include?('Pods/Pods.Release.xcconfig')
@target.xcconfig_path("Release").to_s.should.include?('Pods/Pods.release.xcconfig')
end
it "returns the absolute path of the resources script" do
......@@ -65,7 +65,7 @@ module Pod
end
it "returns the path of the xcconfig file relative to the user project" do
@target.xcconfig_relative_path("Release").should == 'Pods/Pods.Release.xcconfig'
@target.xcconfig_relative_path("Release").should == 'Pods/Pods.release.xcconfig'
end
end
......
spec/unit/target/pod_target_spec.rb
View file @ d0ffe31e
......@@ -41,7 +41,7 @@ module Pod
describe "Support files" do
it "returns the absolute path of the xcconfig file" do
@pod_target.xcconfig_path("Release").to_s.should.include 'Pods/Pods-BananaLib.Release.xcconfig'
@pod_target.xcconfig_path("Release").to_s.should.include 'Pods/Pods-BananaLib.release.xcconfig'
end
it "returns the absolute path of the target header file" do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment