| -rw-r--r-- | Rules.make | 2 | ||||
| -rwxr-xr-x | scripts/makecfg.pl | 37 |
2 files changed, 8 insertions, 31 deletions
@@ -77,14 +77,14 @@ $(TOPDIR)/mkspecs/default : ## general rules ## define descend $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) endef define makefilegen cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep " \`echo $(1)|sed -e 's,/Makefile$$,,'\` " | \ head -1 | awk '{print $$3}'` endef define makecfg - $(TOPDIR)/scripts/makecfg.pl $1 + $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) endef diff --git a/scripts/makecfg.pl b/scripts/makecfg.pl index 5dd66a4..d7dc41e 100755 --- a/scripts/makecfg.pl +++ b/scripts/makecfg.pl @@ -1,26 +1,27 @@ #!/usr/bin/perl -w eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' if 0; #$running_under_some_shell use strict; use File::Find; my $packages=""; open(FILE, "<./packages"); while(<FILE>){$packages.=$_;} close(FILE); -my ($dirname,$dir,$file,@files,$filename,$tagname,$name,$caps,$pre,$post,$sources,@dupecheck); +my ($dirname,$dir,$file,@files,$filename,$tagname,$name,$caps,$pre,$post,$sources,@dupecheck,$basedir); $file = shift || die; +$basedir = shift; push(@files, $file); foreach(@files){ my $cfg=$_; ($dirname=$cfg)=~s,(.*)/(.*),$1,; ($filename=$cfg)=~s,(.*/)(.*),$2,; ($tagname=$dirname)=~s,.*/,,; ($caps=$tagname)=~tr/[a-z]/[A-Z]/; #print "cfg is $cfg\n"; #print "dir is $dirname\n"; #print "filename is $filename\n"; sub wanted; @@ -43,60 +44,36 @@ if(-e "$dirname/config.in.in"){ open(CFG, ">$cfg") || die "Unable to open $cfg for writing\n"; select(CFG); print $pre; @dupecheck=(); File::Find::find({wanted => \&wanted}, $dirname); print $post; select(STDOUT); close(CFG); } exit; -open(FILE,">$dir/config.in"); -select(FILE); -print "menu \"$name\"\n"; -print "\n"; -my @subdirs=(); -my @dirs; -foreach(grep(/^$dir/, @dirs)){ - chomp; - /^$dir\/$name.pro$/ && next; - my $localdir=$_; - if($dir=~m,^$localdir$,){ - next; - } -#($locadir=$_)~s,/[^/]+$,,g; - if($localdir=~/^\.$/){next;} - if(grep(/^$localdir$/, @subdirs)){next;} - my $nslashes = $localdir =~ tr!/!!; - my $dirnslashes = $dir =~ tr!/!!; - $dirnslashes++; - if($dirnslashes != $nslashes ){next;} - print STDERR "$localdir/config.in\n"; - print " source $localdir/config.in\n"; - push(@subdirs, $localdir); - print "endmenu\n"; - select(STDOUT); - close(FILE); -} - use vars qw/*name *dir *prune/; *name = *File::Find::name; *dir = *File::Find::dir; *prune = *File::Find::prune; sub wanted { if( /config.in$/s ) { if(grep(/^$File::Find::dir\/config.in$/, @dupecheck)){ return; } my $nslashes = $File::Find::dir =~ tr!/!!; my $dirnslashes = $dirname =~ tr!/!!; $dirnslashes++; # print STDERR "dirnslashes is $dirnslashes\n"; # print STDERR "nslashes is $nslashes\n"; if($dirnslashes != $nslashes){return;} - print " source " . $File::Find::dir . "/config.in\n"; + my $reldir; + if (defined($basedir)) { + ($reldir=$File::Find::dir)=~s,^$basedir/,,; + } + print " source " . $reldir . "/config.in\n"; push(@dupecheck, $File::Find::dir . "/config.in"); } } |