From 2274bef6b27a57deb1edd9fd2aee94d0d928c9f5 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Dec 2012 20:33:48 +0100 Subject: fix support for multiple source directories per module Change-Id: I040cb928e016c3a8257a1bcbf20627d67f07c84d Reviewed-by: Liang Qi Reviewed-by: Joerg Bornemann --- bin/syncqt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/syncqt b/bin/syncqt index 21ddff48a7..53d07fc826 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -803,7 +803,8 @@ foreach my $lib (@modules_to_sync) { die "No such module: $lib" unless(defined $modules{$lib}); #iteration info - my $dir = $modules{$lib}; + my @dirs = split(/;/, $modules{$lib}); + my $dir = $dirs[0]; my $project = $dir; $project =~ s,/([^/]+)$,/$1/$1.pro,; @@ -870,7 +871,7 @@ foreach my $lib (@modules_to_sync) { } #create the new ones - foreach my $current_dir (split(/;/, $dir)) { + foreach my $current_dir (@dirs) { my @headers_paths = split(/;/, $pathtoheaders); if (@headers_paths) { @headers_paths = map { "$current_dir/$_" } @headers_paths; @@ -1145,7 +1146,7 @@ unless($showonly || !$create_uic_class_map) { if($check_includes) { for my $lib (keys(%modules)) { #calc subdirs - my @subdirs = listSubdirs($modules{$lib}); + my @subdirs = listSubdirs(split(/;/, $modules{$lib})); foreach my $subdir (@subdirs) { my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0); -- cgit v1.2.3