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
08d3a04b
Commit
08d3a04b
authored
Jul 02, 2015
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3756 from CocoaPods/seg-embed-frameworks-quotes
[EmbedFrameworksScript] Quote all the things
parents
aa4994a6
119c8c76
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
CHANGELOG.md
CHANGELOG.md
+6
-0
embed_frameworks_script.rb
lib/cocoapods/generator/embed_frameworks_script.rb
+4
-4
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
No files found.
CHANGELOG.md
View file @
08d3a04b
...
@@ -33,6 +33,12 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -33,6 +33,12 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Vincent Isambart
](
https://github.com/vincentisambart
)
[
Vincent Isambart
](
https://github.com/vincentisambart
)
[
#3751
](
https://github.com/CocoaPods/CocoaPods/issues/3751
)
[
#3751
](
https://github.com/CocoaPods/CocoaPods/issues/3751
)
*
Properly support targets with spaces in their name in the embed frameworks
script.
[
Samuel Giddins
](
https://github.com/segiddins
)
[
#3754
](
https://github.com/CocoaPods/CocoaPods/issues/3754
)
## 0.38.0.beta.1
## 0.38.0.beta.1
##### Highlighted Enhancement That Needs Testing
##### Highlighted Enhancement That Needs Testing
...
...
lib/cocoapods/generator/embed_frameworks_script.rb
View file @
08d3a04b
...
@@ -55,11 +55,11 @@ module Pod
...
@@ -55,11 +55,11 @@ module Pod
if [ -L "${source}" ]; then
if [ -L "${source}" ]; then
echo "Symlinked..."
echo "Symlinked..."
source=
$(readlink "${source}")
source=
"$(readlink "${source}")"
fi
fi
# use filter instead of exclude so missing patterns dont' throw errors
# use filter instead of exclude so missing patterns dont' throw errors
echo "rsync -av --filter
\
"
- CVS/
\"
--filter
\"
- .svn/
\"
--filter
\"
- .git/
\"
--filter
\"
- .hg/
\"
--filter
\"
- Headers
\"
--filter
\"
- PrivateHeaders
\"
--filter
\"
- Modules
\"
${source} ${destination}
"
echo "rsync -av --filter
\
\
"- CVS/
\\
" --filter
\\
"- .svn/
\\
" --filter
\\
"- .git/
\\
" --filter
\\
"- .hg/
\\
" --filter
\\
"- Headers
\\
" --filter
\\
"- PrivateHeaders
\\
" --filter
\\
"- Modules
\\
"
\\
"${source}
\\
"
\\
"${destination}
\\
"
"
rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}"
rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}"
# Resign the code if required by the build settings to avoid unstable apps
# Resign the code if required by the build settings to avoid unstable apps
...
@@ -67,7 +67,7 @@ module Pod
...
@@ -67,7 +67,7 @@ module Pod
# Embed linked Swift runtime libraries
# Embed linked Swift runtime libraries
local basename
local basename
basename=
$(basename $1 | sed -E s/
\\\\
..+// && exit ${PIPESTATUS[0]})
basename=
"$(basename "$1" | sed -E s/
\\\\
..+// && exit ${PIPESTATUS[0]})"
local swift_runtime_libs
local swift_runtime_libs
swift_runtime_libs=$(xcrun otool -LX "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/${basename}.framework/${basename}" | grep --color=never @rpath/libswift | sed -E s/@rpath
\\\\
/
\\
(.+dylib
\\
).*/
\\\\
1/g | uniq -u && exit ${PIPESTATUS[0]})
swift_runtime_libs=$(xcrun otool -LX "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/${basename}.framework/${basename}" | grep --color=never @rpath/libswift | sed -E s/@rpath
\\\\
/
\\
(.+dylib
\\
).*/
\\\\
1/g | uniq -u && exit ${PIPESTATUS[0]})
for lib in $swift_runtime_libs; do
for lib in $swift_runtime_libs; do
...
@@ -82,7 +82,7 @@ module Pod
...
@@ -82,7 +82,7 @@ module Pod
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
# Use the current code_sign_identitiy
# Use the current code_sign_identitiy
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements
$1
"
echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements
\\
"$1
\\
"
"
/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1"
/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1"
fi
fi
}
}
...
...
cocoapods-integration-specs
@
6d4b3876
Subproject commit
f957d7bef1b92e6cc3ec00c63d06dc2fefa220f
6
Subproject commit
6d4b38764f551fcda4da634ba777640d96162b5
6
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