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
7af2494e
Commit
7af2494e
authored
Feb 13, 2013
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Spec Integration] Update install_multiple_targets for 0.17
parent
d2273c27
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
116 additions
and
71 deletions
+116
-71
xcconfig.rb
lib/cocoapods/generator/xcconfig.rb
+2
-1
Podfile.lock
spec/integration/install_multiple_targets/after/Podfile.lock
+6
-7
Manifest.lock
...gration/install_multiple_targets/after/Pods/Manifest.lock
+13
-0
Pods-SampleApp_2-dummy.m
...tall_multiple_targets/after/Pods/Pods-SampleApp_2-dummy.m
+0
-0
Pods-SampleApp_2-header.h
...all_multiple_targets/after/Pods/Pods-SampleApp_2-header.h
+5
-0
Pods-SampleApp_2-prefix.pch
...l_multiple_targets/after/Pods/Pods-SampleApp_2-prefix.pch
+3
-0
Pods-dummy.m
...egration/install_multiple_targets/after/Pods/Pods-dummy.m
+0
-0
Pods-header.h
...gration/install_multiple_targets/after/Pods/Pods-header.h
+4
-0
Pods-prefix.pch
...ation/install_multiple_targets/after/Pods/Pods-prefix.pch
+2
-0
Pods-test-dummy.m
...ion/install_multiple_targets/after/Pods/Pods-test-dummy.m
+0
-0
Pods-test-header.h
...on/install_multiple_targets/after/Pods/Pods-test-header.h
+4
-0
Pods-test-prefix.pch
.../install_multiple_targets/after/Pods/Pods-test-prefix.pch
+2
-0
PodsDummy_Pods.m
...tion/install_multiple_targets/after/Pods/PodsDummy_Pods.m
+0
-4
Reachability.podspec
...iple_targets/after/Pods/Reachability/Reachability.podspec
+0
-12
SampleApp.xcodeproj.yaml
...n/install_multiple_targets/after/SampleApp.xcodeproj.yaml
+0
-10
contents.xcworkspacedata
...gets/after/SampleApp.xcworkspace/contents.xcworkspacedata
+2
-2
execution_output.txt
...ation/install_multiple_targets/after/execution_output.txt
+73
-35
No files found.
lib/cocoapods/generator/xcconfig.rb
View file @
7af2494e
...
@@ -56,6 +56,7 @@ module Pod
...
@@ -56,6 +56,7 @@ module Pod
'HEADER_SEARCH_PATHS'
=>
'${PODS_HEADERS_SEARCH_PATHS}'
,
'HEADER_SEARCH_PATHS'
=>
'${PODS_HEADERS_SEARCH_PATHS}'
,
'PODS_ROOT'
=>
relative_pods_root
,
'PODS_ROOT'
=>
relative_pods_root
,
'PODS_HEADERS_SEARCH_PATHS'
=>
'${PODS_PUBLIC_HEADERS_SEARCH_PATHS}'
,
'PODS_HEADERS_SEARCH_PATHS'
=>
'${PODS_PUBLIC_HEADERS_SEARCH_PATHS}'
,
# TODO With this setup every targets gets the headers of the previus targets.
'PODS_BUILD_HEADERS_SEARCH_PATHS'
=>
quote
(
sandbox
.
build_headers
.
search_paths
),
'PODS_BUILD_HEADERS_SEARCH_PATHS'
=>
quote
(
sandbox
.
build_headers
.
search_paths
),
'PODS_PUBLIC_HEADERS_SEARCH_PATHS'
=>
quote
(
sandbox
.
public_headers
.
search_paths
),
'PODS_PUBLIC_HEADERS_SEARCH_PATHS'
=>
quote
(
sandbox
.
public_headers
.
search_paths
),
})
})
...
@@ -122,7 +123,7 @@ module Pod
...
@@ -122,7 +123,7 @@ module Pod
# @return [String] the resulting string.
# @return [String] the resulting string.
#
#
def
quote
(
strings
)
def
quote
(
strings
)
strings
.
map
{
|
s
|
%W|"
#{
s
}
"|
}.
join
(
" "
)
strings
.
sort
.
map
{
|
s
|
%W|"
#{
s
}
"|
}.
join
(
" "
)
end
end
end
end
end
end
...
...
spec/integration/install_multiple_targets/after/Podfile.lock
View file @
7af2494e
PODS:
PODS:
- JSONKit (1.5pre)
- JSONKit (1.5pre)
- Reachability (3.1.0)
- Reachability (3.1.0)
DEPENDENCIES:
DEPENDENCIES:
- JSONKit
- JSONKit
- Reachability (= 3.1.0)
- Reachability (= 3.1.0)
SPEC CHECKSUMS:
SPEC CHECKSUMS:
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
JSONKit: 3d4708953ea7ae399a49777372d8b060a43ddd27
JSONKit: 3d4708953ea7ae399a49777372d8b060a43ddd27
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
COCOAPODS: 0.1
6.2
COCOAPODS: 0.1
7.0.alpha
spec/integration/install_multiple_targets/after/Pods/Manifest.lock
0 → 100644
View file @
7af2494e
PODS:
- JSONKit (1.5pre)
- Reachability (3.1.0)
DEPENDENCIES:
- JSONKit
- Reachability (= 3.1.0)
SPEC CHECKSUMS:
JSONKit: 3d4708953ea7ae399a49777372d8b060a43ddd27
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
COCOAPODS: 0.17.0.alpha
spec/integration/install_multiple_targets/after/Pods/Pods
Dummy_Pods_SampleApp_2
.m
→
spec/integration/install_multiple_targets/after/Pods/Pods
-SampleApp_2-dummy
.m
View file @
7af2494e
File moved
spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-header.h
0 → 100644
View file @
7af2494e
// WARNING: This feature of CocoaPods is present for discussion purposes and might be discontinued or changed in future
#define __COCOA_PODS
#define __POD_JSONKit
#define __POD_Reachability
spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-prefix.pch
View file @
7af2494e
#ifdef __OBJC__
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#import <UIKit/UIKit.h>
#endif
#endif
#import "Pods-SampleApp_2-header.h"
spec/integration/install_
local_source/after/Pods/PodsDummy_Pods
.m
→
spec/integration/install_
multiple_targets/after/Pods/Pods-dummy
.m
View file @
7af2494e
File moved
spec/integration/install_multiple_targets/after/Pods/Pods-header.h
0 → 100644
View file @
7af2494e
// WARNING: This feature of CocoaPods is present for discussion purposes and might be discontinued or changed in future
#define __COCOA_PODS
#define __POD_Reachability
spec/integration/install_multiple_targets/after/Pods/Pods-prefix.pch
View file @
7af2494e
#ifdef __OBJC__
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#import <UIKit/UIKit.h>
#endif
#endif
#import "Pods-header.h"
spec/integration/install_multiple_targets/after/Pods/Pods
Dummy_Pods_test
.m
→
spec/integration/install_multiple_targets/after/Pods/Pods
-test-dummy
.m
View file @
7af2494e
File moved
spec/integration/install_multiple_targets/after/Pods/Pods-test-header.h
0 → 100644
View file @
7af2494e
// WARNING: This feature of CocoaPods is present for discussion purposes and might be discontinued or changed in future
#define __COCOA_PODS
#define __POD_JSONKit
spec/integration/install_multiple_targets/after/Pods/Pods-test-prefix.pch
View file @
7af2494e
#ifdef __OBJC__
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#import <UIKit/UIKit.h>
#endif
#endif
#import "Pods-test-header.h"
spec/integration/install_multiple_targets/after/Pods/PodsDummy_Pods.m
deleted
100644 → 0
View file @
d2273c27
@interface
PodsDummy_Pods
:
NSObject
@end
@implementation
PodsDummy_Pods
@end
spec/integration/install_multiple_targets/after/Pods/Reachability/Reachability.podspec
deleted
100644 → 0
View file @
d2273c27
Pod
::
Spec
.
new
do
|
s
|
s
.
name
=
'Reachability'
s
.
version
=
'3.1.0'
s
.
license
=
'BSD'
s
.
homepage
=
'https://github.com/tonymillion/Reachability'
s
.
authors
=
{
'Tony Million'
=>
'tonymillion@gmail.com'
}
s
.
summary
=
'ARC and GCD Compatible Reachability Class for iOS. Drop in replacement for Apple Reachability.'
s
.
source
=
{
:git
=>
'https://github.com/tonymillion/Reachability.git'
,
:tag
=>
'v3.1.0'
}
s
.
source_files
=
'Reachability.{h,m}'
s
.
framework
=
'SystemConfiguration'
s
.
requires_arc
=
false
end
spec/integration/install_multiple_targets/after/SampleApp.xcodeproj.yaml
View file @
7af2494e
...
@@ -53,16 +53,12 @@ File References:
...
@@ -53,16 +53,12 @@ File References:
-
AppKit.framework
-
AppKit.framework
-
CoreData.framework
-
CoreData.framework
-
Foundation.framework
-
Foundation.framework
-
libPods.a
-
libPods-test.a
-
libPods-SampleApp_2.a
-
libPods-SampleApp_2.a
-
Products
:
-
Products
:
-
SampleApp.app
-
SampleApp.app
-
SampleAppTests.octest
-
SampleAppTests.octest
-
SampleApp_2.app
-
SampleApp_2.app
-
NonIntegrated.app
-
NonIntegrated.app
-
Pods.xcconfig
-
Pods-test.xcconfig
-
Pods-SampleApp_2.xcconfig
-
Pods-SampleApp_2.xcconfig
...
@@ -75,12 +71,10 @@ Targets:
...
@@ -75,12 +71,10 @@ Targets:
-
CPAppDelegate.m
-
CPAppDelegate.m
-
FrameworksBuildPhase
:
-
FrameworksBuildPhase
:
-
Cocoa.framework
-
Cocoa.framework
-
libPods.a
-
ResourcesBuildPhase
:
-
ResourcesBuildPhase
:
-
InfoPlist.strings
-
InfoPlist.strings
-
Credits.rtf
-
Credits.rtf
-
MainMenu.xib
-
MainMenu.xib
-
Copy Pods Resources
:
[]
Build Configurations
:
Build Configurations
:
-
Debug
:
-
Debug
:
Build Settings
:
Build Settings
:
...
@@ -90,7 +84,6 @@ Targets:
...
@@ -90,7 +84,6 @@ Targets:
INFOPLIST_FILE
:
SampleApp/SampleApp-Info.plist
INFOPLIST_FILE
:
SampleApp/SampleApp-Info.plist
GCC_PREFIX_HEADER
:
SampleApp/SampleApp-Prefix.pch
GCC_PREFIX_HEADER
:
SampleApp/SampleApp-Prefix.pch
PRODUCT_NAME
:
$(TARGET_NAME)
PRODUCT_NAME
:
$(TARGET_NAME)
Base Configuration
:
Pods.xcconfig
-
Release
:
-
Release
:
Build Settings
:
Build Settings
:
WRAPPER_EXTENSION
:
app
WRAPPER_EXTENSION
:
app
...
@@ -99,7 +92,6 @@ Targets:
...
@@ -99,7 +92,6 @@ Targets:
INFOPLIST_FILE
:
SampleApp/SampleApp-Info.plist
INFOPLIST_FILE
:
SampleApp/SampleApp-Info.plist
GCC_PREFIX_HEADER
:
SampleApp/SampleApp-Prefix.pch
GCC_PREFIX_HEADER
:
SampleApp/SampleApp-Prefix.pch
PRODUCT_NAME
:
$(TARGET_NAME)
PRODUCT_NAME
:
$(TARGET_NAME)
Base Configuration
:
Pods.xcconfig
-
SampleAppTests
:
-
SampleAppTests
:
Build Phases
:
Build Phases
:
-
SourcesBuildPhase
:
-
SourcesBuildPhase
:
...
@@ -107,13 +99,11 @@ Targets:
...
@@ -107,13 +99,11 @@ Targets:
-
FrameworksBuildPhase
:
-
FrameworksBuildPhase
:
-
SenTestingKit.framework
-
SenTestingKit.framework
-
Cocoa.framework
-
Cocoa.framework
-
libPods-test.a
-
libPods-SampleApp_2.a
-
libPods-SampleApp_2.a
-
ResourcesBuildPhase
:
-
ResourcesBuildPhase
:
-
InfoPlist.strings
-
InfoPlist.strings
-
ShellScriptBuildPhase
:
[]
-
ShellScriptBuildPhase
:
[]
-
Copy Pods Resources
:
[]
-
Copy Pods Resources
:
[]
-
Copy Pods Resources
:
[]
Build Configurations
:
Build Configurations
:
-
Debug
:
-
Debug
:
Build Settings
:
Build Settings
:
...
...
spec/integration/install_multiple_targets/after/SampleApp.xcworkspace/contents.xcworkspacedata
View file @
7af2494e
<?xml version='1.0' encoding='UTF-8'?>
<Workspace
version=
'1.0'
><FileRef
location=
'group:Pods/Pods.xcodeproj'
/><FileRef
location=
'group:SampleApp.xcodeproj'
/></Workspace>
<?xml version='1.0' encoding='UTF-8'?>
<Workspace
version=
'1.0'
><FileRef
location=
'group:SampleApp.xcodeproj'
/><FileRef
location=
'group:Pods/Pods.xcodeproj'
/></Workspace>
\ No newline at end of file
\ No newline at end of file
spec/integration/install_multiple_targets/after/execution_output.txt
View file @
7af2494e
$ pod install --no-update --no-doc --verbose --no-color
$ pod install --no-update --no-doc --verbose --no-color
Resolving dependencies of `
./Podfile'
Resolving dependencies of `
Podfile`
Resolving dependencies for target `default' (iOS 6.0)
Resolving dependencies for target `default' (iOS 6.0)
- Reachability (= 3.1.0)
- Reachability (= 3.1.0)
...
@@ -11,56 +11,94 @@ Resolving dependencies for target `SampleApp_2' (iOS 6.0)
...
@@ -11,56 +11,94 @@ Resolving dependencies for target `SampleApp_2' (iOS 6.0)
- JSONKit
- JSONKit
- Reachability (= 3.1.0)
- Reachability (= 3.1.0)
Comparing resolved specification to the sandbox manifest:
A Reachability
A JSONKit
Downloading dependencies
Downloading dependencies
-> Installing JSONKit (1.5pre)
-> Installing Reachability (3.1.0)
> GitHub download
$ /usr/bin/git config core.bare
$ /usr/bin/git config core.bare
true
true
> Cloning git repo
$ /usr/bin/git rev-list --max-count=1 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
> Cloning to Pods folder
$ /usr/bin/git clone "CACHES_DIR/Git/de3e1c97c03ac13b29e7533beea2d2131589900f" "ROOT/tmp/install_multiple_targets/Pods/JSONKit"
Cloning into 'ROOT/tmp/install_multiple_targets/Pods/JSONKit'...
done.
$ /usr/bin/git checkout -b activated-pod-commit 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
-> Installing Reachability (3.1.0)
$ /usr/bin/git config core.bare
$ /usr/bin/git config core.bare
true
true
>
Cloning git repo
>
Updating cache git repo (CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6)
$ /usr/bin/git rev-list --max-count=1 v3.1.0
$ /usr/bin/git remote update
f7176f4798d068d233dca5223ae4bd9c8059e830
Fetching origin
$ /usr/bin/git init
$ /usr/bin/git init
Initialized empty Git repository in ROOT/tmp/install_multiple_targets/Pods/Reachability/.git/
Initialized empty Git repository in ROOT/tmp/install_multiple_targets/Pods/Reachability/.git/
$ /usr/bin/git remote add origin 'CACHES_DIR/Git/48f11286750afa2e2eb80564e288f42eed7cbab6'
$ /usr/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
$ /usr/bin/git fetch origin tags/v3.1.0
$ /usr/bin/git fetch origin tags/v3.1.0 2>&1
From CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6
* tag v3.1.0 -> FETCH_HEAD
$ /usr/bin/git reset --hard FETCH_HEAD
$ /usr/bin/git reset --hard FETCH_HEAD
HEAD is now at f7176f4 updated podspec
HEAD is now at f7176f4 updated podspec
$ /usr/bin/git checkout -b activated-pod-commit
$ /usr/bin/git checkout -b activated-pod-commit 2>&1
Switched to a new branch 'activated-pod-commit'
Generating support files
-> Installing JSONKit (1.5pre)
> GitHub download
$ /usr/bin/git config core.bare
true
$ /usr/bin/git config core.bare
true
$ /usr/bin/git rev-list --max-count=1 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
> Cloning to Pods folder
$ /usr/bin/git clone "CACHES_DIR/GitHub/de3e1c97c03ac13b29e7533beea2d2131589900f" "ROOT/tmp/install_multiple_targets/Pods/JSONKit"
Cloning into 'ROOT/tmp/install_multiple_targets/Pods/JSONKit'...
done.
$ /usr/bin/git checkout -b activated-pod-commit 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce 2>&1
Switched to a new branch 'activated-pod-commit'
Generating Pods Project
- Creating Pods project
- Running pre install hooks
- Running pre install hooks
- Generating project
- Adding source files to Pods project
- Adding resources to Pods project
- Installing targets
- Installing targets
- Generating xcconfig file at `./Pods/Pods.xcconfig'
- Installing target `Pods` iOS 6.0
- Generating prefix header at `./Pods/Pods-prefix.pch'
- Adding Build files
- Generating copy resources script at `./Pods/Pods-resources.sh'
- Linking headers
- Generating xcconfig file at `./Pods/Pods-test.xcconfig'
- Generating xcconfig file at `Pods/Pods.xcconfig`
- Generating prefix header at `./Pods/Pods-test-prefix.pch'
- Generating target header at `Pods/Pods-header.h`
- Generating copy resources script at `./Pods/Pods-test-resources.sh'
- Generating prefix header at `Pods/Pods-prefix.pch`
- Generating xcconfig file at `./Pods/Pods-SampleApp_2.xcconfig'
- Generating copy resources script at `Pods/Pods-resources.sh`
- Generating prefix header at `./Pods/Pods-SampleApp_2-prefix.pch'
- Generating acknowledgements at `Pods/Pods-acknowledgements.plist`
- Generating copy resources script at `./Pods/Pods-SampleApp_2-resources.sh'
- Generating acknowledgements at `Pods/Pods-acknowledgements.markdown`
- Generating dummy source file at `Pods/Pods-dummy.m`
- Installing target `Pods-test` iOS 6.0
- Adding Build files
- Linking headers
- Generating xcconfig file at `Pods/Pods-test.xcconfig`
- Generating target header at `Pods/Pods-test-header.h`
- Generating prefix header at `Pods/Pods-test-prefix.pch`
- Generating copy resources script at `Pods/Pods-test-resources.sh`
- Generating acknowledgements at `Pods/Pods-test-acknowledgements.plist`
- Generating acknowledgements at `Pods/Pods-test-acknowledgements.markdown`
- Generating dummy source file at `Pods/Pods-test-dummy.m`
- Installing target `Pods-SampleApp_2` iOS 6.0
- Adding Build files
- Linking headers
- Generating xcconfig file at `Pods/Pods-SampleApp_2.xcconfig`
- Generating target header at `Pods/Pods-SampleApp_2-header.h`
- Generating prefix header at `Pods/Pods-SampleApp_2-prefix.pch`
- Generating copy resources script at `Pods/Pods-SampleApp_2-resources.sh`
- Generating acknowledgements at `Pods/Pods-SampleApp_2-acknowledgements.plist`
- Generating acknowledgements at `Pods/Pods-SampleApp_2-acknowledgements.markdown`
- Generating dummy source file at `Pods/Pods-SampleApp_2-dummy.m`
- Running post install hooks
- Running post install hooks
- Writing Xcode project file to `./Pods/Pods.xcodeproj'
- Writing Xcode project file to `Pods/Pods.xcodeproj`
- Writing lockfile in `./Podfile.lock'
- Writing Lockfile in `Podfile.lock`
- Writing Manifest in `Pods/Manifest.lock`
[!] From now on use `SampleApp.xcworkspace'.
Integrating client projects
Integrating `libPods.a' into target `SampleApp' of Xcode project `./SampleApp.xcodeproj
'.
[!] From now on use `SampleApp.xcworkspace
'.
Integrating `libPods
-test.a' into target `SampleAppTests' of Xcode project `./SampleApp.xcodeproj'
.
Integrating `libPods
.a` into target `SampleApp` of project `SampleApp.xcodeproj`
.
Integrating `libPods-
SampleApp_2.a' into target `SampleAppTests' of Xcode project `./SampleApp.xcodeproj'
.
Integrating `libPods-
test.a` into target `SampleAppTests` of project `SampleApp.xcodeproj`
.
Integrating `libPods-SampleApp_2.a` into target `SampleAppTests` of project `SampleApp.xcodeproj`.
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