Renaming some files in tools/

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

6 files changed, 407 insertions, 13 deletions

diff --git a/nuttx/tools/Makefile.host b/nuttx/tools/Makefile.host
index 4a46901e6..663ff29c7 100644
--- a/nuttx/tools/Makefile.host
+++ b/nuttx/tools/Makefile.host
@@ -45,13 +45,12 @@ ifneq ($(CONFIG_WINDOWS_NATIVE),y)
 endif
 
 all: b16$(HOSTEXEEXT) bdf-converter$(HOSTEXEEXT) cmpconfig$(HOSTEXEEXT) \
-    mkconfig$(HOSTEXEEXT) mkdeps$(HOSTEXEEXT) mksymtab$(HOSTEXEEXT) \
+    configure$(HOSTEXEEXT) mkconfig$(HOSTEXEEXT) mkdeps$(HOSTEXEEXT) mksymtab$(HOSTEXEEXT) \
     mksyscall$(HOSTEXEEXT) mkversion$(HOSTEXEEXT) 
 default: mkconfig$(HOSTEXEEXT) mksyscall$(HOSTEXEEXT) mkdeps$(HOSTEXEEXT)
 
 ifdef HOSTEXEEXT
-.PHONY: b16 bdf-converter cmpconfig clean mkconfig mkdeps mksymtab \
-    mksyscall mkversion
+.PHONY: b16 bdf-converter cmpconfig clean configure mkconfig mkdeps mksymtab mksyscall mkversion
 else
 .PHONY: clean
 endif
@@ -70,10 +69,19 @@ ifdef HOSTEXEEXT
 b16: b16$(HOSTEXEEXT)
 endif
 
+# configure - Instantiate a canned NuttX configuration
+
+configure$(HOSTEXEEXT): configure.c cfgparser.c
+	$(Q) $(HOSTCC) $(HOSTCFLAGS) -o configure$(HOSTEXEEXT) configure.c cfgparser.c
+
+ifdef HOSTEXEEXT
+configure: configure$(HOSTEXEEXT)
+endif
+
 # mkconfig - Convert a .config file into a C config.h file
 
-mkconfig$(HOSTEXEEXT): mkconfig.c cfgparser.c
-	$(Q) $(HOSTCC) $(HOSTCFLAGS) -o mkconfig$(HOSTEXEEXT) mkconfig.c cfgparser.c
+mkconfig$(HOSTEXEEXT): mkconfig.c cfgdefine.c
+	$(Q) $(HOSTCC) $(HOSTCFLAGS) -o mkconfig$(HOSTEXEEXT) mkconfig.c cfgdefine.c
 
 ifdef HOSTEXEEXT
 mkconfig: mkconfig$(HOSTEXEEXT)
@@ -90,8 +98,8 @@ endif
 
 # mkversion - Convert a .version file into a C version.h file
 
-mkversion$(HOSTEXEEXT): mkconfig.c cfgparser.c
-	$(Q) $(HOSTCC) $(HOSTCFLAGS) -o mkversion$(HOSTEXEEXT) mkversion.c cfgparser.c
+mkversion$(HOSTEXEEXT): mkconfig.c cfgdefine.c
+	$(Q) $(HOSTCC) $(HOSTCFLAGS) -o mkversion$(HOSTEXEEXT) mkversion.c cfgdefine.c
 
 ifdef HOSTEXEEXT
 mkversion: mkversion$(HOSTEXEEXT)
diff --git a/nuttx/tools/README.txt b/nuttx/tools/README.txt
index fc0332212..f9e2d1099 100644
--- a/nuttx/tools/README.txt
+++ b/nuttx/tools/README.txt
@@ -38,7 +38,7 @@ discover.py
   Example script for discovering devices in the local network.
   It is the counter part to apps/netutils/discover
 
-mkconfig.c, cfgparser.c, and cfgparser.h
+mkconfig.c, cfgdefine.c, and cfgdefine.h
 ----------------------------------------
 
   These are Cs file that are used to build mkconfig program.  The mkconfig
@@ -79,7 +79,7 @@ mkfsdata.pl
   NOTE:  This perl script comes from uIP and was (probably) written
   by Adam Dunkels.  uIP has a license that is compatible with NuttX.
 
-mkversion.c, cfgparser.c, and cfgparser.h
+mkversion.c, cfgdefine.c, and cfgdefine.h
 -----------------------------------------
 
   This is C file that is used to build mkversion program.  The mkversion
diff --git a/nuttx/tools/cfgdefine.c b/nuttx/tools/cfgdefine.c
new file mode 100644
index 000000000..00dd11c20
--- /dev/null
+++ b/nuttx/tools/cfgdefine.c
@@ -0,0 +1,322 @@
+/****************************************************************************
+ * tools/cfgdefine.c
+ *
+ *   Copyright (C) 2007-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <string.h>
+#include <ctype.h>
+#include "cfgdefine.h"
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+char line[LINESIZE+1];
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* These are configuration variable name that are quoted by configuration tool
+ * but which must be unquoted when used in C code.
+ */
+
+static const char *dequote_list[] =
+{
+  /* NuttX */
+
+  "CONFIG_USER_ENTRYPOINT",            /* Name of entry point function */
+
+  /* NxWidgets/NxWM */
+
+  "CONFIG_NXWM_BACKGROUND_IMAGE",      /* Name of bitmap image class */
+  "CONFIG_NXWM_STARTWINDOW_ICON",      /* Name of bitmap image class */
+  "CONFIG_NXWM_NXCONSOLE_ICON",        /* Name of bitmap image class */
+  "CONFIG_NXWM_CALIBRATION_ICON",      /* Name of bitmap image class */
+  "CONFIG_NXWM_HEXCALCULATOR_ICON",    /* Name of bitmap image class */
+
+  NULL                                 /* Marks the end of the list */
+};
+
+ /****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+ /* Skip over any spaces */
+ 
+static char *skip_space(char *ptr)
+{
+  while (*ptr && isspace((int)*ptr)) ptr++;
+  return ptr;
+}
+
+/* Find the end of a variable string */
+
+static char *find_name_end(char *ptr)
+{
+  while (*ptr && (isalnum((int)*ptr) || *ptr == '_')) ptr++;
+  return ptr;
+}
+
+/* Find the end of a value string */
+
+static char *find_value_end(char *ptr)
+{
+  while (*ptr && !isspace((int)*ptr))
+    {
+      if (*ptr == '"')
+        {
+           do ptr++; while (*ptr && *ptr != '"');
+           if (*ptr) ptr++;
+        }
+      else
+        {
+           do ptr++; while (*ptr && !isspace((int)*ptr) && *ptr != '"');
+        }
+    }
+  return ptr;
+}
+
+/* Read the next line from the configuration file */
+
+static char *read_line(FILE *stream)
+{
+  char *ptr;
+
+  for (;;)
+    {
+      line[LINESIZE] = '\0';
+      if (!fgets(line, LINESIZE, stream))
+        {
+          return NULL;
+        }
+      else
+        {
+          ptr = skip_space(line);
+          if (*ptr && *ptr != '#' && *ptr != '\n')
+            {
+              return ptr;
+            }
+        }
+    }
+}
+
+/* Parse the line from the configuration file into a variable name
+ * string and a value string.
+ */
+
+static void parse_line(char *ptr, char **varname, char **varval)
+{
+  /* Skip over any leading spaces */
+
+  ptr = skip_space(ptr);
+
+  /* The first no-space is the beginning of the variable name */
+
+  *varname = skip_space(ptr);
+  *varval = NULL;
+
+  /* Parse to the end of the variable name */
+
+  ptr = find_name_end(ptr);
+
+  /* An equal sign is expected next, perhaps after some white space */
+
+  if (*ptr && *ptr != '=')
+    {
+      /* Some else follows the variable name.  Terminate the variable
+       * name and skip over any spaces.
+       */
+
+      *ptr = '\0';
+       ptr = skip_space(ptr + 1);
+    }
+
+  /* Verify that the equal sign is present */
+
+  if (*ptr == '=')
+    {
+      /* Make sure that the variable name is terminated (this was already
+       * done if the name was followed by white space.
+       */
+
+      *ptr = '\0';
+
+      /* The variable value should follow =, perhaps separated by some
+       * white space.
+       */
+ 
+      ptr = skip_space(ptr + 1);
+      if (*ptr)
+        {
+          /* Yes.. a variable follows.  Save the pointer to the start
+           * of the variable string.
+           */
+
+          *varval = ptr;
+
+          /* Find the end of the variable string and make sure that it
+           * is terminated.
+           */
+
+          ptr = find_value_end(ptr);
+          *ptr = '\0';
+        }
+    }
+}
+
+static char *dequote_value(const char *varname, char *varval)
+{
+  const char **dqnam;
+  char *dqval = varval;
+  int len;
+
+  if (dqval)
+    {
+      /* Check if the variable name is in the list of strings to be dequoated */
+
+      for (dqnam = dequote_list; *dqnam; dqnam++)
+        {
+          if (strcmp(*dqnam, varname) == 0)
+            {
+              break;
+            }
+        }
+
+      /* Did we find the variable name in the list of configuration variables
+       * to be dequoated?
+       */
+
+      if (*dqnam)
+        {
+          /* Yes... Check if there is a traiing quote */
+
+          len = strlen(dqval);
+          if (dqval[len-1] == '"')
+            {
+              /* Yes... replace it with a terminator */
+
+              dqval[len-1] = '\0';
+              len--;
+            }
+
+          /* Is there a leading quote? */
+
+           if (dqval[0] == '"')
+             {
+               /* Yes.. skip over the leading quote */
+
+               dqval++;
+               len--;
+             }
+
+           /* Handle the case where nothing is left after dequoting */
+
+           if (len <= 0)
+             {
+               dqval = NULL;
+             }
+        }
+    }
+
+  return dqval;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void generate_definitions(FILE *stream)
+{
+  char *varname;
+  char *varval;
+  char *ptr;
+
+  /* Loop until the entire file has been parsed. */
+
+  do
+    {
+      /* Read the next line from the file */
+
+      ptr = read_line(stream);
+      if (ptr)
+        {
+          /* Parse the line into a variable and a value field */
+
+          parse_line(ptr, &varname, &varval);
+
+          /* Was a variable name found? */
+
+          if (varname)
+            {
+              /* Yes.. dequote the value if necessary */
+
+              varval = dequote_value(varname, varval);
+
+              /* If no value was provided or if the special value 'n' was provided,
+               * then undefine the configuration variable.
+               */
+
+              if (!varval || strcmp(varval, "n") == 0)
+                {
+                  printf("#undef %s\n", varname);
+                }
+
+              /* Simply define the configuration variable if it has the special
+               * value "y"
+               */
+
+              else if (strcmp(varval, "y") == 0)
+                {
+                  printf("#define %s 1\n", varname);
+                }
+
+              /* Otherwise, use the value as provided */
+
+              else
+                {
+                  printf("#define %s %s\n", varname, varval);
+                }
+            }
+        }
+    }
+  while (ptr);
+}
diff --git a/nuttx/tools/cfgdefine.h b/nuttx/tools/cfgdefine.h
new file mode 100644
index 000000000..04817b719
--- /dev/null
+++ b/nuttx/tools/cfgdefine.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+ * tools/cfgdefine.h
+ *
+ *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source 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.
+ *
+ ****************************************************************************/
+
+#ifndef __TOOLS_CFGDEFINE_H
+#define __TOOLS_CFGDEFINE_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdio.h>
+#include <limits.h>
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+#define LINESIZE  ( PATH_MAX > 256 ? PATH_MAX : 256 )
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+extern char line[LINESIZE+1];
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+extern void generate_definitions(FILE *stream);
+
+#endif /* __TOOLS_CFGDEFINE_H */
diff --git a/nuttx/tools/mkconfig.c b/nuttx/tools/mkconfig.c
index 3e55f5097..f4a1168c5 100644
--- a/nuttx/tools/mkconfig.c
+++ b/nuttx/tools/mkconfig.c
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "cfgparser.h"
+#include "cfgdefine.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -99,7 +99,7 @@ int main(int argc, char **argv, char **envp)
   printf("#ifndef __INCLUDE_NUTTX_CONFIG_H\n");
   printf("#define __INCLUDE_NUTTX_CONFIG_H\n\n");
   printf("/* Architecture-specific options *************************/\n\n");
-  parse_file(stream);
+  generate_definitions(stream);
   printf("\n/* Sanity Checks *****************************************/\n\n");
   printf("/* If this is an NXFLAT, external build, then make sure that\n");
   printf(" * NXFLAT support is enabled in the base code.\n");
diff --git a/nuttx/tools/mkversion.c b/nuttx/tools/mkversion.c
index 32068df38..c6b00c5e5 100644
--- a/nuttx/tools/mkversion.c
+++ b/nuttx/tools/mkversion.c
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "cfgparser.h"
+#include "cfgdefine.h"
 
 /****************************************************************************
  * Definitions
@@ -98,7 +98,7 @@ int main(int argc, char **argv, char **envp)
   printf("/* version.h -- Autogenerated! Do not edit. */\n\n");
   printf("#ifndef __INCLUDE_NUTTX_VERSION_H\n");
   printf("#define __INCLUDE_NUTTX_VERSION_H\n\n");
-  parse_file(stream);
+  generate_definitions(stream);
   printf("\n#define CONFIG_VERSION ((CONFIG_VERSION_MAJOR << 8) | (CONFIG_VERSION_MINOR))\n\n");
   printf("#endif /* __INCLUDE_NUTTX_VERSION_H */\n");
   fclose(stream);