Update dependency generation, and ensure it uses the opie default config when none exists

3 files changed, 100 insertions, 35 deletions

diff --git a/Makefile.test b/Makefile.test
index 526aa5d..3311cde 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -2,72 +2,61 @@
 export OPIEDIR:=$(shell pwd)
 export TOPDIR:=$(OPIEDIR)
 
 export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
 export QMAKESPEC=$(QMAKESPECSDIR)/qws/linux-generic-g++
 
-# The following are config.in's which are generated, to avoid numerous manual edits when
-# adding packages to the build.
-#
-# NOTE: There currently exists a bug regarding this, the toplevel config.in -must- be created
-# -after- the lower level config.ins, as makecfg.pl does a find for config.in files!
-#
-#  solution: generate this list and stuff into .depends, and also
-#  generate config.in interdependencies (i.e. topdir config.in depends on
-#    config.ins within dirs below it. dependencies are solely dir structure
-#    driven)
+all :
 
-configs = $(TOPDIR)/x11/ipc/server/config.in $(TOPDIR)/x11/ipc/config.in $(TOPDIR)/x11/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/todayplugins/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/development/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applets/config.in $(TOPDIR)/config.in
-
-all : configs
-
-configs : $(shell echo $(configs) | sort -r)
-
-clean-configs :
+clean-configs : $(TOPDIR)/.depends
 	@echo "Wiping generated config.in files..."
 	@-rm -f $(configs)
 
-./.config:
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/..config.cmd
+-include $(TOPDIR)/.depends
+
+all : $(TOPDIR)/.depends $(configs) $(subdir-y)
+
+./.config: $(configs)
 	$(call descend,scripts/kconfig,conf)
-	@$(MAKE) -C scripts/kconfig conf
+	@if [ ! -e $@ ]; then \
+		cp $(TOPDIR)/def-configs/opie $@; \
+	fi;
+	@$(MAKE) -C scripts/kconfig conf;
 	./scripts/kconfig/conf -s ./config.in
 
-xconfig:
+xconfig: $(configs)
 	$(call descend,scripts/kconfig,qconf)
 	./scripts/kconfig/qconf ./config.in
 
-menuconfig: scripts/lxdialog/lxdialog
+menuconfig: $(configs) scripts/lxdialog/lxdialog
 	$(call descend,scripts/kconfig,mconf)
 	./scripts/kconfig/mconf ./config.in
 
-config:
+config: $(configs)
 	$(call descend,scripts/kconfig,conf)
 	./scripts/kconfig/conf ./config.in
  
-oldconfig:
+oldconfig: $(configs)
 	$(call descend,scripts/kconfig,conf)
 	./scripts/kconfig/conf -o ./config.in
  
-randconfig:
+randconfig: $(configs)
 	$(call descend,scripts/kconfig,conf)
 	./scripts/kconfig/conf -r ./config.in
  
-allyesconfig:
+allyesconfig: $(configs)
 	$(call descend,scripts/kconfig,conf)
 	./scripts/kconfig/conf -y ./config.in
  
-allnoconfig:
+allnoconfig: $(configs)
 	$(call descend,scripts/kconfig,conf)
 	./scripts/kconfig/conf -n ./config.in
  
-defconfig:
+defconfig: $(configs)
 	$(call descend,scripts/kconfig,conf)
 	./scripts/kconfig/conf -d ./config.in
 
--include $(TOPDIR)/.config
--include $(TOPDIR)/..config.cmd
--include $(TOPDIR)/.depends
-
-all : $(TOPDIR)/.depends $(subdir-y)
 
 include $(TOPDIR)/Rules.make
 
diff --git a/Rules.make b/Rules.make
index 362659a..74e74fd 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,12 +1,13 @@
 ## targets ##
 
 $(configs) :
 	$(call makecfg,$@)
 
-$(TOPDIR)/.depends : $(TOPDIR)/config.in
+$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;)
+	@echo Generating dependency information...
 	# add to subdir-y, and add descend rules
 	@cat $(TOPDIR)/packages | \
 		awk '/^#/ { next }; {print \
 			".PHONY : " $$2 "\n" \
 			"subdir-$$(" $$1 ") += " $$2 "\n\n" \
 			$$2 "/Makefile : " $$2 "/" $$3 " $$(TOPDIR)/qmake/qmake\n\t" \
@@ -14,14 +15,16 @@ $(TOPDIR)/.depends : $(TOPDIR)/config.in
 			$$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@)\n"}'\
 			> $(TOPDIR)/.depends
 	# interpackage dependency generation
 	@cat $(TOPDIR)/packages | \
 		$(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
 	# generation of config.in files, and config.in interdependencies
-	find ./ -name config.in | ( for cfg in `cat`; do dir=`dirname $cfg`; name=`basename $dir`; if [ ! -e $dir/$name.pro ]; then echo $dir; fi; done; ) > dirs
-	cat dirs | for i in `cat`; do numlines="`cat dirs|grep $i 2>/dev/null|wc -l`"; if [ "$numlines" -ne "1" ]; then deps=`cat dirs|grep $i| grep -v "^$i$"|for i in \`cat|sed -e's,^./,$(TOPDIR)/,g'\`; do echo $i/config.in; done`; echo `echo $i|sed -e 's,^./,$(TOPDIR)/,'` : $deps; fi; done;
+	@find $(TOPDIR)/ -name config.in | ( for cfg in `cat`; do dir=`dirname $$cfg`; name=`basename $$dir`; if [ ! -e $$dir/$$name.pro ]; then echo $$dir; fi; done; ) > dirs
+	@echo "configs += `echo \`cat dirs | sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g' -e's,$$,/config.in,g'\``" >> .depends
+	@cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $(TOPDIR)/.depends
+	@-rm -f dirs
 
 $(TOPDIR)/qmake/qmake :
 	$(call descend,$(TOPDIR)/qmake)
 
 $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/qconf scripts/kconfig/qconf :
 	$(call descend,$(shell dirname $@),$(shell basename $@))
diff --git a/scripts/deps.pl b/scripts/deps.pl
new file mode 100755
index 0000000..56c4e77
--- a/dev/null
+++ b/scripts/deps.pl
@@ -0,0 +1,73 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+my %depends;
+my %tokenpath;
+
+sub getdepends ($$)
+{
+	my ($token, $path, $intoken);
+	$token = shift || return;
+	$token =~ s/CONFIG_//;
+	$path = shift || return;
+#print "opening $path/config.in\n";
+#	print "token is $token\n";
+	open( FILE, "< $path/config.in" ) || return;
+	$intoken = 0;
+	while( <FILE> ) {
+		if( $intoken == 1 ) {
+			/depends\S*(.*)/ && return $1;
+			if( /\S*(config|menu)/ ) {
+				$intoken = 0;
+				return;
+			}
+		} else {
+			/$token/ || next;
+			$intoken = 1;
+		}
+		/$token/ || next;
+	}
+	close( FILE );
+	return;
+}
+
+sub makedepends ($$)
+{
+	my ($depends, $tokenpath, $token, $depword, $mustbesep, $state);
+	$depends = shift || return;
+	$tokenpath = shift || return;
+	$mustbesep = 0;
+
+	for $token (keys %$depends){
+		print ${$tokenpath}{$token} . " : ";
+		for (split(/\s+/, ${$depends}{$token})){
+			/^\s+$/ && next;
+			/\&\&/ && next;
+			/\|\|/ && next;
+			/^$/ && next;
+			if(defined(${$tokenpath}{"CONFIG_" . $_})){
+				print '$(if $(CONFIG_' . $_ . '),' . ${$tokenpath}{"CONFIG_" . $_} . ') ';
+			} else {
+				print STDERR "ERROR in dependency generation, unable to locate path for token CONFIG_$_\n";
+			}
+		}
+		print "\n";
+	}
+}
+
+while( <> ) {
+	my $dep;
+	my ($token, $path, $pro);
+	chomp;
+	s/^\s*//g;
+	s/\s*$//g;
+	($token, $path, $pro) = split(/\s+/,$_);
+	$tokenpath{$token} = $path;
+	$dep = getdepends($token, $path);
+	if( $dep ) {
+		$depends{$token} = $dep;
+	}
+}
+
+makedepends(\%depends, \%tokenpath);