gEDA-cvs: gaf.git: branch: stable-1.6 updated (1.6.1-20100214-15-g6e54d86)

[git@xxxxxxxxxx]

The branch, stable-1.6 has been updated
       via  6e54d862d31c1cd97ae54eb457c980f8053b4f10 (commit)
       via  16b3d32fcf8458389a491aed9437be835131b4b9 (commit)
      from  8a3a0bb070d1b288fceac2fcdd7b317a8f77a464 (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/src/gsch2pcb.c |   13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)


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

commit 6e54d862d31c1cd97ae54eb457c980f8053b4f10
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Update NEWS re: `gnetlist-arg' change.
    
    Adds info on commit 16b3d32fcf84 to NEWS.

:100644 100644 8b7f9c9... 41e35bd... M	NEWS

commit 16b3d32fcf8458389a491aed9437be835131b4b9
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 1d48899... d320dc0... M	utils/src/gsch2pcb.c

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

commit 6e54d862d31c1cd97ae54eb457c980f8053b4f10
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Update NEWS re: `gnetlist-arg' change.
    
    Adds info on commit 16b3d32fcf84 to NEWS.

diff --git a/NEWS b/NEWS
index 8b7f9c9..41e35bd 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,8 @@ Notable changes in gEDA/gaf 1.6.2
  * On Windows, `gschem' and `gattrib' will no longer launch with a
    command window visible.
 
+ * `gnetlist-arg' is no longer valid in `gsch2pcb' project files.
+
 Several other bugs were fixed, including a major crash bug in
 gnetlist.
 

commit 16b3d32fcf8458389a491aed9437be835131b4b9
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/utils/src/gsch2pcb.c b/utils/src/gsch2pcb.c
index 1d48899..d320dc0 100644
--- a/utils/src/gsch2pcb.c
+++ b/utils/src/gsch2pcb.c
@@ -1253,9 +1253,6 @@ parse_config(gchar *config, gchar *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
@@ -1370,10 +1367,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"
@@ -1432,6 +1429,14 @@ get_args(gint argc, gchar **argv)
 				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