diff options
| -rw-r--r-- | build/make/ios-Info.plist | 2 | ||||
| -rwxr-xr-x | build/make/iosbuild.sh | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/build/make/ios-Info.plist b/build/make/ios-Info.plist index 8d1da32fd..d157b11a0 100644 --- a/build/make/ios-Info.plist +++ b/build/make/ios-Info.plist @@ -31,5 +31,7 @@ <integer>1</integer> <integer>2</integer> </array> + <key>VPXFullVersion</key> + <string>${FULLVERSION}</string> </dict> </plist> 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 |