diff options
| author | Brion Vibber <bvibber@wikimedia.org> | 2016-05-24 11:42:51 -0700 |
|---|---|---|
| committer | Brion Vibber <bvibber@wikimedia.org> | 2016-05-24 13:08:25 -0700 |
| commit | 35d7e17b03ac108f68b7413b22dacf967fc34c0e (patch) | |
| tree | 1a1c28f202215fde514a882cb8bbab24c1f39886 /build/make/iosbuild.sh | |
| parent | 6f397b8a5bbd08b37f2ee8820cc25d218a21ad5d (diff) | |
| download | libvpx-35d7e17b03ac108f68b7413b22dacf967fc34c0e.tar libvpx-35d7e17b03ac108f68b7413b22dacf967fc34c0e.tar.gz libvpx-35d7e17b03ac108f68b7413b22dacf967fc34c0e.tar.bz2 libvpx-35d7e17b03ac108f68b7413b22dacf967fc34c0e.zip | |
Move git version extras out of iOS shared framework bundle version
Apple's version format specification is strictly checked on app
store submission, even for embedded frameworks:
http://apple.co/1WgelY1
The build version number should be a string comprised of
three non-negative, period-separated integers with the
first integer being greater than zero. The string should
only contain numeric (0-9) and period (.) characters.
So that's room for "1.5.0" but not for "1.5.0-906-g656f9c4".
The full version returned from 'version.sh --bare' is now
embedded under a 'VPXFullVersion' custom key in the Info.plist,
so it can still be extracted from the resulting framework.
Change-Id: If34a58d02e407379d1f1859fda533ef7f983170b
Diffstat (limited to 'build/make/iosbuild.sh')
| -rwxr-xr-x | build/make/iosbuild.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build/make/iosbuild.sh b/build/make/iosbuild.sh index 21610745c..96dc6cc8c 100755 --- a/build/make/iosbuild.sh +++ b/build/make/iosbuild.sh @@ -226,6 +226,7 @@ build_framework() { # Copy in Info.plist. cat "${SCRIPT_DIR}/ios-Info.plist" \ + | sed "s/\${FULLVERSION}/${FULLVERSION}/g" \ | sed "s/\${VERSION}/${VERSION}/g" \ | sed "s/\${IOS_VERSION_MIN}/${IOS_VERSION_MIN}/g" \ > "${FRAMEWORK_DIR}/Info.plist" @@ -341,8 +342,9 @@ if [ "${ENABLE_SHARED}" = "yes" ]; then CONFIGURE_ARGS="--enable-shared ${CONFIGURE_ARGS}" fi -VERSION=$("${SCRIPT_DIR}"/version.sh --bare "${LIBVPX_SOURCE_DIR}" \ - | sed -E 's/^v(.*)$/\1/') +FULLVERSION=$("${SCRIPT_DIR}"/version.sh --bare "${LIBVPX_SOURCE_DIR}") +VERSION=$(echo "${FULLVERSION}" | sed -E 's/^v([0-9]+\.[0-9]+\.[0-9]+).*$/\1/') + if [ "$ENABLE_SHARED" = "yes" ]; then IOS_VERSION_OPTIONS="--enable-shared" else @@ -369,6 +371,7 @@ cat << EOF OSX_TARGETS="${OSX_TARGETS}" SIM_TARGETS="${SIM_TARGETS}" SCRIPT_DIR="${SCRIPT_DIR}" + FULLVERSION="${FULLVERSION}" VERSION="${VERSION}" IOS_VERSION_MIN="${IOS_VERSION_MIN}" EOF |