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
e67f3912
Commit
e67f3912
authored
Apr 08, 2013
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Generator::Xcconfig] Add COCOAPODS macro definition
Closes #903
parent
4f4e5e67
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
29 additions
and
0 deletions
+29
-0
CHANGELOG.md
CHANGELOG.md
+8
-0
xcconfig.rb
lib/cocoapods/generator/xcconfig.rb
+1
-0
Pods.xcconfig
spec/integration/install_add_pod/after/Pods/Pods.xcconfig
+1
-0
Pods-SampleApp_1.xcconfig
...all_custom_workspace/after/Pods/Pods-SampleApp_1.xcconfig
+1
-0
Pods-SampleApp_2.xcconfig
...all_custom_workspace/after/Pods/Pods-SampleApp_2.xcconfig
+1
-0
Pods.xcconfig
...egration/install_external_source/after/Pods/Pods.xcconfig
+1
-0
Pods.xcconfig
...integration/install_local_source/after/Pods/Pods.xcconfig
+1
-0
Pods-SampleApp_2.xcconfig
...all_multiple_targets/after/Pods/Pods-SampleApp_2.xcconfig
+1
-0
Pods-test.xcconfig
...on/install_multiple_targets/after/Pods/Pods-test.xcconfig
+1
-0
Pods.xcconfig
...gration/install_multiple_targets/after/Pods/Pods.xcconfig
+1
-0
Pods.xcconfig
spec/integration/install_new/after/Pods/Pods.xcconfig
+1
-0
Pods.xcconfig
...ration/install_podfile_callbacks/after/Pods/Pods.xcconfig
+1
-0
Pods.xcconfig
spec/integration/install_podspec/after/Pods/Pods.xcconfig
+1
-0
Pods.xcconfig
spec/integration/install_remove_pod/after/Pods/Pods.xcconfig
+1
-0
Pods.xcconfig
...tegration/install_spec_callbacks/after/Pods/Pods.xcconfig
+1
-0
Pods-OS X App.xcconfig
...ration/install_subspecs/after/Pods/Pods-OS X App.xcconfig
+1
-0
Pods-iOS App.xcconfig
...gration/install_subspecs/after/Pods/Pods-iOS App.xcconfig
+1
-0
Pods.xcconfig
spec/integration/update/after/Pods/Pods.xcconfig
+1
-0
xcconfig_spec.rb
spec/unit/generator/xcconfig_spec.rb
+4
-0
No files found.
CHANGELOG.md
View file @
e67f3912
## Master
###### Enhancements
*
CocoaPods now defines the
`COCOAPODS=1`
macro in the Pod and the Client
targets. This is useful for libraries which conditionally expose interfaces.
[
#903
](
https://github.com/CocoaPods/CocoaPods/issues/903
)
## 0.18.0
## 0.18.0
[
CocoaPods
](
https://github.com/CocoaPods/CocoaPods/compare/0.17.2...0.18.0
)
[
CocoaPods
](
https://github.com/CocoaPods/CocoaPods/compare/0.17.2...0.18.0
)
•
[
cocoapods-core
](
https://github.com/CocoaPods/Core/compare/0.17.2...0.18.0
)
•
[
cocoapods-core
](
https://github.com/CocoaPods/Core/compare/0.17.2...0.18.0
)
...
...
lib/cocoapods/generator/xcconfig.rb
View file @
e67f3912
...
@@ -58,6 +58,7 @@ module Pod
...
@@ -58,6 +58,7 @@ module Pod
'PODS_HEADERS_SEARCH_PATHS'
=>
'${PODS_PUBLIC_HEADERS_SEARCH_PATHS}'
,
'PODS_HEADERS_SEARCH_PATHS'
=>
'${PODS_PUBLIC_HEADERS_SEARCH_PATHS}'
,
'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
),
'GCC_PREPROCESSOR_DEFINITIONS'
=>
'COCOAPODS=1'
})
})
spec_consumers
.
each
do
|
consumer
|
spec_consumers
.
each
do
|
consumer
|
...
...
spec/integration/install_add_pod/after/Pods/Pods.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/JSONKit" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/JSONKit" "${PODS_ROOT}/BuildHeaders/Reachability"
...
...
spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
...
...
spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
...
...
spec/integration/install_external_source/after/Pods/Pods.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC
OTHER_LDFLAGS = -ObjC
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/PodTest"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/PodTest"
...
...
spec/integration/install_local_source/after/Pods/Pods.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
...
...
spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/JSONKit" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/JSONKit" "${PODS_ROOT}/BuildHeaders/Reachability"
...
...
spec/integration/install_multiple_targets/after/Pods/Pods-test.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC
OTHER_LDFLAGS = -ObjC
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/JSONKit" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/JSONKit" "${PODS_ROOT}/BuildHeaders/Reachability"
...
...
spec/integration/install_multiple_targets/after/Pods/Pods.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/JSONKit" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/JSONKit" "${PODS_ROOT}/BuildHeaders/Reachability"
...
...
spec/integration/install_new/after/Pods/Pods.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
...
...
spec/integration/install_podfile_callbacks/after/Pods/Pods.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
...
...
spec/integration/install_podspec/after/Pods/Pods.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
...
...
spec/integration/install_remove_pod/after/Pods/Pods.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
...
...
spec/integration/install_spec_callbacks/after/Pods/Pods.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
...
...
spec/integration/install_subspecs/after/Pods/Pods-OS X App.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC
OTHER_LDFLAGS = -ObjC
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/PodTest"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/PodTest"
...
...
spec/integration/install_subspecs/after/Pods/Pods-iOS App.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC
OTHER_LDFLAGS = -ObjC
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/PodTest"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/PodTest"
...
...
spec/integration/update/after/Pods/Pods.xcconfig
View file @
e67f3912
ALWAYS_SEARCH_USER_PATHS = YES
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
...
...
spec/unit/generator/xcconfig_spec.rb
View file @
e67f3912
...
@@ -75,6 +75,10 @@ module Pod
...
@@ -75,6 +75,10 @@ module Pod
@xcconfig
.
to_hash
[
'PODS_PUBLIC_HEADERS_SEARCH_PATHS'
].
should
==
expected
@xcconfig
.
to_hash
[
'PODS_PUBLIC_HEADERS_SEARCH_PATHS'
].
should
==
expected
end
end
it
'adds the COCOAPODS macro definition'
do
@xcconfig
.
to_hash
[
'GCC_PREPROCESSOR_DEFINITIONS'
].
should
==
'COCOAPODS=1'
end
it
"includes the xcconfig of the specifications"
do
it
"includes the xcconfig of the specifications"
do
@xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
.
include
(
'-no_compact_unwind'
)
@xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
.
include
(
'-no_compact_unwind'
)
end
end
...
...
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