Skip to content

Commit

Permalink
Patch bump, adding H.264
Browse files Browse the repository at this point in the history
  • Loading branch information
ianblenke committed Sep 21, 2015
1 parent a2a09ac commit 161cd96
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .semver
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
:major: 1
:minor: 0
:patch: 0
:patch: 1
:special: ''
:metadata: ''
27 changes: 14 additions & 13 deletions Tools/github_release.sh
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
#!/bin/bash

if [ -z "$TRAVIS_BRANCH" ] ; then
echo "TRAVIS_BRANCH not found. Deploy skipped"
exit 0
if [ ! -f fabric.properties ] ; then
if [ -z "$TRAVIS_BRANCH" ] ; then
echo "TRAVIS_BRANCH not found. Deploy skipped"
exit 0
fi

if [ "$TRAVIS_BRANCH" != "master" ] ; then
echo "TRAVIS_BRANCH is not master. Deploy skipped"
exit 0
fi

./Tools/prepare_crashlytics.sh
fi

if [ "$TRAVIS_BRANCH" != "master" ] ; then
echo "TRAVIS_BRANCH is not master. Deploy skipped"
exit 0
fi

./Tools/prepare_crashlytics.sh
if [ -f fabric.properties ] ; then
source fabric.properties
./Fabric.framework/run $apiKey $apiSecret
fi
source fabric.properties
./Fabric.framework/run $apiKey $apiSecret

set -x

Expand Down
2 changes: 2 additions & 0 deletions linphone.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -6817,6 +6817,7 @@
HAVE_SILK,
HAVE_SSL,
USE_APN_DEV,
HAVE_OPENH264,
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
Expand Down Expand Up @@ -6905,6 +6906,7 @@
VIDEO_ENABLED,
HAVE_SILK,
HAVE_SSL,
HAVE_OPENH264,
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
Expand Down

0 comments on commit 161cd96

Please sign in to comment.