Skip to content

Commit ca20965

Browse files
committed
Info.plist: No longer use the LONG_VERSION hack
Since 0b81911 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.
1 parent 9b20e51 commit ca20965

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

GitX.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@
771771
);
772772
runOnlyForDeploymentPostprocessing = 0;
773773
shellPath = /bin/sh;
774-
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";
774+
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";
775775
};
776776
F5792DFB0EDB570C001B0C31 /* Compile libgit2 */ = {
777777
isa = PBXShellScriptBuildPhase;

Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<key>CFBundleSignature</key>
5252
<string>????</string>
5353
<key>CFBundleVersion</key>
54-
<string>LONG_VERSION</string>
54+
<string>SHORT_VERSION</string>
5555
<key>CFBundleGitVersion</key>
5656
<string>GIT_VERSION</string>
5757
<key>CFBundleShortVersionString</key>

0 commit comments

Comments
 (0)