Developing a new way to handle application configurations

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4609 42af7a65-404d-4744-a932-0658087f49c3

14 files changed, 192 insertions, 1 deletions

diff --git a/apps/netutils/Kconfig b/apps/netutils/Kconfig
index 6570af783..cd0cb84dd 100644
--- a/apps/netutils/Kconfig
+++ b/apps/netutils/Kconfig
@@ -3,6 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+comment "Networking Utilities"
+
 menu "DHCP client"
 source "$APPSDIR/netutils/dhcpc/Kconfig"
 endmenu
diff --git a/apps/netutils/Make.defs b/apps/netutils/Make.defs
new file mode 100644
index 000000000..3994da612
--- /dev/null
+++ b/apps/netutils/Make.defs
@@ -0,0 +1,83 @@
+############################################################################
+# apps/netutils/Make.defs
+# Adds selected applications to apps/ build
+#
+#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in include and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of include code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+if ($(CONFIG_NETUTILS_DHCPC),y)
+CONFIGURED_APPS += netutils/dhcpc
+endif
+
+if ($(CONFIG_NETUTILS_DHCPD),y)
+CONFIGURED_APPS += netutils/dhcpd
+endif
+
+if ($(CONFIG_NETUTILS_FTPC),y)
+CONFIGURED_APPS += netutils/ftpc
+endif
+
+if ($(CONFIG_NETUTILS_FTPD),y)
+CONFIGURED_APPS += netutils/ftpd
+endif
+
+if ($(CONFIG_NETUTILS_RESOLV),y)
+CONFIGURED_APPS += netutils/resolv
+endif
+
+if ($(CONFIG_NETUTILS_SMTP),y)
+CONFIGURED_APPS += netutils/smtp
+endif
+
+if ($(CONFIG_NETUTILS_TELNETD),y)
+CONFIGURED_APPS += netutils/telnetd
+endif
+
+if ($(CONFIG_NETUTILS_TFTPC),y)
+CONFIGURED_APPS += netutils/tftpc
+endif
+
+if ($(CONFIG_NETUTILS_THTTPD),y)
+CONFIGURED_APPS += netutils/thttpd
+endif
+
+if ($(CONFIG_NETUTILS_UIPLIB),y)
+CONFIGURED_APPS += netutils/uiplib
+endif
+
+if ($(CONFIG_NETUTILS_WEBCLIENT),y)
+CONFIGURED_APPS += netutils/webclient
+endif
+
+if ($(CONFIGNETUTILS_WEBSERVER),y)
+CONFIGURED_APPS += netutils/webserver
+endif
diff --git a/apps/netutils/dhcpc/Kconfig b/apps/netutils/dhcpc/Kconfig
index ae2bf3130..7453f2747 100644
--- a/apps/netutils/dhcpc/Kconfig
+++ b/apps/netutils/dhcpc/Kconfig
@@ -2,3 +2,12 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+config NETUTILS_DHCPC
+	bool "DHCP client"
+	default n
+	---help---
+		Enable support for the DHCP client.
+
+if NETUTILS_DHCPC
+endif
diff --git a/apps/netutils/dhcpd/Kconfig b/apps/netutils/dhcpd/Kconfig
index ae2bf3130..0d3b89f24 100644
--- a/apps/netutils/dhcpd/Kconfig
+++ b/apps/netutils/dhcpd/Kconfig
@@ -2,3 +2,12 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+config NETUTILS_DHCPD
+	bool "DHCP server"
+	default n
+	---help---
+		Enable support for the DHCP server.
+
+if NETUTILS_DHCPD
+endif
diff --git a/apps/netutils/ftpc/Kconfig b/apps/netutils/ftpc/Kconfig
index ae2bf3130..7a63001fa 100644
--- a/apps/netutils/ftpc/Kconfig
+++ b/apps/netutils/ftpc/Kconfig
@@ -2,3 +2,12 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+config NETUTILS_FTPC
+	bool "FTP client"
+	default n
+	---help---
+		Enable support for the FTP client.
+
+if NETUTILS_FTPC
+endif
diff --git a/apps/netutils/ftpd/Kconfig b/apps/netutils/ftpd/Kconfig
index ae2bf3130..43fc70dbd 100644
--- a/apps/netutils/ftpd/Kconfig
+++ b/apps/netutils/ftpd/Kconfig
@@ -2,3 +2,12 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+config NETUTILS_FTPD
+	bool "FTP server"
+	default n
+	---help---
+		Enable support for the FTP server.
+
+if NETUTILS_FTPD
+endif
diff --git a/apps/netutils/resolv/Kconfig b/apps/netutils/resolv/Kconfig
index 7e003f10b..3274889aa 100644
--- a/apps/netutils/resolv/Kconfig
+++ b/apps/netutils/resolv/Kconfig
@@ -3,8 +3,17 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+config NETUTILS_RESOLV
+	bool "Name resolution"
+	default n
+	---help---
+		Enable support for the name resolution.
+
+if NETUTILS_RESOLV
 config NET_RESOLV_ENTRIES
 	int "Number of resolver entries"
 	default 8
 	---help---
 		Number of resolver entries.  Default: 8
+
+endif
\ No newline at end of file
diff --git a/apps/netutils/smtp/Kconfig b/apps/netutils/smtp/Kconfig
index ae2bf3130..99f4e4bd6 100644
--- a/apps/netutils/smtp/Kconfig
+++ b/apps/netutils/smtp/Kconfig
@@ -2,3 +2,12 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+config NETUTILS_SMTP
+	bool "SMTP"
+	default n
+	---help---
+		Enable support for SMTP.
+
+if NETUTILS_SMTP
+endif
diff --git a/apps/netutils/telnetd/Kconfig b/apps/netutils/telnetd/Kconfig
index ae2bf3130..8df8e907b 100644
--- a/apps/netutils/telnetd/Kconfig
+++ b/apps/netutils/telnetd/Kconfig
@@ -2,3 +2,12 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+config NETUTILS_TELNETD
+	bool "Telet daemon"
+	default n
+	---help---
+		Enable support for the Telnet daemon.
+
+if NETUTILS_TELNETD
+endif
diff --git a/apps/netutils/tftpc/Kconfig b/apps/netutils/tftpc/Kconfig
index ae2bf3130..e2edcd6ac 100644
--- a/apps/netutils/tftpc/Kconfig
+++ b/apps/netutils/tftpc/Kconfig
@@ -2,3 +2,12 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+config NETUTILS_TFTPC
+	bool "TFTP client"
+	default n
+	---help---
+		Enable support for the TFTP client.
+
+if NETUTILS_TFTPC
+endif
diff --git a/apps/netutils/thttpd/Kconfig b/apps/netutils/thttpd/Kconfig
index ee630ee3b..8c73008ab 100644
--- a/apps/netutils/thttpd/Kconfig
+++ b/apps/netutils/thttpd/Kconfig
@@ -3,6 +3,13 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+config NETUTILS_THTTPD
+	bool "THTTPD webserver"
+	default n
+	---help---
+		Enable support for the THTTPD webservert.
+
+if NETUTILS_TFTPC
 config THTTPD_PORT
 	int "THTTPD port number"
 	default 80
@@ -230,4 +237,4 @@ config THTTPD_URLPATTERN
 	---help---
 		If defined, then it will be used to match and verify referrers.
 
-
+endif
diff --git a/apps/netutils/uiplib/Kconfig b/apps/netutils/uiplib/Kconfig
index ae2bf3130..2eb098717 100644
--- a/apps/netutils/uiplib/Kconfig
+++ b/apps/netutils/uiplib/Kconfig
@@ -2,3 +2,12 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+config NETUTILS_UIPLIB
+	bool "Network support library"
+	default n
+	---help---
+		Enable support for the network support library.
+
+if NETUTILS_UIPLIB
+endif
diff --git a/apps/netutils/webclient/Kconfig b/apps/netutils/webclient/Kconfig
index ae2bf3130..c53195d48 100644
--- a/apps/netutils/webclient/Kconfig
+++ b/apps/netutils/webclient/Kconfig
@@ -2,3 +2,12 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+config NETUTILS_WEBCLIENT
+	bool "uIP web client"
+	default n
+	---help---
+		Enable support for the uIP web client.
+
+if NETUTILS_WEBCLIENT
+endif
diff --git a/apps/netutils/webserver/Kconfig b/apps/netutils/webserver/Kconfig
index ae2bf3130..2fb80fe95 100644
--- a/apps/netutils/webserver/Kconfig
+++ b/apps/netutils/webserver/Kconfig
@@ -2,3 +2,12 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+config NETUTILS_WEBSERVER
+	bool "uIP web server"
+	default n
+	---help---
+		Enable support for the uIP web server.
+
+if NETUTILS_WEBSERVER
+endif