Updated Branches: refs/heads/master 064239b7b -> 1b22bd801
[CB-2725] follow links in www copy script - finds nested symlinks directories and files Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/1b22bd80 Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/1b22bd80 Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/1b22bd80 Branch: refs/heads/master Commit: 1b22bd801364ea071fdfe3aa0879cb2a10e3c3e6 Parents: 064239b Author: James Jong <[email protected]> Authored: Tue Apr 9 11:30:51 2013 -0400 Committer: James Jong <[email protected]> Committed: Tue Apr 9 11:30:51 2013 -0400 ---------------------------------------------------------------------- .../project/__TESTING__.xcodeproj/project.pbxproj | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/1b22bd80/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj b/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj index 912ddd3..0af952e 100755 --- a/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj +++ b/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj @@ -404,7 +404,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "SRC_DIR=\"www/\"\nDST_DIR=\"$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/www\"\nCOPY_HIDDEN=\nORIG_IFS=$IFS\nIFS=$(echo -en \"\\n\\b\")\n\nif [[ ! -e \"$SRC_DIR\" ]]; then\n echo \"Path does not exist: $SRC_DIR\"\n exit 1\nfi\n\nif [[ -n $COPY_HIDDEN ]]; then\n alias do_find='find \"$SRC_DIR\"'\nelse\n alias do_find='find \"$SRC_DIR\" -name \".*\" -prune -o'\nfi\n\ntime (\n# Code signing files must be removed or else there are\n# resource signing errors.\nrm -rf \"$DST_DIR\" \\\n \"$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/_CodeSignature\" \\\n \"$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/PkgInfo\" \\\n \"$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/embedded.mobileprovision\"\n\n# Directories\nfor p in $(do_find -type d -print); do\n subpath=\"${p#$SRC_DIR}\"\n mkdir \"$DST_DIR$subpath\" || exit 1\ndone\n\n# Symlinks\nfor p in $(do_find -type l -print); do\n subpath=\"${p#$SRC_DIR}\"\n source=$(readlink $SRC_DIR$subpath)\n sourcetype=$(stat -f \"%HT%SY\" $s ource)\n if [ \"$sourcetype\" = \"Directory\" ]; then\n mkdir \"$DST_DIR$subpath\" || exit 2\n else\n rsync -a \"$source\" \"$DST_DIR$subpath\" || exit 3\n fi\ndone\n\n# Files\nfor p in $(do_find -type f -print); do\n subpath=\"${p#$SRC_DIR}\"\n if ! ln \"$SRC_DIR$subpath\" \"$DST_DIR$subpath\" 2>/dev/null; then\n rsync -a \"$SRC_DIR$subpath\" \"$DST_DIR$subpath\" || exit 4\n fi\ndone\n\n)\nIFS=$ORIG_IFS"; + shellScript = "SRC_DIR=\"www/\"\nDST_DIR=\"$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/www\"\nCOPY_HIDDEN=\nORIG_IFS=$IFS\nIFS=$(echo -en \"\\n\\b\")\n\nif [[ ! -e \"$SRC_DIR\" ]]; then\n echo \"Path does not exist: $SRC_DIR\"\n exit 1\nfi\n\nif [[ -n $COPY_HIDDEN ]]; then\n alias do_find='find \"$SRC_DIR\"'\nelse\n alias do_find='find -L \"$SRC_DIR\" -name \".*\" -prune -o'\nfi\n\ntime (\n# Code signing files must be removed or else there are\n# resource signing errors.\nrm -rf \"$DST_DIR\" \\\n \"$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/_CodeSignature\" \\\n \"$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/PkgInfo\" \\\n \"$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/embedded.mobileprovision\"\n\n# Directories\nfor p in $(do_find -type d -print); do\n subpath=\"${p#$SRC_DIR}\"\n mkdir \"$DST_DIR$subpath\" || exit 1\ndone\n\n# Symlinks\nfor p in $(do_find -type l -print); do\n subpath=\"${p#$SRC_DIR}\"\n source=$(readlink $SRC_DIR$subpath)\n sourcetype=$(stat -f \"%HT%SY\" $source)\n if [ \"$sourcetype\" = \"Directory\" ]; then\n mkdir \"$DST_DIR$subpath\" || exit 2\n else\n rsync -a \"$source\" \"$DST_DIR$subpath\" || exit 3\n fi\ndone\n\n# Files\nfor p in $(do_find -type f -print); do\n subpath=\"${p#$SRC_DIR}\"\n if ! ln \"$SRC_DIR$subpath\" \"$DST_DIR$subpath\" 2>/dev/null; then\n rsync -a \"$SRC_DIR$subpath\" \"$DST_DIR$subpath\" || exit 4\n fi\ndone\n\n)\nIFS=$ORIG_IFS"; }; /* End PBXShellScriptBuildPhase section */
