summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-11 14:34:39 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-19 16:40:04 +0200
commit912f7efbd45ae441dcabb94ec659cd7737ce8af2 (patch)
treecf1e530d4239b8002267a819d5e508a8d9ca36ee
parentb2dc56d5cf244efaadfd72a283e135888a7f0d8b (diff)
fix status output for generated headers
Change-Id: I92c250037eb1b1838998cddbaea6ca065153e86e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rwxr-xr-xbin/syncqt12
1 files changed, 9 insertions, 3 deletions
diff --git a/bin/syncqt b/bin/syncqt
index 490d01722f..04d3162f71 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -591,6 +591,12 @@ sub loadSyncProfile {
return $result;
}
+sub basePrettify {
+ my ($arg) = @_;
+ $$arg =~ s,^\Q$basedir\E,<srcbase>,;
+ $$arg =~ s,^\Q$out_basedir\E,<outbase>,;
+}
+
sub locateSyncProfile
{
my ($directory) = @_;
@@ -925,7 +931,7 @@ foreach my $lib (@modules_to_sync) {
print MODULE_VERSION_HEADER_FILE "\n";
print MODULE_VERSION_HEADER_FILE "#endif // QT_". uc($lib) . "_VERSION_H\n";
close MODULE_VERSION_HEADER_FILE;
- $moduleversionheader = "<srcbase>" . substr($moduleversionheader, length($basedir)) if ($verbose_level < 2);
+ basePrettify(\$moduleversionheader) if ($verbose_level < 2);
print "$lib: created version header $moduleversionheader\n" if($verbose_level);
} elsif ($modulepri) {
print "$lib: WARNING: Module\'s pri file '$modulepri' not found.\n$lib: Skipped creating module version header.\n";
@@ -1085,7 +1091,7 @@ foreach my $lib (@modules_to_sync) {
if ($verbose_level && $header_copies) {
my $new_header_dirname = dirname($iheader);
- $new_header_dirname = "<srcbase>" . substr($new_header_dirname, length($basedir)) if ($new_header_dirname && $verbose_level < 2);
+ basePrettify(\$new_header_dirname) if ($new_header_dirname && $verbose_level < 2);
my $header_base = basename($iheader);
if ($verbose_level < 3) {
my $line_prefix = ",";
@@ -1098,7 +1104,7 @@ foreach my $lib (@modules_to_sync) {
}
print "$line_prefix $header_base ($header_copies)";
} else { # $verbose_level >= 3
- $iheader = "<srcbase>" . substr($iheader, length($basedir)) if ($verbose_level == 3);
+ basePrettify(\$iheader) if ($verbose_level == 3);
print "$lib: created $header_copies fwd-include headers for $iheader\n";
}
}