mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use g log for buildid, modify this if we unsplit repos or change vcs

Browse Source
This commit is contained in:
Caolán McNamara
2011-06-28 13:01:29 +01:00
parent e0010764db
commit 0953ccda12
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
solenv/bin/modules/installer/scriptitems.pm
View File

@@ -802,7 +802,10 @@ sub replace_setup_variables
if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; } # using "680" instead of "src680"
my $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")";
my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h-`;
if (!$buildidstring) {
$buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")";
}
# the environment variable CWS_WORK_STAMP is set only in CWS
if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstring = $buildidstring . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; }