From 93ecf9ae302282dd6d98e4002a2a0d0dd3c006a7 Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Thu, 27 Jun 2019 16:00:15 -0700 Subject: [ios, build] Stop packaging local podspec with releases --- platform/ios/Mapbox-iOS-SDK-static-part.podspec | 14 ------------- platform/ios/scripts/package.sh | 28 ------------------------- 2 files changed, 42 deletions(-) delete mode 100644 platform/ios/Mapbox-iOS-SDK-static-part.podspec diff --git a/platform/ios/Mapbox-iOS-SDK-static-part.podspec b/platform/ios/Mapbox-iOS-SDK-static-part.podspec deleted file mode 100644 index b82c2bb24f..0000000000 --- a/platform/ios/Mapbox-iOS-SDK-static-part.podspec +++ /dev/null @@ -1,14 +0,0 @@ - m.ios.deployment_target = '9.0' - - m.requires_arc = true - - m.preserve_paths = '**' - m.source_files = 'Headers/*.h', 'MGLDummy.m' - m.resource_bundle = { 'Mapbox' => 'Mapbox.bundle/*' } - m.vendored_frameworks = 'Mapbox.framework' - m.module_name = 'Mapbox' - m.xcconfig = { 'OTHER_LDFLAGS' => '-ObjC' } - - m.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } - -end diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh index a37b3c7fda..5475632c24 100755 --- a/platform/ios/scripts/package.sh +++ b/platform/ios/scripts/package.sh @@ -206,34 +206,6 @@ if [[ ${BUILD_DYNAMIC} == true && ${BUILDTYPE} == Release ]]; then lipo -info "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" fi -function create_podspec { - step "Creating local podspec (${1})" - [[ $SYMBOLS = NO ]] && POD_SUFFIX="-stripped" || POD_SUFFIX="" - POD_SOURCE_PATH=' :path => ".",' - POD_FRAMEWORKS=" m.vendored_frameworks = '"${NAME}".framework'" - INPUT_PODSPEC=platform/ios/${NAME}-iOS-SDK${POD_SUFFIX}.podspec - OUTPUT_PODSPEC=${OUTPUT}/${1}/${NAME}-iOS-SDK${POD_SUFFIX}.podspec - if [[ ${1} == "dynamic" ]]; then - sed "s/.*:http.*/${POD_SOURCE_PATH}/" ${INPUT_PODSPEC} > ${OUTPUT_PODSPEC} - sed -i '' "s/.*vendored_frameworks.*/${POD_FRAMEWORKS}/" ${OUTPUT_PODSPEC} - fi - if [[ ${1} == "static" ]]; then - awk '/Pod::Spec.new/,/m.platform/' ${INPUT_PODSPEC} > ${OUTPUT_PODSPEC} - cat platform/ios/${NAME}-iOS-SDK-static-part.podspec >> ${OUTPUT_PODSPEC} - sed -i '' "s/.*:http.*/${POD_SOURCE_PATH}/" ${OUTPUT_PODSPEC} - fi - cp -pv LICENSE.md ${OUTPUT}/${1}/ -} - -if [[ ${BUILD_STATIC} == true ]]; then - stat "${OUTPUT}/static/${NAME}.framework" - create_podspec "static" -fi -if [[ ${BUILD_DYNAMIC} == true ]]; then - stat "${OUTPUT}/dynamic/${NAME}.framework" - create_podspec "dynamic" -fi - if [[ ${BUILD_STATIC} == true ]]; then step "Copying static library headers…" cp -rv "${PRODUCTS}/${BUILDTYPE}-iphoneos/Headers" "${OUTPUT}/static/${NAME}.framework/Headers" -- cgit v1.2.1