1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

de-duplicate code

Browse Source 
Change-Id: Ic3f2bfeb5a16da86b1cd471b55dfc79f12dfadee
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Oswald Buddenhagen 2012-08-27 08:44:39 +02:00 committed by Qt by Nokia
parent 5408225286
commit 8a879a6148
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
bin/syncqt
View File

@ -533,6 +533,22 @@ sub findFiles {
return @files; return @files;
} }
sub listSubdirs {
my @subdirs = @_;
foreach my $subdir (@subdirs) {
opendir DIR, $subdir or die "Huh, directory ".$subdir." cannot be opened.";
foreach my $t (sort readdir(DIR)) {
push @subdirs, "$subdir/$t" if(-d "$subdir/$t" && !($t eq ".") &&
!($t eq "..") && !($t eq ".obj") &&
!($t eq ".moc") && !($t eq ".rcc") &&
!($t eq ".uic") && !($t eq "build") &&
!($t eq "doc"));
}
closedir DIR;
}
return @subdirs;
}
###################################################################### ######################################################################
# Syntax: loadSyncProfile() # Syntax: loadSyncProfile()
# #
@ -866,20 +882,7 @@ foreach my $lib (@modules_to_sync) {
foreach my $headers_dir (@headers_paths) { foreach my $headers_dir (@headers_paths) {
#calc subdirs #calc subdirs
my @subdirs = ($headers_dir); my @subdirs = listSubdirs($headers_dir);
foreach my $subdir (@subdirs) {
if ($subdir =~ /\/doc$/) {
next;
}
opendir DIR, $subdir or next;
foreach my $t (sort readdir(DIR)) {
push @subdirs, "$subdir/$t" if(-d "$subdir/$t" && !($t eq ".") &&
!($t eq "..") && !($t eq ".obj") &&
!($t eq ".moc") && !($t eq ".rcc") &&
!($t eq ".uic") && !($t eq "build"));
}
closedir DIR;
}
#calc files and "copy" them #calc files and "copy" them
foreach my $subdir (@subdirs) { foreach my $subdir (@subdirs) {
@ -1144,18 +1147,7 @@ unless($showonly || !$create_uic_class_map) {
if($check_includes) { if($check_includes) {
for my $lib (keys(%modules)) { for my $lib (keys(%modules)) {
#calc subdirs #calc subdirs
my @subdirs = ($modules{$lib}); my @subdirs = listSubdirs($modules{$lib});
foreach my $subdir (@subdirs) {
opendir DIR, $subdir or die "Huh, directory ".$subdir." cannot be opened.";
foreach my $t (sort readdir(DIR)) {
push @subdirs, "$subdir/$t" if(-d "$subdir/$t" && !($t eq ".") &&
!($t eq "..") && !($t eq ".obj") &&
!($t eq ".moc") && !($t eq ".rcc") &&
!($t eq ".uic") && !($t eq "build") &&
!($t eq "doc"));
}
closedir DIR;
}
foreach my $subdir (@subdirs) { foreach my $subdir (@subdirs) {
my $header_skip_qt_module_test = 0; my $header_skip_qt_module_test = 0;