Commit 9ee4b9b5 authored by Eloy Duran's avatar Eloy Duran

Make assigning the PBXProject#products= method work.

parent ffbb3b95
...@@ -63,31 +63,32 @@ module Pod ...@@ -63,31 +63,32 @@ module Pod
'GCC_C_LANGUAGE_STANDARD' => 'gnu99', 'GCC_C_LANGUAGE_STANDARD' => 'gnu99',
'INSTALL_PATH' => "$(BUILT_PRODUCTS_DIR)", 'INSTALL_PATH' => "$(BUILT_PRODUCTS_DIR)",
'GCC_WARN_ABOUT_MISSING_PROTOTYPES' => 'YES', 'GCC_WARN_ABOUT_MISSING_PROTOTYPES' => 'YES',
'GCC_WARN_ABOUT_RETURN_TYPE' => 'YES', 'GCC_WARN_ABOUT_RETURN_TYPE' => 'YES',
'GCC_WARN_UNUSED_VARIABLE' => 'YES' 'GCC_WARN_UNUSED_VARIABLE' => 'YES'
}, },
:debug => { :debug => {
'GCC_DYNAMIC_NO_PIC' => 'NO', 'GCC_DYNAMIC_NO_PIC' => 'NO',
'GCC_PREPROCESSOR_DEFINITIONS' => ["DEBUG=1", "$(inherited)"], 'GCC_PREPROCESSOR_DEFINITIONS' => ["DEBUG=1", "$(inherited)"],
'GCC_SYMBOLS_PRIVATE_EXTERN' => 'NO', 'GCC_SYMBOLS_PRIVATE_EXTERN' => 'NO',
'GCC_OPTIMIZATION_LEVEL' => '0' 'GCC_OPTIMIZATION_LEVEL' => '0'
}, },
:ios => { :ios => {
'ARCHS' => "$(ARCHS_STANDARD_32_BIT)", 'ARCHS' => "$(ARCHS_STANDARD_32_BIT)",
'GCC_VERSION' => 'com.apple.compilers.llvmgcc42', 'GCC_VERSION' => 'com.apple.compilers.llvmgcc42',
'IPHONEOS_DEPLOYMENT_TARGET' => '4.3', 'IPHONEOS_DEPLOYMENT_TARGET' => '4.3',
'PUBLIC_HEADERS_FOLDER_PATH' => "$(TARGET_NAME)", 'PUBLIC_HEADERS_FOLDER_PATH' => "$(TARGET_NAME)",
'SDKROOT' => 'iphoneos' 'SDKROOT' => 'iphoneos'
}, },
:osx => { :osx => {
'ARCHS' => "$(ARCHS_STANDARD_64_BIT)", 'ARCHS' => "$(ARCHS_STANDARD_64_BIT)",
'GCC_ENABLE_OBJC_EXCEPTIONS' => 'YES', 'GCC_ENABLE_OBJC_EXCEPTIONS' => 'YES',
'GCC_WARN_64_TO_32_BIT_CONVERSION' => 'YES', 'GCC_WARN_64_TO_32_BIT_CONVERSION' => 'YES',
'GCC_VERSION' => 'com.apple.compilers.llvm.clang.1_0', 'GCC_VERSION' => 'com.apple.compilers.llvm.clang.1_0',
'MACOSX_DEPLOYMENT_TARGET' => '10.7', 'MACOSX_DEPLOYMENT_TARGET' => '10.7',
'SDKROOT' => 'macosx' 'SDKROOT' => 'macosx'
} }
} }
def self.build_settings(platform, scheme) def self.build_settings(platform, scheme)
settings = COMMON_BUILD_SETTINGS[:all].merge(COMMON_BUILD_SETTINGS[platform]) settings = COMMON_BUILD_SETTINGS[:all].merge(COMMON_BUILD_SETTINGS[platform])
settings['COPY_PHASE_STRIP'] = scheme == :debug ? 'NO' : 'YES' settings['COPY_PHASE_STRIP'] = scheme == :debug ? 'NO' : 'YES'
......
...@@ -32,7 +32,7 @@ module Pod ...@@ -32,7 +32,7 @@ module Pod
end end
def singular_name def singular_name
@name.singularize @options[:singular_name] || @name.singularize
end end
def singular_getter def singular_getter
...@@ -459,7 +459,7 @@ module Pod ...@@ -459,7 +459,7 @@ module Pod
class PBXProject < PBXObject class PBXProject < PBXObject
has_many :targets, :class => PBXNativeTarget has_many :targets, :class => PBXNativeTarget
has_one :products, :uuid => :productRefGroup, :class => PBXGroup has_one :products, :singular_name => :products, :uuid => :productRefGroup, :class => PBXGroup
end end
class PBXObjectList class PBXObjectList
......
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