From ca209652e29d20750abdf443dbe6c53244dd3a25 Mon Sep 17 00:00:00 2001 From: Pieter de Bie Date: Fri, 18 Sep 2009 00:57:48 +0200 Subject: [PATCH] Info.plist: No longer use the LONG_VERSION hack Since 0b81911d we have a nicer Git version we can use, so we no longer require this hack. It also interferes with Sparkle's updating system, so just remove it and use the same versioning system as we use for the short string. --- GitX.xcodeproj/project.pbxproj | 2 +- Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj index ea6fb6f..0585ee2 100644 --- a/GitX.xcodeproj/project.pbxproj +++ b/GitX.xcodeproj/project.pbxproj @@ -771,7 +771,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "export PATH=$PATH:$HOME/bin:$HOME/local/bin:/sw/bin:/opt/local/bin:`\"$TARGET_BUILD_DIR\"/gitx --git-path`\nVERSION=$(cd \"$PROJECT_DIR\";git describe)\nLONG_VERSION=$(echo $VERSION | sed -e \"s/\\-/\\./\" -e \"s/^v//\" -e \"s/-.*//\")\nSHORT_VERSION=$(echo $VERSION | sed -e \"s/\\-.*//\" -e \"s/^v//\")\n\necho -n \"#define LONG_VERSION $LONG_VERSION\n#define GIT_VERSION $VERSION\n#define SHORT_VERSION $SHORT_VERSION\" > \"$PROJECT_TEMP_DIR/revision\"\ntouch Info.plist"; + shellScript = "export PATH=$PATH:$HOME/bin:$HOME/local/bin:/sw/bin:/opt/local/bin:`\"$TARGET_BUILD_DIR\"/gitx --git-path`\nVERSION=$(cd \"$PROJECT_DIR\";git describe)\nSHORT_VERSION=$(echo $VERSION | sed -e \"s/\\-.*//\" -e \"s/^v//\")\n\necho -n \"#define GIT_VERSION $VERSION\n#define SHORT_VERSION $SHORT_VERSION\" > \"$PROJECT_TEMP_DIR/revision\"\ntouch Info.plist"; }; F5792DFB0EDB570C001B0C31 /* Compile libgit2 */ = { isa = PBXShellScriptBuildPhase; diff --git a/Info.plist b/Info.plist index c6c21a1..b7a8de4 100644 --- a/Info.plist +++ b/Info.plist @@ -51,7 +51,7 @@ CFBundleSignature ???? CFBundleVersion - LONG_VERSION + SHORT_VERSION CFBundleGitVersion GIT_VERSION CFBundleShortVersionString