Commit df1c3d62 authored by Fabio Pelosin's avatar Fabio Pelosin

Merge branch 'master' of https://github.com/onato/CocoaPods into onato-master

* 'master' of https://github.com/onato/CocoaPods:
  * Modified so that rsync copies all files in one command.
parents bba816cf d899edca
...@@ -72,12 +72,20 @@ module Pod ...@@ -72,12 +72,20 @@ module Pod
resources.each do |resource| resources.each do |resource|
script += "install_resource '#{resource}'\n" script += "install_resource '#{resource}'\n"
end end
script += COPY_RESOURCES
script script
end end
COPY_RESOURCES = <<EOS
rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rm "$RESOURCES_TO_COPY"
EOS
CONTENT = <<EOS CONTENT = <<EOS
#!/bin/sh #!/bin/sh
RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
install_resource() install_resource()
{ {
case $1 in case $1 in
...@@ -98,8 +106,8 @@ install_resource() ...@@ -98,8 +106,8 @@ install_resource()
xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd" xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
;; ;;
*) *)
echo "rsync -av --exclude '*/.svn/*' ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" echo "${PODS_ROOT}/$1"
rsync -av --exclude '*/.svn/*' "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY"
;; ;;
esac esac
} }
......
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