generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move git version extras out of iOS shared framework bundle version

Browse Source 
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
This commit is contained in:
Brion Vibber 2016-05-24 11:42:51 -07:00
parent 6f397b8a5b
commit 35d7e17b03
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/make/ios-Info.plist
View File

@ -31,5 +31,7 @@
<integer>1</integer> <integer>1</integer>
<integer>2</integer> <integer>2</integer>
</array> </array>
<key>VPXFullVersion</key>
<string>${FULLVERSION}</string>
</dict> </dict>
</plist> </plist>

7
build/make/iosbuild.sh
View File

@ -226,6 +226,7 @@ build_framework() {
# Copy in Info.plist. # Copy in Info.plist.
cat "${SCRIPT_DIR}/ios-Info.plist" \ cat "${SCRIPT_DIR}/ios-Info.plist" \
| sed "s/\${FULLVERSION}/${FULLVERSION}/g" \
| sed "s/\${VERSION}/${VERSION}/g" \ | sed "s/\${VERSION}/${VERSION}/g" \
| sed "s/\${IOS_VERSION_MIN}/${IOS_VERSION_MIN}/g" \ | sed "s/\${IOS_VERSION_MIN}/${IOS_VERSION_MIN}/g" \
> "${FRAMEWORK_DIR}/Info.plist" > "${FRAMEWORK_DIR}/Info.plist"
@ -341,8 +342,9 @@ if [ "${ENABLE_SHARED}" = "yes" ]; then
CONFIGURE_ARGS="--enable-shared ${CONFIGURE_ARGS}" CONFIGURE_ARGS="--enable-shared ${CONFIGURE_ARGS}"
fi fi
VERSION=$("${SCRIPT_DIR}"/version.sh --bare "${LIBVPX_SOURCE_DIR}" \ FULLVERSION=$("${SCRIPT_DIR}"/version.sh --bare "${LIBVPX_SOURCE_DIR}")
| sed -E 's/^v(.*)$/\1/') VERSION=$(echo "${FULLVERSION}" | sed -E 's/^v([0-9]+\.[0-9]+\.[0-9]+).*$/\1/')
if [ "$ENABLE_SHARED" = "yes" ]; then if [ "$ENABLE_SHARED" = "yes" ]; then
IOS_VERSION_OPTIONS="--enable-shared" IOS_VERSION_OPTIONS="--enable-shared"
else else
@ -369,6 +371,7 @@ cat << EOF
OSX_TARGETS="${OSX_TARGETS}" OSX_TARGETS="${OSX_TARGETS}"
SIM_TARGETS="${SIM_TARGETS}" SIM_TARGETS="${SIM_TARGETS}"
SCRIPT_DIR="${SCRIPT_DIR}" SCRIPT_DIR="${SCRIPT_DIR}"
FULLVERSION="${FULLVERSION}"
VERSION="${VERSION}" VERSION="${VERSION}"
IOS_VERSION_MIN="${IOS_VERSION_MIN}" IOS_VERSION_MIN="${IOS_VERSION_MIN}"
EOF EOF