witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Revert the changes to the versioning. We will use the git version in the about page, it makes more sense.

Browse source
This commit is contained in:
Guillaume BIENKOWSKI 2015-01-12 16:55:05 +01:00
parent 276136e212
commit 57a6dfe504
4 changed files with 5 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Classes/AboutViewController.m
View file

@ -20,6 +20,7 @@
#import "AboutViewController.h"
#import "LinphoneManager.h"
#include "linphone/lpconfig.h"
#include "LinphoneIOSVersion.h"
@implementation AboutViewController
@ -73,10 +74,9 @@
[linphoneLabel setText:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]];
[linphoneIphoneVersionLabel setText:[NSString stringWithFormat:@"%@ iPhone %@-b%@",
[linphoneIphoneVersionLabel setText:[NSString stringWithFormat:@"%@ iPhone %@",
[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"],
[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"],
[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]]
[NSString stringWithUTF8String:LINPHONE_IOS_VERSION]]
];
[linphoneCoreVersionLabel setText:[NSString stringWithFormat:@"%@ Core %s", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"], linphone_core_get_version()]];

13
Tools/buildNumber.sh
View file

@ -1,13 +0,0 @@
#!/bin/bash
#increment build number each time we build
if [[ $CONFIGURATION = "Release" ]]; then
buildNumber=$(/usr/libexec/PlistBuddy -c "Print CFBundleVersion" "$INFOPLIST_FILE")
buildNumber=$(($buildNumber + 1))
/usr/libexec/PlistBuddy -c "Set :CFBundleVersion $buildNumber" "$INFOPLIST_FILE"
echo "Incremented build number to $buildNumber"
else
echo "Skip build increment when building for $CONFIGURATION"
fi

4
linphone-Info.plist
View file

@ -59,7 +59,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>4.0.0</string>
<string>3.7.4</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@ -88,7 +88,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>10</string>
<string>2.2.4</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIApplicationExitsOnSuspend</key>

14
linphone.xcodeproj/project.pbxproj
View file

@ -3006,7 +3006,6 @@
isa = PBXNativeTarget;
buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "linphone" */;
buildPhases = (
F0D05C871A64164000AB87CD /* ShellScript */,
1D60588D0D05DD3D006BFB54 /* Resources */,
63DCC71D1A07B08E00916627 /* Run Script */,
D33CF34715D3985000CD4B85 /* ShellScript */,
@ -3778,19 +3777,6 @@
shellPath = /bin/sh;
shellScript = "if [ \"$RUN_UNIT_TEST_WITH_IOS_SIM\" = \"YES\" ]; then\ntest_bundle_path=\"$BUILT_PRODUCTS_DIR/$PRODUCT_NAME.$WRAPPER_EXTENSION\"\nios-sim launch \"$(dirname \"$TEST_HOST\")\" --setenv DYLD_INSERT_LIBRARIES=/../../Library/PrivateFrameworks/IDEBundleInjection.framework/IDEBundleInjection --setenv XCInjectBundle=\"$test_bundle_path\" --setenv XCInjectBundleInto=\"$TEST_HOST\" --args -SenTest All \"$test_bundle_path\"\necho \"Finished running tests with ios-sim\"\nelse\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\nfi";
};
F0D05C871A64164000AB87CD /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
shellScript = "$SRCROOT/Tools/buildNumber.sh\n";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */