[brlcad-commits] SF.net SVN: brlcad:[76159] brlcad/branches/bioh/src/burst

[starseeker--- via brlcad-commits]

Revision: 76159
          http://sourceforge.net/p/brlcad/code/76159
Author:   starseeker
Date:     2020-06-19 13:18:56 +0000 (Fri, 19 Jun 2020)
Log Message:
-----------
Missed a couple files in the merge

Modified Paths:
--------------
    brlcad/branches/bioh/src/burst/CMakeLists.txt
    brlcad/branches/bioh/src/burst/burst.cpp
    brlcad/branches/bioh/src/burst/old/CMakeLists.txt

Modified: brlcad/branches/bioh/src/burst/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/src/burst/CMakeLists.txt       2020-06-19 13:17:54 UTC 
(rev 76158)
+++ brlcad/branches/bioh/src/burst/CMakeLists.txt       2020-06-19 13:18:56 UTC 
(rev 76159)
@@ -1,5 +1,5 @@
 # Until the new code is proved out, keep the original around
-# as burst-old
+# as burst and name the new binary nburst
 add_subdirectory(old)
 
 set(LDIR "${BRLCAD_SOURCE_DIR}/src/other/linenoise")
@@ -23,7 +23,7 @@
   ${LDIR}/linenoise.c
   )
 
-BRLCAD_ADDEXEC(burst "${burst_SOURCES}" "librt;libfb;libbu;${M_LIBRARY}")
+BRLCAD_ADDEXEC(nburst "${burst_SOURCES}" "librt;libfb;libbu;${M_LIBRARY}")
 
 set(burst_ignore
   CMakeLists.txt

Modified: brlcad/branches/bioh/src/burst/burst.cpp
===================================================================
--- brlcad/branches/bioh/src/burst/burst.cpp    2020-06-19 13:17:54 UTC (rev 
76158)
+++ brlcad/branches/bioh/src/burst/burst.cpp    2020-06-19 13:18:56 UTC (rev 
76159)
@@ -1749,7 +1749,7 @@
     char **av = (char **)bu_calloc(strlen(input) + 1, sizeof(char *), "argv 
array");
     int ac = bu_argv_from_string(av, strlen(input), input);
 
-    if (!ac || !bu_cmd_valid(_burst_cmds, av[0]) == BRLCAD_OK) {
+    if (!ac || bu_cmd_valid(_burst_cmds, av[0]) != BRLCAD_OK) {
        brst_log(s, MSG_OUT, "unrecognzied command: %s\n", av[0]);
        ret = BRLCAD_ERROR;
        goto line_done;

Modified: brlcad/branches/bioh/src/burst/old/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/src/burst/old/CMakeLists.txt   2020-06-19 13:17:54 UTC 
(rev 76158)
+++ brlcad/branches/bioh/src/burst/old/CMakeLists.txt   2020-06-19 13:18:56 UTC 
(rev 76159)
@@ -26,7 +26,7 @@
   )
 
 
-BRLCAD_ADDEXEC(burst-old "${burst_old_SOURCES}" "librt;libfb;${M_LIBRARY}")
+BRLCAD_ADDEXEC(burst "${burst_old_SOURCES}" "librt;libfb;${M_LIBRARY}")
 
 set(burst_old_noinst_HEADERS
   CMakeLists.txt

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits