Merge pull request CocoaPods#665 from bclymer/patch-1

Normalize xcconfig path when generating includes.

CHANGELOG.md

@@ -8,8 +8,8 @@
 
 ##### Bug Fixes
 
-* None.  
-
+* Normalize xcconfig path when generating includes.  
+  [bclymer](https://github.com/bclymer)
 
 ## 1.8.1 (2019-02-19)
 

lib/xcodeproj/config.rb

@@ -275,7 +275,7 @@ def hash_from_file_content(string)
       string.split("\n").each do |line|
         uncommented_line = strip_comment(line)
         if include = extract_include(uncommented_line)
-          @includes.push include
+          @includes.push normalized_xcconfig_path(include)
         else
           key, value = extract_key_value(uncommented_line)
           next unless key

spec/config_spec.rb

@@ -207,7 +207,13 @@ def filename.open(mode)
     it 'contains file path refs to all included xcconfigs' do
       config = Xcodeproj::Config.new(fixture_path('include.xcconfig'))
       config.includes.size.should.be.equal 1
-      config.includes.first.should.be.equal 'Somefile'
+      config.includes.first.should.be.equal 'Somefile.xcconfig'
+    end
+
+    it 'contains file path refs to all included xcconfigs, even without the extension added' do
+      config = Xcodeproj::Config.new(fixture_path('config-with-include-no-extension.xcconfig'))
+      config.includes.size.should.be.equal 1
+      config.includes.first.should.be.equal 'another-config-with-include.xcconfig'
     end
 
     it 'can be created from multiline file' do

spec/fixtures/config-with-include-no-extension.xcconfig

@@ -0,0 +1 @@
+#include "another-config-with-include"