gEDA-cvs: pcb.git: branch: master updated (69e400c21211758b2b3c2d71dc6083c455396e80)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  69e400c21211758b2b3c2d71dc6083c455396e80 (commit)
       via  ef2efdd2a18a744eb715ffc1278aace1a2cded46 (commit)
      from  24cc5981d799645300927af9251713bbc53a1f2e (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
=========

 src/action.c |    4 ++--
 src/main.c   |   28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)


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

commit ef2efdd2a18a744eb715ffc1278aace1a2cded46
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>

    Don't hardcode 'make' and 'gnetlist'.  Rather look for settings
    PCB_MAKE_PROGRAM, PCB_GNETLIST environment variables or command line
    values.  This should help those who may need a different 'make' (say
    gmake or bmake) or gnetlist.

:100644 100644 34df05e... a5f9771... M	src/action.c
:100644 100644 9fba9f8... 9d61ffb... M	src/main.c

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

commit ef2efdd2a18a744eb715ffc1278aace1a2cded46
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>

    Don't hardcode 'make' and 'gnetlist'.  Rather look for settings
    PCB_MAKE_PROGRAM, PCB_GNETLIST environment variables or command line
    values.  This should help those who may need a different 'make' (say
    gmake or bmake) or gnetlist.

diff --git a/src/action.c b/src/action.c
index 34df05e..a5f9771 100644
--- a/src/action.c
+++ b/src/action.c
@@ -7397,7 +7397,7 @@ ActionImport (int argc, char **argv, int x, int y)
       }
 
       cmd = (char **) malloc ((6 + nsources) * sizeof (char *));
-      cmd[0] = "gnetlist";
+      cmd[0] =  Settings.GnetlistProgram;
       cmd[1] = "-g";
       cmd[2] = "pcblf";
       cmd[3] = "-o";
@@ -7448,7 +7448,7 @@ ActionImport (int argc, char **argv, int x, int y)
       printf("Makefile!\n");
       
       cmd = (char **) malloc (7 * sizeof (char *));
-      cmd[0] = "make";
+      cmd[0] = Settings.MakeProgram;
       cmd[1] = "-s";
       cmd[2] = Concat ("PCB=", PCB->Filename, NULL);
       cmd[3] = srclist;
diff --git a/src/main.c b/src/main.c
index 9fba9f8..9d61ffb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -534,6 +534,11 @@ HID_Attribute main_attribute_list[] = {
   SSET (InitialLayerStack, "", "layer-stack",
 	"Initial layer stackup, for setting up an export."),
 
+  SSET (MakeProgram, NULL, "make-program",
+	"Sets the name and optionally full path to a make(3) program"),
+  SSET (GnetlistProgram, NULL, "gnetlist",
+	"Sets the name and optionally full path to the gnetlist(3) program"),
+
   ISET (PinoutOffsetX, 100, "pinout-offset-x", 0),
   ISET (PinoutOffsetY, 100, "pinout-offset-y", 0),
   ISET (PinoutTextOffsetX, 800, "pinout-text-offset-x", 0),
@@ -592,6 +597,25 @@ REGISTER_ATTRIBUTES (main_attribute_list)
 
   ParseRouteString (Settings.Routes, &Settings.RouteStyle[0], 1);
 
+  /*
+   * Make sure we have settings for some various programs we may wish
+   * to call
+   */
+  if (Settings.MakeProgram == NULL) {
+    Settings.MakeProgram = getenv ("PCB_MAKE_PROGRAM");
+  }
+  if (Settings.MakeProgram == NULL) {
+    Settings.MakeProgram = strdup ("make");
+  }
+
+  if (Settings.GnetlistProgram == NULL) {
+    Settings.GnetlistProgram = getenv ("PCB_GNETLIST");
+  }
+  if (Settings.GnetlistProgram == NULL) {
+    Settings.GnetlistProgram = strdup ("defgnetlist");
+  }
+
+
 }
 
 /* ---------------------------------------------------------------------- 
@@ -1030,6 +1054,10 @@ main (int argc, char *argv[])
 	      Settings.LibraryPath);
       printf ("Settings.LibraryTree       = \"%s\"\n", 
 	      Settings.LibraryTree);
+      printf ("Settings.MakeProgram = \"%s\"\n",
+	      UNKNOWN (Settings.MakeProgram));
+      printf ("Settings.GnetlistProgram = \"%s\"\n",
+	      UNKNOWN (Settings.GnetlistProgram));
 #endif
 
       gui->do_export (0);




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