gEDA-cvs: pcb.git: branch: master updated (31df66e87a810aac852139da9119b15c47fa8c71)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  31df66e87a810aac852139da9119b15c47fa8c71 (commit)
      from  aa73c06889aa6c8ac7b7ff5816ee4863915c7994 (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/file.c |   11 +++++------
 src/main.c |    5 +++--
 2 files changed, 8 insertions(+), 8 deletions(-)


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

commit 31df66e87a810aac852139da9119b15c47fa8c71
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Bikeshed commit 11700ba8c3c951a788c8190073eb09822060dfdd
    
    I don't like magic strings, and IMO, using a blank LibraryContentsCommand
    string to imply "don't use this feature" is better than "*NONE*".

:100644 100644 a9575b1... 8888432... M	src/file.c
:100644 100644 3f692e4... ddd5675... M	src/main.c

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

commit 31df66e87a810aac852139da9119b15c47fa8c71
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Bikeshed commit 11700ba8c3c951a788c8190073eb09822060dfdd
    
    I don't like magic strings, and IMO, using a blank LibraryContentsCommand
    string to imply "don't use this feature" is better than "*NONE*".

diff --git a/src/file.c b/src/file.c
index a9575b1..8888432 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1413,12 +1413,11 @@ ReadLibraryContents (void)
   LibraryMenuTypePtr menu = NULL;
   LibraryEntryTypePtr entry;
 
-
-  /* On Windows, the magic string '*NONE*' is set in main.c as we
-     normally cannot run shell scripts or expect to have m4.  This
-     allows the user to still override it if they have a
-     windows-compatible library generator.  */
-  if (strcmp (Settings.LibraryContentsCommand, "*NONE*"))
+  /* If we don't have a command to execute to find the library contents,
+   * skip this. This is used by default on Windows builds (set in main.c),
+   * as we can't normally run shell scripts or expect to have m4 present.
+   */
+  if (*Settings.LibraryContentsCommand != '\0')
     {
       /*  First load the M4 stuff.  The variable Settings.LibraryPath
        *  points to it.
diff --git a/src/main.c b/src/main.c
index 3f692e4..ddd5675 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1122,13 +1122,14 @@ Defaults to @code{"QueryLibrary.sh '%p' '%f' %a"}
 @ftable @code
 @item --lib-contents-command <string>
 Command to query the contents of the library. @*
-Defaults to @code{"ListLibraryContents.sh %p %f"} or, on Windows, *NONE*
+Defaults to @code{"ListLibraryContents.sh %p %f"} or,
+on Windows builds, an empty string (to disable this feature).
 @end ftable
 %end-doc
 */
   SSET (LibraryContentsCommand,
 #ifdef __WIN32__
-	"*NONE*",
+	"",
 #else
 	"ListLibraryContents.sh '%p' '%f'",
 #endif




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