Commit 4bdf8d5f authored by Geoffrey Métais's avatar Geoffrey Métais

Fix vlc revision resource

parent 1d7c28ea
......@@ -33,6 +33,7 @@ android {
resValue "string", "build_time", buildTime()
resValue "string", "build_host", hostName()
resValue "string", "build_revision", revision()
resValue "string", "build_vlc_revision", vlcRevision()
tasks.whenTaskAdded { task ->
if (task.name.startsWith('assemble')) {
......@@ -225,15 +226,20 @@ def hostName() {
def revision() {
def code = new ByteArrayOutputStream()
def vlc = new ByteArrayOutputStream()
exec {
commandLine 'git', 'rev-parse', '--short', 'HEAD'
standardOutput = code
}
return code.toString()
}
def vlcRevision() {
def code = new ByteArrayOutputStream()
def vlc = new ByteArrayOutputStream()
exec {
commandLine 'git', 'rev-parse', '--short', 'HEAD'
workingDir '../vlc'
standardOutput = vlc
}
return code.toString()+"VLC: "+vlc.toString()
return vlc.toString()
}
......@@ -175,7 +175,7 @@ public class UiTools {
TextView link = (TextView) v.findViewById(R.id.main_link);
link.setText(Html.fromHtml(VLCApplication.getAppResources().getString(R.string.about_link)));
String revision = VLCApplication.getAppResources().getString(R.string.build_revision);
String revision = VLCApplication.getAppResources().getString(R.string.build_revision)+" VLC: "+VLCApplication.getAppResources().getString(R.string.build_vlc_revision);
String builddate = VLCApplication.getAppResources().getString(R.string.build_time);
String builder = VLCApplication.getAppResources().getString(R.string.build_host);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment