aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Connolly <stuart02@gmail.com>2014-01-20 20:32:50 +0000
committerStuart Connolly <stuart02@gmail.com>2014-01-20 20:32:50 +0000
commite3a4e458ea66bbd5cb3440c0b6402c5ad5031e58 (patch)
tree441c547384018214045c36f9080817df9f74e5e4
parent0d1e5180d575e6191362ae4ba411d240da93c14d (diff)
downloadsequelpro-e3a4e458ea66bbd5cb3440c0b6402c5ad5031e58.tar.gz
sequelpro-e3a4e458ea66bbd5cb3440c0b6402c5ad5031e58.tar.bz2
sequelpro-e3a4e458ea66bbd5cb3440c0b6402c5ad5031e58.zip
Set the revision long hash in the Info.plist so we can send it to our crash report system.
-rw-r--r--Resources/Plists/Info.plist2
-rwxr-xr-xScripts/build-version.pl23
2 files changed, 20 insertions, 5 deletions
diff --git a/Resources/Plists/Info.plist b/Resources/Plists/Info.plist
index d2107a25..7522acc0 100644
--- a/Resources/Plists/Info.plist
+++ b/Resources/Plists/Info.plist
@@ -178,6 +178,8 @@
<string></string>
<key>SPVersionShortHash</key>
<string></string>
+ <key>SPVersionLongHash</key>
+ <string></string>
<key>FRFeedbackReporter.maxConsoleLogSize</key>
<integer>10000</integer>
<key>FRFeedbackReporter.targetURL</key>
diff --git a/Scripts/build-version.pl b/Scripts/build-version.pl
index 27a615c7..85ea429a 100755
--- a/Scripts/build-version.pl
+++ b/Scripts/build-version.pl
@@ -53,6 +53,14 @@ sub _get_revision_number
}
#
+# Get the rveision long hash from Git.
+#
+sub _get_revision_long_hash
+{
+ return `git log -n 1 --pretty=format:%H`;
+}
+
+#
# Get the revision short hash from Git.
#
sub _get_revision_short_hash
@@ -89,21 +97,26 @@ sub _save_plist
}
my $version = _get_revision_number();
-my $version_hash = _get_revision_short_hash();
+my $version_long_hash = _get_revision_long_hash();
+my $version_short_hash = _get_revision_short_hash();
-$version_hash =~ s/\n//;
+$version_long_hash =~ s/\n//;
+$version_short_hash =~ s/\n//;
croak "$0: Unable to determine Git revision. Exiting..." unless $version;
-croak "$0: Unable to determine Git revision hash. Exiting..." unless $version_hash;
+croak "$0: Unable to determine Git revision hash. Exiting..." unless $version_long_hash;
+croak "$0: Unable to determine Git revision short hash. Exiting..." unless $version_short_hash;
my $info = _get_plist_content($plist_path);
$info =~ s/([\t ]+<key>CFBundleVersion<\/key>\n[\t ]+<string>).*?(<\/string>)/$1$version$2/;
-$info =~ s/([\t ]+<key>SPVersionShortHash<\/key>\n[\t ]+<string>).*?(<\/string>)/$1$version_hash$2/;
+$info =~ s/([\t ]+<key>SPVersionLongHash<\/key>\n[\t ]+<string>).*?(<\/string>)/$1$version_long_hash$2/;
+$info =~ s/([\t ]+<key>SPVersionShortHash<\/key>\n[\t ]+<string>).*?(<\/string>)/$1$version_short_hash$2/;
_save_plist($info, $plist_path);
printf("CFBunderVersion set to $version\n");
-printf("VersionShortHash set to $version_hash");
+printf("SPVersionLongHash set to $version_long_hash\n");
+printf("SPVersionShortHash set to $version_short_hash\n");
exit 0