gEDA-cvs: gaf.git: branch: master updated (1.6.1-20100214-236-g8ea29ee)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  8ea29eed4fdc4b756e0437bb086b27d61b1eb7a0 (commit)
      from  3fa62435953d75e9a927e36fb5edab7bdc17535e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 NEWS                  |    2 ++
 utils/docs/gsch2pcb.1 |    6 +++---
 utils/src/gsch2pcb.c  |   10 ++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)


=================
 Commit Messages
=================

commit 8ea29eed4fdc4b756e0437bb086b27d61b1eb7a0
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gsch2pcb: Don't allow `gnetlist-arg' in project file.
    
    Closes-bug: lp-700194

:100644 100644 4d1f0ef... d4c4817... M	NEWS
:100644 100644 aada550... 9013896... M	utils/docs/gsch2pcb.1
:100644 100644 5b932fb... f415fd8... M	utils/src/gsch2pcb.c

=========
 Changes
=========

commit 8ea29eed4fdc4b756e0437bb086b27d61b1eb7a0
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gsch2pcb: Don't allow `gnetlist-arg' in project file.
    
    Closes-bug: lp-700194

diff --git a/NEWS b/NEWS
index 4d1f0ef..d4c4817 100644
--- a/NEWS
+++ b/NEWS
@@ -85,6 +85,8 @@ Notable changes in gEDA/gaf 1.7.0
 * On Windows, `gschem' and `gattrib' will no longer launch with a
   command window visible.
 
+ * `gnetlist-arg' is no longer valid in `gsch2pcb' project files.
+
 * The undocumented `mk_verilog_syms' program is no longer installed.
   The symbols it creates are still installed to
   `${prefix}/share/gEDA/sym/verilog'.
diff --git a/utils/docs/gsch2pcb.1 b/utils/docs/gsch2pcb.1
index aada550..9013896 100644
--- a/utils/docs/gsch2pcb.1
+++ b/utils/docs/gsch2pcb.1
@@ -119,9 +119,9 @@ Print \fBgsch2pcb\fR version information.
 A \fBgsch2pcb\fR project file is a file (not ending in `.sch')
 containing a list of schematics to process and some options.  Any
 long-form command line option can appear in the project file with the
-leading `--' removed, with the exception of `--fix-elements',
-`--verbose', and `--version'.  Schematics should be listed on a line
-beginning with `schematics'.
+leading `--' removed, with the exception of `--gnetlist-arg',
+`--fix-elements', `--verbose', and `--version'.  Schematics should be
+listed on a line beginning with `schematics'.
 .PP
 An example project file might look like:
 
diff --git a/utils/src/gsch2pcb.c b/utils/src/gsch2pcb.c
index 5b932fb..f415fd8 100644
--- a/utils/src/gsch2pcb.c
+++ b/utils/src/gsch2pcb.c
@@ -1110,9 +1110,6 @@ parse_config (gchar * config, gchar * arg)
     add_m4_file (arg);
   else if (!strcmp (config, "gnetlist"))
     extra_gnetlist_list = g_list_append (extra_gnetlist_list, g_strdup (arg));
-  else if (!strcmp (config, "gnetlist-arg"))
-    extra_gnetlist_arg_list =
-      g_list_append (extra_gnetlist_arg_list, g_strdup (arg));
   else if (!strcmp (config, "empty-footprint"))
     empty_footprint_name = g_strdup (arg);
   else
@@ -1225,10 +1222,10 @@ static gchar *usage_string1 =
   "   --gnetlist backend    A convenience run of extra gnetlist -g commands.\n"
   "                         Example:  gnetlist partslist3\n"
   "                         Creates:  myproject.partslist3\n"
-  "   --gnetlist-arg arg    Allows additional arguments to be passed to gnetlist.\n"
   " --empty-footprint name  See the project.sample file.\n"
   "\n"
   "options (not recognized in a project file):\n"
+  "   --gnetlist-arg arg    Allows additional arguments to be passed to gnetlist.\n"
   "       --fix-elements    If a schematic component footprint is not equal\n"
   "                         to its PCB element Description, update the\n"
   "                         Description instead of replacing the element.\n"
@@ -1277,6 +1274,11 @@ get_args (gint argc, gchar ** argv)
       } else if (!strcmp (opt, "fix-elements")) {
         fix_elements = TRUE;
         continue;
+      } else if (!strcmp (opt, "gnetlist-arg")) {
+        extra_gnetlist_arg_list =
+          g_list_append (extra_gnetlist_arg_list, g_strdup (arg));
+        i++;
+        continue;
       } else if (!strcmp (opt, "help") || !strcmp (opt, "h"))
         usage ();
       else if (i < argc




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