Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
6311a9b5
Commit
6311a9b5
authored
Nov 02, 2012
by
Eloy Durán
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[UserProjectIntegrator] Ignore PBXReferenceProxy when looking for libPods.a.
Fixes #626.
parent
3cb687a7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
1 deletion
+42
-1
user_project_integrator.rb
lib/cocoapods/installer/user_project_integrator.rb
+4
-1
project.pbxproj
...res/SampleProject/SampleProject.xcodeproj/project.pbxproj
+38
-0
No files found.
lib/cocoapods/installer/user_project_integrator.rb
View file @
6311a9b5
...
@@ -138,7 +138,10 @@ module Pod
...
@@ -138,7 +138,10 @@ module Pod
[
user_project
.
targets
.
first
]
[
user_project
.
targets
.
first
]
end
.
reject
do
|
target
|
end
.
reject
do
|
target
|
# Reject any target that already has this Pods library in one of its frameworks build phases
# Reject any target that already has this Pods library in one of its frameworks build phases
target
.
frameworks_build_phase
.
files
.
any?
{
|
build_file
|
build_file
.
file_ref
.
name
==
@target_definition
.
lib_name
}
target
.
frameworks_build_phase
.
files
.
any?
do
|
build_file
|
file_ref
=
build_file
.
file_ref
!
file_ref
.
proxy?
&&
file_ref
.
name
==
@target_definition
.
lib_name
end
end
end
end
end
end
end
...
...
spec/fixtures/SampleProject/SampleProject.xcodeproj/project.pbxproj
View file @
6311a9b5
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
51075D541521D0C100E39B41
/* InfoPlist.strings in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
51075D521521D0C100E39B41
/* InfoPlist.strings */
;
};
51075D541521D0C100E39B41
/* InfoPlist.strings in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
51075D521521D0C100E39B41
/* InfoPlist.strings */
;
};
51075D561521D0C100E39B41
/* main.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
51075D551521D0C100E39B41
/* main.m */
;
};
51075D561521D0C100E39B41
/* main.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
51075D551521D0C100E39B41
/* main.m */
;
};
51075D5A1521D0C100E39B41
/* AppDelegate.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
51075D591521D0C100E39B41
/* AppDelegate.m */
;
};
51075D5A1521D0C100E39B41
/* AppDelegate.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
51075D591521D0C100E39B41
/* AppDelegate.m */
;
};
51E94E2A1644722C0035348C
/* libSample Lib.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
51E94E28164472200035348C
/* libSample Lib.a */
;
};
A346497214F9BE9A0080D870
/* UIKit.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A346497114F9BE9A0080D870
/* UIKit.framework */
;
};
A346497214F9BE9A0080D870
/* UIKit.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A346497114F9BE9A0080D870
/* UIKit.framework */
;
};
A346497414F9BE9A0080D870
/* Foundation.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A346497314F9BE9A0080D870
/* Foundation.framework */
;
};
A346497414F9BE9A0080D870
/* Foundation.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A346497314F9BE9A0080D870
/* Foundation.framework */
;
};
A346497614F9BE9A0080D870
/* CoreGraphics.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A346497514F9BE9A0080D870
/* CoreGraphics.framework */
;
};
A346497614F9BE9A0080D870
/* CoreGraphics.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A346497514F9BE9A0080D870
/* CoreGraphics.framework */
;
};
...
@@ -21,6 +22,16 @@
...
@@ -21,6 +22,16 @@
A346498214F9BE9A0080D870
/* AppDelegate.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A346498114F9BE9A0080D870
/* AppDelegate.m */
;
};
A346498214F9BE9A0080D870
/* AppDelegate.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A346498114F9BE9A0080D870
/* AppDelegate.m */
;
};
/* End PBXBuildFile section */
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
51E94E27164472200035348C
/* PBXContainerItemProxy */
=
{
isa
=
PBXContainerItemProxy
;
containerPortal
=
51E94E201644721F0035348C
/* Sample Lib.xcodeproj */
;
proxyType
=
2
;
remoteGlobalIDString
=
51E94E0F164472080035348C
;
remoteInfo
=
"Sample Lib"
;
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
/* Begin PBXFileReference section */
51075D4A1521D0C100E39B41
/* TestRunner.app */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
wrapper.application
;
includeInIndex
=
0
;
path
=
TestRunner.app
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
51075D4A1521D0C100E39B41
/* TestRunner.app */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
wrapper.application
;
includeInIndex
=
0
;
path
=
TestRunner.app
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
51075D511521D0C100E39B41
/* TestRunner-Info.plist */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
text.plist.xml
;
path
=
"TestRunner-Info.plist"
;
sourceTree
=
"<group>"
;
};
51075D511521D0C100E39B41
/* TestRunner-Info.plist */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
text.plist.xml
;
path
=
"TestRunner-Info.plist"
;
sourceTree
=
"<group>"
;
};
...
@@ -29,6 +40,7 @@
...
@@ -29,6 +40,7 @@
51075D571521D0C100E39B41
/* TestRunner-Prefix.pch */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
"TestRunner-Prefix.pch"
;
sourceTree
=
"<group>"
;
};
51075D571521D0C100E39B41
/* TestRunner-Prefix.pch */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
"TestRunner-Prefix.pch"
;
sourceTree
=
"<group>"
;
};
51075D581521D0C100E39B41
/* AppDelegate.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
AppDelegate.h
;
sourceTree
=
"<group>"
;
};
51075D581521D0C100E39B41
/* AppDelegate.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
AppDelegate.h
;
sourceTree
=
"<group>"
;
};
51075D591521D0C100E39B41
/* AppDelegate.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
AppDelegate.m
;
sourceTree
=
"<group>"
;
};
51075D591521D0C100E39B41
/* AppDelegate.m */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
AppDelegate.m
;
sourceTree
=
"<group>"
;
};
51E94E201644721F0035348C
/* Sample Lib.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
"Sample Lib.xcodeproj"
;
path
=
"Sample Lib/Sample Lib.xcodeproj"
;
sourceTree
=
"<group>"
;
};
A346496D14F9BE9A0080D870
/* SampleProject.app */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
wrapper.application
;
includeInIndex
=
0
;
path
=
SampleProject.app
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
A346496D14F9BE9A0080D870
/* SampleProject.app */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
wrapper.application
;
includeInIndex
=
0
;
path
=
SampleProject.app
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
A346497114F9BE9A0080D870
/* UIKit.framework */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
wrapper.framework
;
name
=
UIKit.framework
;
path
=
System/Library/Frameworks/UIKit.framework
;
sourceTree
=
SDKROOT
;
};
A346497114F9BE9A0080D870
/* UIKit.framework */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
wrapper.framework
;
name
=
UIKit.framework
;
path
=
System/Library/Frameworks/UIKit.framework
;
sourceTree
=
SDKROOT
;
};
A346497314F9BE9A0080D870
/* Foundation.framework */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
wrapper.framework
;
name
=
Foundation.framework
;
path
=
System/Library/Frameworks/Foundation.framework
;
sourceTree
=
SDKROOT
;
};
A346497314F9BE9A0080D870
/* Foundation.framework */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
wrapper.framework
;
name
=
Foundation.framework
;
path
=
System/Library/Frameworks/Foundation.framework
;
sourceTree
=
SDKROOT
;
};
...
@@ -56,6 +68,7 @@
...
@@ -56,6 +68,7 @@
isa
=
PBXFrameworksBuildPhase
;
isa
=
PBXFrameworksBuildPhase
;
buildActionMask
=
2147483647
;
buildActionMask
=
2147483647
;
files
=
(
files
=
(
51E94E2A1644722C0035348C
/* libSample Lib.a in Frameworks */
,
A346497214F9BE9A0080D870
/* UIKit.framework in Frameworks */
,
A346497214F9BE9A0080D870
/* UIKit.framework in Frameworks */
,
A346497414F9BE9A0080D870
/* Foundation.framework in Frameworks */
,
A346497414F9BE9A0080D870
/* Foundation.framework in Frameworks */
,
A346497614F9BE9A0080D870
/* CoreGraphics.framework in Frameworks */
,
A346497614F9BE9A0080D870
/* CoreGraphics.framework in Frameworks */
,
...
@@ -86,9 +99,18 @@
...
@@ -86,9 +99,18 @@
name
=
"Supporting Files"
;
name
=
"Supporting Files"
;
sourceTree
=
"<group>"
;
sourceTree
=
"<group>"
;
};
};
51E94E211644721F0035348C
/* Products */
=
{
isa
=
PBXGroup
;
children
=
(
51E94E28164472200035348C
/* libSample Lib.a */
,
);
name
=
Products
;
sourceTree
=
"<group>"
;
};
A346496214F9BE990080D870
=
{
A346496214F9BE990080D870
=
{
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
51E94E201644721F0035348C
/* Sample Lib.xcodeproj */
,
A346497714F9BE9A0080D870
/* SampleProject */
,
A346497714F9BE9A0080D870
/* SampleProject */
,
51075D4F1521D0C100E39B41
/* TestRunner */
,
51075D4F1521D0C100E39B41
/* TestRunner */
,
A346497014F9BE9A0080D870
/* Frameworks */
,
A346497014F9BE9A0080D870
/* Frameworks */
,
...
@@ -192,6 +214,12 @@
...
@@ -192,6 +214,12 @@
mainGroup
=
A346496214F9BE990080D870
;
mainGroup
=
A346496214F9BE990080D870
;
productRefGroup
=
A346496E14F9BE9A0080D870
/* Products */
;
productRefGroup
=
A346496E14F9BE9A0080D870
/* Products */
;
projectDirPath
=
""
;
projectDirPath
=
""
;
projectReferences
=
(
{
ProductGroup
=
51E94E211644721F0035348C
/* Products */
;
ProjectRef
=
51E94E201644721F0035348C
/* Sample Lib.xcodeproj */
;
},
);
projectRoot
=
""
;
projectRoot
=
""
;
targets
=
(
targets
=
(
A346496C14F9BE9A0080D870
/* SampleProject */
,
A346496C14F9BE9A0080D870
/* SampleProject */
,
...
@@ -200,6 +228,16 @@
...
@@ -200,6 +228,16 @@
};
};
/* End PBXProject section */
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
51E94E28164472200035348C
/* libSample Lib.a */
=
{
isa
=
PBXReferenceProxy
;
fileType
=
archive.ar
;
path
=
"libSample Lib.a"
;
remoteRef
=
51E94E27164472200035348C
/* PBXContainerItemProxy */
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
/* Begin PBXResourcesBuildPhase section */
51075D481521D0C100E39B41
/* Resources */
=
{
51075D481521D0C100E39B41
/* Resources */
=
{
isa
=
PBXResourcesBuildPhase
;
isa
=
PBXResourcesBuildPhase
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment