[ios] Added separate target for Settings.bundle

Added a separate target to produce the example Settings.bundle. Use the build product in iosapp instead of a folder reference.

Added the bundle and settings targets as dependencies on the dynamic and static targets instead of listing them explicitly in various schemes.

1 files changed, 4 insertions, 1 deletions

diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh
index 11ee999392..8f41003b79 100755
--- a/platform/ios/scripts/package.sh
+++ b/platform/ios/scripts/package.sh
@@ -138,6 +138,8 @@ if [[ "${BUILD_FOR_DEVICE}" == true ]]; then
             ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework/${NAME} \
             -create -output ${OUTPUT}/dynamic/${NAME}.framework/${NAME} | echo
     fi
+    
+    cp -rv ${PRODUCTS}/${BUILDTYPE}-iphoneos/Settings.bundle ${STATIC_SETTINGS_DIR}
 else
     if [[ ${BUILD_STATIC} == true ]]; then
         step "Assembling static library for iOS Simulator…"
@@ -160,6 +162,8 @@ else
                 ${OUTPUT}/dynamic/
         fi
     fi
+    
+    cp -rv ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/Settings.bundle ${STATIC_SETTINGS_DIR}
 fi
 
 if [[ "${GCC_GENERATE_DEBUGGING_SYMBOLS}" == false ]]; then
@@ -188,7 +192,6 @@ fi
 
 step "Copying library resources…"
 cp -pv LICENSE.md ${STATIC_SETTINGS_DIR}
-cp -rv platform/ios/framework/Settings.bundle ${STATIC_SETTINGS_DIR}
 if [[ ${BUILD_STATIC} == true ]]; then
     cp -pv "${STATIC_BUNDLE_DIR}/${NAME}.bundle/Info.plist" "${OUTPUT}/static/${NAME}.framework/Info.plist"
     plutil -replace CFBundlePackageType -string FMWK "${OUTPUT}/static/${NAME}.framework/Info.plist"