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

diff --git a/build/make/ios-Info.plist b/build/make/ios-Info.plist
index 8d1da32fd26307ab2133da6bdaaaab0915155cc5..d157b11a0d503bce9286f0452e66c567560ee73c 100644 (file)
--- 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 21610745c4c7a309857167a544e7979bbe226c9f..96dc6cc8cbe9984da7b1aa009a0d2c250ecfc421 100755 (executable)
--- 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