gEDA-cvs: CVS update: globals.c

[cvspsrv@xxxxxxxx]

  User: sdb     
  Date: 07/04/29 15:46:01

  Modified:    .        globals.c parsecmd.c
  Log:
   Add --nomunge flag to gnetlist, telling spice-sdb
  
   to not autocorrect incorrect device prefixes.
  
  
  
  
  Revision  Changes    Path
  1.25      +1 -0      eda/geda/gaf/gnetlist/src/globals.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: globals.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gnetlist/src/globals.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- globals.c	10 Feb 2007 18:33:16 -0000	1.24
  +++ globals.c	29 Apr 2007 19:46:01 -0000	1.25
  @@ -75,6 +75,7 @@
   int sort_mode=FALSE;
   int include_mode=FALSE;
   int embedd_mode=FALSE;
  +int nomunge_mode = FALSE;
   
   /* what kind of netlist are we generating? see define.h for #defs */
   int netlist_mode=gEDA;
  
  
  
  1.26      +31 -21    eda/geda/gaf/gnetlist/src/parsecmd.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: parsecmd.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gnetlist/src/parsecmd.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- parsecmd.c	10 Feb 2007 16:11:17 -0000	1.25
  +++ parsecmd.c	29 Apr 2007 19:46:01 -0000	1.26
  @@ -40,7 +40,7 @@
   #include <dmalloc.h>
   #endif
   
  -#define OPTIONS "o:qieIhvsg:c:l:m:O:"
  +#define OPTIONS "o:qieIhvsg:c:l:m:O:n"
   
   #ifndef OPTARG_IN_UNISTD
   extern char *optarg;
  @@ -52,8 +52,12 @@
   #ifdef HAVE_GETOPT_LONG
   struct option long_options[] =
   {
  -  {"help", 0, 0, 0},
  -  /* will add other args later */
  +  {"help", 0, 0, 'h'},
  +  {"nomunge", 0, 0, 'n'},
  +  {"verbose", 0, 0, 'v'},
  +  {"sort", 0, 0, 's'},
  +  {"embedd", 0, 0, 'e'},
  +  {"include", 0, 0, 'I'},
     {0, 0, 0, 0}
   };
   #endif
  @@ -63,22 +67,23 @@
   void usage(char *cmd)
   {
       printf("Usage: %s [OPTIONS] filename1 ... filenameN\n", cmd);
  -    printf("  -e                Force embedding contents of .include file\n");
  +    printf("  -e  --embedd       Force embedding contents of .include file (spice-sdb)\n");
       printf("  -h --help         Print this help string\n");
       printf("  -i                Interactive scheme mode\n");
  -    printf("  -I                Put .INCLUDE <filename> in output file instead\n");
  -    printf("                    of model file's contents\n");
  +    printf("  -I  --include      Put .INCLUDE <filename> in output file instead\n");
  +    printf("                     of model file's contents (spice-sdb)\n");
       printf("  -q                Quiet mode\n");
       printf("  -l filename       Load scheme file before loading backend\n");
       printf("  -m filename       Load scheme file after loading backend,\n");
       printf("                    but still before executing procedure\n");
  -    printf("  -g proc           Scheme procedure to execute.\n");
  +    printf("  -n  --nomunge      Don't autocorrect refdeses (spice-sdb)\n");
  +    printf("  -g  proc           Scheme procedure (netlister backend) to execute.\n");
       printf("                    Use '-g help' to list available backends.\n");
       printf("  -o filename       Output netlist filename\n");
       printf("  -c string         Execute string as a scheme script\n");
       printf("  -O option         Pass the given option to the backend\n");
  -    printf("  -v                Verbose mode on\n");
  -    printf("  -s                Sort output netlist (for Gnucap)\n");
  +    printf("  -v  --verbose      Verbose mode on\n");
  +    printf("  -s  --sort         Sort output netlist (spice-sdb)\n");
       printf("\n");
       exit(0);
   }
  @@ -122,9 +127,9 @@
   
       /* Converted to getopt_long by SDB 3.3.2006 */
   #ifdef HAVE_GETOPT_LONG
  -    int option_index = 0;
  +    /* int option_index = 0; */
   
  -    while ((ch = getopt_long(argc, argv, OPTIONS, long_options, &option_index)) != -1) {
  +    while ((ch = getopt_long(argc, argv, OPTIONS, long_options, NULL /* &option_index */)) != -1) {
   #else
       while ((ch = getopt(argc, argv, OPTIONS)) != -1) {
   #endif
  @@ -170,6 +175,11 @@
              post_backend_list = g_slist_append(post_backend_list, optarg);
              break;
   
  +        case 'n':
  +	   backend_params = g_slist_append(backend_params, "nomunge_mode");
  +	   nomunge_mode = TRUE;
  +           break;
  +
   	case 'o':
   	    if (output_filename) {
   		g_free(output_filename);
  
  
  


_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs