Revision: 77134
http://sourceforge.net/p/brlcad/code/77134
Author: starseeker
Date: 2020-09-13 17:29:04 +0000 (Sun, 13 Sep 2020)
Log Message:
-----------
Pull RELEASE-only changes back into trunk, r77106 through r77132
Modified Paths:
--------------
brlcad/trunk/src/archer/CMakeLists.txt
brlcad/trunk/src/brlman/CMakeLists.txt
brlcad/trunk/src/bwish/CMakeLists.txt
brlcad/trunk/src/libbu/parse.c
brlcad/trunk/src/libtclcad/CMakeLists.txt
brlcad/trunk/src/libtclcad/commands.c
brlcad/trunk/src/mged/CMakeLists.txt
brlcad/trunk/src/tclscripts/lib/RtImage.tcl
Property Changed:
----------------
brlcad/trunk/
brlcad/trunk/src/libbu/
Index: brlcad/trunk
===================================================================
--- brlcad/trunk 2020-09-13 17:25:19 UTC (rev 77133)
+++ brlcad/trunk 2020-09-13 17:29:04 UTC (rev 77134)
Property changes on: brlcad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75685,76001-76451,76693-76768
+/brlcad/branches/RELEASE:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75685,76001-76451,76693-76768,77107-77132
/brlcad/branches/bioh:75720-75736,75740-75742,75860-75891,75894-75986,76088-76153,76354-76506,76577
/brlcad/branches/brep-debug:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
/brlcad/branches/bullet:62518
Modified: brlcad/trunk/src/archer/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/archer/CMakeLists.txt 2020-09-13 17:25:19 UTC (rev
77133)
+++ brlcad/trunk/src/archer/CMakeLists.txt 2020-09-13 17:29:04 UTC (rev
77134)
@@ -2,20 +2,21 @@
${BU_INCLUDE_DIRS}
${TCLCAD_INCLUDE_DIRS}
${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
)
+if (TK_INCLUDE_PATH)
+ set(ARCHER_INCLUDE_DIRS ${ARCHER_INCLUDE_DIRS} ${TK_INCLUDE_PATH})
+endif (TK_INCLUDE_PATH)
list(REMOVE_DUPLICATES ARCHER_INCLUDE_DIRS)
BRLCAD_INCLUDE_DIRS(ARCHER_INCLUDE_DIRS)
BRLCAD_ADDDATA(archer_launch.tcl tclscripts/archer)
-set(archer_libs libtclcad libbu ${ITCL_LIBRARY} ${ITK_LIBRARY} ${TCL_LIBRARY}
${IMM32_LIBRARY} ${COMCTL32_LIBRARY})
-
# NOTE: Building "GUI" doesn't matter except on Windows, but on Windows archer
# currently works only in graphical mode - might as well behave "nicely" there.
# If/when we add MGED's ability to work in "classic" mode, Archer will have
# to be built as a non-GUI application (or we'll have to build two executables)
if(BRLCAD_ENABLE_TK)
+ set(archer_libs libtclcad libbu ${ITCL_LIBRARY} ${ITK_LIBRARY}
${TCL_LIBRARY} ${IMM32_LIBRARY} ${COMCTL32_LIBRARY})
set(archer_srcs archer.c)
if (HAVE_WINDOWS_H)
# To associate an icon with the application for Windows (needed
Modified: brlcad/trunk/src/brlman/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/brlman/CMakeLists.txt 2020-09-13 17:25:19 UTC (rev
77133)
+++ brlcad/trunk/src/brlman/CMakeLists.txt 2020-09-13 17:29:04 UTC (rev
77134)
@@ -3,8 +3,10 @@
${BU_INCLUDE_DIRS}
${TCLCAD_INCLUDE_DIRS}
${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
)
+if (TARGET Tkhtml)
+ set(BRLMAN_INCLUDE_DIRS ${BRLMAN_INCLUDE_DIRS} ${TK_INCLUDE_PATH})
+endif (TARGET Tkhtml)
list(REMOVE_DUPLICATES BRLMAN_INCLUDE_DIRS)
BRLCAD_INCLUDE_DIRS(BRLMAN_INCLUDE_DIRS)
Modified: brlcad/trunk/src/bwish/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/bwish/CMakeLists.txt 2020-09-13 17:25:19 UTC (rev
77133)
+++ brlcad/trunk/src/bwish/CMakeLists.txt 2020-09-13 17:29:04 UTC (rev
77134)
@@ -5,8 +5,10 @@
${TERMIO_INCLUDE_DIRS}
${TCLCAD_INCLUDE_DIRS}
${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
)
+ if (TK_INCLUDE_PATH)
+ set(BWISH_INCLUDE_DIRS ${BWISH_INCLUDE_DIRS} ${TK_INCLUDE_PATH})
+ endif (TK_INCLUDE_PATH)
list(REMOVE_DUPLICATES BWISH_INCLUDE_DIRS)
BRLCAD_INCLUDE_DIRS(BWISH_INCLUDE_DIRS)
Index: brlcad/trunk/src/libbu
===================================================================
--- brlcad/trunk/src/libbu 2020-09-13 17:25:19 UTC (rev 77133)
+++ brlcad/trunk/src/libbu 2020-09-13 17:29:04 UTC (rev 77134)
Property changes on: brlcad/trunk/src/libbu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/src/libbu:70323-70333,71915-71935,72826-72858,74376-74454,75372-75681,76704-76725
+/brlcad/branches/RELEASE/src/libbu:70323-70333,71915-71935,72826-72858,74376-74454,75372-75681,76704-76725,77107-77132
/brlcad/branches/bioh/src/libbu:75720-75736,75860-75891,75894-75986,76088-76153
/brlcad/branches/brep-debug/src/libbu:69168,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
/brlcad/branches/dm-fb-merge/src/libbu:75426-76198
Modified: brlcad/trunk/src/libbu/parse.c
===================================================================
--- brlcad/trunk/src/libbu/parse.c 2020-09-13 17:25:19 UTC (rev 77133)
+++ brlcad/trunk/src/libbu/parse.c 2020-09-13 17:29:04 UTC (rev 77134)
@@ -685,7 +685,15 @@
/* iterate over all structure entries and look for a match */
for (; sdp->sp_name != (char *)0; sdp++) {
- loc = (char *)(base + sdp->sp_offset);
+ // Optimized GhostBSD sometimes results in this calculation evaluating
+ // to zero/NULL when base == NULL, even when sdp->sp_offset is
+ // non-zero??? Only try the math if we have a non-null base to start
+ // with - otherwise just use the offset.
+ if (base) {
+ loc = (char *)(base + sdp->sp_offset);
+ } else {
+ loc = (char *)(sdp->sp_offset);
+ }
if (UNLIKELY(loc == NULL)) {
bu_log("Structure inconsistency detected parsing '%s'\n",
sdp->sp_name ? sdp->sp_name : "NULL");
Modified: brlcad/trunk/src/libtclcad/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libtclcad/CMakeLists.txt 2020-09-13 17:25:19 UTC (rev
77133)
+++ brlcad/trunk/src/libtclcad/CMakeLists.txt 2020-09-13 17:29:04 UTC (rev
77134)
@@ -39,9 +39,12 @@
${BN_INCLUDE_DIRS}
${BU_INCLUDE_DIRS}
${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
)
+ if (TK_INCLUDE_PATH)
+ set(TCLCAD_INCLUDE_DIRS ${TCLCAD_INCLUDE_DIRS} ${TK_INCLUDE_PATH})
+ endif (TK_INCLUDE_PATH)
+
# Include directories only needed by the implementation
set(TCLCAD_LOCAL_INCLUDE_DIRS
${PNG_INCLUDE_DIRS}
@@ -53,7 +56,24 @@
set(TCLCAD_XLIBS ${TCLCAD_XLIBS} ${X11_LIBRARIES})
endif(BRLCAD_ENABLE_X11)
- BRLCAD_ADDLIB(libtclcad "${LIBTCLCAD_SRCS}"
"libged;libdm;libdm;libnmg;libbn;libbu;${TCL_LIBRARY};${TK_LIBRARY};${ITCL_LIBRARY};${ITK_LIBRARY};${TCLCAD_XLIBS}")
+ set(TCLCAD_LIBS
+ libged
+ libdm
+ libnmg
+ libbn
+ libbu
+ ${TCL_LIBRARY}
+ ${ITCL_LIBRARY}
+ ${TCLCAD_XLIBS}
+ )
+ if (TK_LIBRARY)
+ set(TCLCAD_LIBS ${TCLCAD_LIBS} ${TK_LIBRARY})
+ endif (TK_LIBRARY)
+ if (ITK_LIBRARY)
+ set(TCLCAD_LIBS ${TCLCAD_LIBS} ${ITK_LIBRARY})
+ endif (ITK_LIBRARY)
+
+ BRLCAD_ADDLIB(libtclcad "${LIBTCLCAD_SRCS}" "${TCLCAD_LIBS}")
set_target_properties(libtclcad PROPERTIES VERSION 20.0.1 SOVERSION 20)
if (TARGET itcl_pkgIndex)
add_dependencies(libtclcad itcl_pkgIndex)
Modified: brlcad/trunk/src/libtclcad/commands.c
===================================================================
--- brlcad/trunk/src/libtclcad/commands.c 2020-09-13 17:25:19 UTC (rev
77133)
+++ brlcad/trunk/src/libtclcad/commands.c 2020-09-13 17:29:04 UTC (rev
77134)
@@ -1240,20 +1240,23 @@
return;
struct tclcad_io_data *t_iod = (struct tclcad_io_data
*)p->gedp->ged_io_data;
switch (d) {
- case BU_PROCESS_STDIN:
- Tcl_DeleteChannelHandler(t_iod->chan_stdin, NULL,
(ClientData)NULL);
- if (t_iod->chan_stdin)
+ case BU_PROCESS_STDIN:
+ if (t_iod->chan_stdin) {
+ Tcl_DeleteChannelHandler(t_iod->chan_stdin, NULL,
(ClientData)NULL);
Tcl_Close(t_iod->interp, t_iod->chan_stdin);
+ }
break;
- case BU_PROCESS_STDOUT:
- Tcl_DeleteChannelHandler(t_iod->chan_stdout, NULL,
(ClientData)NULL);
- if (t_iod->chan_stdout)
+ case BU_PROCESS_STDOUT:
+ if (t_iod->chan_stdout) {
+ Tcl_DeleteChannelHandler(t_iod->chan_stdout, NULL,
(ClientData)NULL);
Tcl_Close(t_iod->interp, t_iod->chan_stdout);
+ }
break;
- case BU_PROCESS_STDERR:
- Tcl_DeleteChannelHandler(t_iod->chan_stderr, NULL,
(ClientData)NULL);
- if (t_iod->chan_stderr)
+ case BU_PROCESS_STDERR:
+ if (t_iod->chan_stderr) {
+ Tcl_DeleteChannelHandler(t_iod->chan_stderr, NULL,
(ClientData)NULL);
Tcl_Close(t_iod->interp, t_iod->chan_stderr);
+ }
break;
}
}
Modified: brlcad/trunk/src/mged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/mged/CMakeLists.txt 2020-09-13 17:25:19 UTC (rev
77133)
+++ brlcad/trunk/src/mged/CMakeLists.txt 2020-09-13 17:29:04 UTC (rev
77134)
@@ -58,6 +58,9 @@
if(TARGET libtermio)
set(mged_libs ${mged_libs} libtermio)
endif(TARGET libtermio)
+if (ITK_LIBRARY)
+ set(mged_libs ${mged_libs} ${ITK_LIBRARY})
+endif (ITK_LIBRARY)
# Ideally we'd build as GUI for Windows to avoid the command window popping up,
# but I'm not sure if that would be a problem for scripting with mged.exe on
@@ -73,11 +76,13 @@
${DM_INCLUDE_DIRS}
${BU_INCLUDE_DIRS}
${NMG_INCLUDE_DIRS}
- ${TK_INCLUDE_PATH}
${TCL_INCLUDE_PATH}
${TERMIO_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
)
+ if (TK_INCLUDE_PATH)
+ set(MGED_INCLUDE_DIRS ${MGED_INCLUDE_DIRS} ${TK_INCLUDE_PATH})
+ endif (TK_INCLUDE_PATH)
BRLCAD_INCLUDE_DIRS(MGED_INCLUDE_DIRS)
Modified: brlcad/trunk/src/tclscripts/lib/RtImage.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/lib/RtImage.tcl 2020-09-13 17:25:19 UTC (rev
77133)
+++ brlcad/trunk/src/tclscripts/lib/RtImage.tcl 2020-09-13 17:29:04 UTC (rev
77134)
@@ -111,7 +111,7 @@
lappend cmd $obj
}
- puts "RT (with fullcolor): $cmd"
+ #puts "RT (with fullcolor): $cmd"
#
# Run rt to generate the color insert
@@ -165,7 +165,7 @@
}
# !!! FIXME: this runs rt in regress-D ...
- puts "RTEDGE (with fullcolor): $cmd"
+ #puts "RTEDGE (with fullcolor): $cmd"
#
# Run rtedge to generate the full-color with edges
@@ -205,7 +205,7 @@
lappend cmd $obj
}
- puts "RT (ghosted): $cmd"
+ #puts "RT (ghosted): $cmd"
#
# Run rt to generate the full-color version of the ghost image
@@ -228,7 +228,7 @@
lappend cmd $obj
}
- puts "RT (occluded): $cmd"
+ #puts "RT (occluded): $cmd"
#
# Run rt to generate the full-color version of the occlude_objects
(i.e. color and ghost)
@@ -295,7 +295,7 @@
lappend cmd $obj
}
- puts "RTEDGE: $cmd"
+ #puts "RTEDGE: $cmd"
#
# Run rtedge to generate the full-color version of the ghost image
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
