Revision: 76726
http://sourceforge.net/p/brlcad/code/76726
Author: starseeker
Date: 2020-08-13 12:03:20 +0000 (Thu, 13 Aug 2020)
Log Message:
-----------
Merge changes from RELEASE branch - r76703 through r76725
Modified Paths:
--------------
brlcad/trunk/bench/CMakeLists.txt
brlcad/trunk/bench/run.sh
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
brlcad/trunk/misc/CMake/Distcheck.cmake
brlcad/trunk/misc/CMake/distcheck_repo_verify.cmake.in
brlcad/trunk/regress/asc/CMakeLists.txt
brlcad/trunk/regress/asc/asc.sh
brlcad/trunk/regress/asc/asc2dsp.sh
brlcad/trunk/regress/bots/bots.sh
brlcad/trunk/regress/burst/regress-burst.cmake.in
brlcad/trunk/regress/comgeom/comgeom.sh
brlcad/trunk/regress/dsp/dsp.sh
brlcad/trunk/regress/dsp/run-dsp-case-set-1.sh
brlcad/trunk/regress/dsp/run-dsp-case-set-2.sh
brlcad/trunk/regress/dsp/run-dsp-case-set-3.sh
brlcad/trunk/regress/flawfinder.sh
brlcad/trunk/regress/g-dot.sh
brlcad/trunk/regress/g-nff.sh
brlcad/trunk/regress/gchecker/regress-gchecker.cmake.in
brlcad/trunk/regress/ged/regress-ged_mater.cmake.in
brlcad/trunk/regress/gqa/gqa.sh
brlcad/trunk/regress/icv/regress-icv_export.cmake.in
brlcad/trunk/regress/icv/regress-icv_import.cmake.in
brlcad/trunk/regress/iges/iges.sh
brlcad/trunk/regress/library.sh
brlcad/trunk/regress/licenses/regress-licenses.cmake.in
brlcad/trunk/regress/lights/lights.sh
brlcad/trunk/regress/mged/mged.sh
brlcad/trunk/regress/mged/regress-mged.cmake.in
brlcad/trunk/regress/moss/moss.sh
brlcad/trunk/regress/nirt/nirt.sh
brlcad/trunk/regress/nurbs/regress-nurbs-test.cmake.in
brlcad/trunk/regress/pkg/regress-pkg.cmake.in
brlcad/trunk/regress/red/red.sh
brlcad/trunk/regress/repository/regress-repository.cmake.in
brlcad/trunk/regress/rtedge/rtedge.sh
brlcad/trunk/regress/rtwizard/regress-rtwiz.cmake.in
brlcad/trunk/regress/shaders/shaders.sh
brlcad/trunk/regress/solids/solids.sh
brlcad/trunk/regress/spdi/spdi.sh
brlcad/trunk/regress/usage.sh
brlcad/trunk/regress/user/regress-user.cmake.in
brlcad/trunk/regress/weight/weight.sh
brlcad/trunk/src/CMakeLists.txt
brlcad/trunk/src/fb/CMakeLists.txt
brlcad/trunk/src/libbu/tests/datetime.c
brlcad/trunk/src/libged/ged_init.cpp
brlcad/trunk/src/librt/CMakeLists.txt
brlcad/trunk/src/libtclcad/tclcad_init.c
brlcad/trunk/src/libtermio/CMakeLists.txt
brlcad/trunk/src/remrt/CMakeLists.txt
brlcad/trunk/src/rt/CMakeLists.txt
brlcad/trunk/src/util/CMakeLists.txt
Property Changed:
----------------
brlcad/trunk/
brlcad/trunk/bench/
brlcad/trunk/regress/
brlcad/trunk/src/libbu/
Index: brlcad/trunk
===================================================================
--- brlcad/trunk 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk 2020-08-13 12:03:20 UTC (rev 76726)
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-76703
+/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-76725
/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
Index: brlcad/trunk/bench
===================================================================
--- brlcad/trunk/bench 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/bench 2020-08-13 12:03:20 UTC (rev 76726)
Property changes on: brlcad/trunk/bench
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/bench:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454
+/brlcad/branches/RELEASE/bench:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,76704-76725
/brlcad/branches/brep-debug/bench: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,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927
/brlcad/branches/bullet/bench:62518
/brlcad/branches/cmake/bench:43219
Modified: brlcad/trunk/bench/CMakeLists.txt
===================================================================
--- brlcad/trunk/bench/CMakeLists.txt 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/bench/CMakeLists.txt 2020-08-13 12:03:20 UTC (rev 76726)
@@ -11,17 +11,26 @@
run.c
clean.c
)
-BRLCAD_ADDEXEC(bark "${BARK_SOURCES}" libbu NO_STRICT NO_INSTALL)
+BRLCAD_ADDEXEC(bark "${BARK_SOURCES}" libbu NO_STRICT NO_INSTALL TEST_USESDATA)
configure_file(run.sh "${CMAKE_CURRENT_BINARY_DIR}/benchmark" COPYONLY)
install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/benchmark" DESTINATION
${BIN_DIR})
+
+add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/benchmark-${CMAKE_CFG_INTDIR}-done
+ COMMAND "${CMAKE_COMMAND}" -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/run.sh $<TARGET_FILE_DIR:bark>/benchmark
+ COMMAND "${CMAKE_COMMAND}" -E touch
${CMAKE_CURRENT_BINARY_DIR}/benchmark-${CMAKE_CFG_INTDIR}-done
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/run.sh
+ )
+add_custom_target(benchmark_cp DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/benchmark-${CMAKE_CFG_INTDIR}-done)
+set_target_properties(benchmark_cp PROPERTIES FOLDER "Benchmark")
if(CMAKE_CONFIGURATION_TYPES)
foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
- configure_file(run.sh ${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/bin/benchmark
COPYONLY)
+ DISTCLEAN(${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/${BIN_DIR}/benchmark)
endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
else(CMAKE_CONFIGURATION_TYPES)
- configure_file(run.sh ${CMAKE_BINARY_DIR}/bin/benchmark COPYONLY)
+ DISTCLEAN(${CMAKE_BINARY_DIR}/${BIN_DIR}/benchmark)
endif(CMAKE_CONFIGURATION_TYPES)
file(WRITE "${CMAKE_BINARY_DIR}/CMakeTmp/benchmsg.cmake" "message(\"---\")\n")
@@ -38,13 +47,14 @@
if(SH_EXEC AND TARGET m35.g)
# CTest enabled short run of the benchmark suite
- add_test(NAME benchmark COMMAND ${SH_EXEC}
"${CMAKE_BINARY_DIR}/bin/benchmark" run TIMEFRAME=1)
+ add_test(NAME benchmark COMMAND ${SH_EXEC}
"$<TARGET_FILE_DIR:bark>/benchmark" run TIMEFRAME=1)
set_tests_properties(benchmark PROPERTIES LABELS "Benchmark")
add_custom_target(benchmark-check
COMMAND ${CMAKE_CTEST_COMMAND} -L Benchmark --output-on-failure
- DEPENDS rt pixcmp BENCHMARK_PIX_cp PIX_LOG_cp
+ DEPENDS rt pixcmp BENCHMARK_PIX_cp PIX_LOG_cp benchmark_cp
)
add_dependencies(benchmark-check bldg391.g m35.g moss.g sphflake.g star.g
world.g)
+ set_target_properties(benchmark-check PROPERTIES FOLDER "Benchmark")
if(TARGET check)
add_dependencies(check benchmark-check)
endif(TARGET check)
@@ -51,19 +61,22 @@
# Full run of the benchmark suite
add_custom_target(benchmark
- COMMAND ${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/benchmark run
+ COMMAND ${SH_EXEC} $<TARGET_FILE_DIR:bark>/benchmark run
COMMAND ${CMAKE_COMMAND} -P "${CMAKE_BINARY_DIR}/CMakeTmp/benchmsg.cmake"
- DEPENDS rt pixcmp BENCHMARK_PIX_cp PIX_LOG_cp
+ DEPENDS rt pixcmp BENCHMARK_PIX_cp PIX_LOG_cp benchmark_cp
)
add_dependencies(benchmark bldg391.g m35.g moss.g sphflake.g star.g world.g)
+ set_target_properties(benchmark PROPERTIES FOLDER "Benchmark")
# benchmark cleanup targets
add_custom_target(benchmark-clean
${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/benchmark clean
)
+ set_target_properties(benchmark-clean PROPERTIES FOLDER "Benchmark")
add_custom_target(benchmark-clobber
${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/benchmark clobber
)
+ set_target_properties(benchmark-clobber PROPERTIES FOLDER "Benchmark")
endif(SH_EXEC AND TARGET m35.g)
# Local Variables:
Modified: brlcad/trunk/bench/run.sh
===================================================================
--- brlcad/trunk/bench/run.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/bench/run.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -585,8 +585,9 @@
fi
# more sanity checks, make sure the binaries and scripts run
-eval \"$RT\" -s1 -F/dev/debug \"${DB}/moss.g\" LIGHT > /dev/null 2>&1
+eval \"$RT\" -s1 -o light.pix \"${DB}/moss.g\" LIGHT > /dev/null 2>&1
ret=$?
+rm -f light.pix
if test ! "x${ret}" = "x0" ; then
$ECHO
$ECHO "Running \"$RT\":"
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-08-13 11:41:10 UTC
(rev 76725)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-08-13 12:03:20 UTC
(rev 76726)
@@ -354,7 +354,7 @@
# If we *are* installing, do so to the binary directory (BIN_DIR)
if(E_NO_INSTALL OR E_TEST)
# Unfortunately, we currently need Windows binaries in the same
directories as their DLL libraries
- if(NOT WIN32)
+ if(NOT WIN32 AND NOT E_TEST_USESDATA)
if(NOT CMAKE_CONFIGURATION_TYPES)
set_target_properties(${execname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}")
else(NOT CMAKE_CONFIGURATION_TYPES)
@@ -363,7 +363,7 @@
set_target_properties(${execname} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}
"${CMAKE_CURRENT_BINARY_DIR}/${CFG_TYPE}")
endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
endif(NOT CMAKE_CONFIGURATION_TYPES)
- endif(NOT WIN32)
+ endif(NOT WIN32 AND NOT E_TEST_USESDATA)
else(E_NO_INSTALL OR E_TEST)
if (NOT E_TEST_USESDATA)
install(TARGETS ${execname} DESTINATION ${BIN_DIR})
Modified: brlcad/trunk/misc/CMake/Distcheck.cmake
===================================================================
--- brlcad/trunk/misc/CMake/Distcheck.cmake 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/misc/CMake/Distcheck.cmake 2020-08-13 12:03:20 UTC (rev
76726)
@@ -79,6 +79,8 @@
add_custom_target(distcheck-source_archives
COMMAND ${CMAKE_COMMAND} -E echo "*** Create source tgz, tbz2 and zip
archives from toplevel archive ***"
COMMAND ${CPACK_EXEC} --config
"${CMAKE_CURRENT_BINARY_DIR}/CPackSourceConfig.cmake"
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
"${CMAKE_BINARY_DIR}/source_archive_contents"
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
"${CMAKE_BINARY_DIR}/_CPack_Packages"
COMMAND ${CMAKE_COMMAND} -E remove
"${CMAKE_BINARY_DIR}/CMakeTmp/create_builddir_source_archive.done"
DEPENDS distcheck-source_archive_dir)
set_target_properties(distcheck-source_archives PROPERTIES FOLDER "BRL-CAD
Distribution Checking")
Modified: brlcad/trunk/misc/CMake/distcheck_repo_verify.cmake.in
===================================================================
--- brlcad/trunk/misc/CMake/distcheck_repo_verify.cmake.in 2020-08-13
11:41:10 UTC (rev 76725)
+++ brlcad/trunk/misc/CMake/distcheck_repo_verify.cmake.in 2020-08-13
12:03:20 UTC (rev 76726)
@@ -161,7 +161,7 @@
set(GIT_TREE_MODIFIED 0)
# Get the file list
- set(GIT_FILES "")
+ unset(GIT_FILES)
execute_process(COMMAND ${GIT_EXEC} ls-tree --full-tree -r --name-only HEAD
WORKING_DIRECTORY "@CMAKE_SOURCE_DIR@"
OUTPUT_VARIABLE GIT_STDOUT
@@ -168,6 +168,7 @@
ERROR_VARIABLE GIT_STDERR
RESULT_VARIABLE RETVAL)
string(REGEX REPLACE "\r?\n" ";" GIT_FILES "${GIT_STDOUT}")
+ string(REGEX REPLACE ";$" "" GIT_FILES "${GIT_FILES}")
if (RETVAL)
message("")
message("WARNING: Git does not seem to be working correctly.")
Index: brlcad/trunk/regress
===================================================================
--- brlcad/trunk/regress 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress 2020-08-13 12:03:20 UTC (rev 76726)
Property changes on: brlcad/trunk/regress
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/regress:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75372-75681
+/brlcad/branches/RELEASE/regress:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75372-75681,76704-76725
/brlcad/branches/bioh/regress:75860-75891,75894-75986,76088-76153,76354-76506
/brlcad/branches/brep-debug/regress: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,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927
/brlcad/branches/bullet/regress:62518
Modified: brlcad/trunk/regress/asc/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/asc/CMakeLists.txt 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/regress/asc/CMakeLists.txt 2020-08-13 12:03:20 UTC (rev
76726)
@@ -22,9 +22,10 @@
set(asc_outfiles
asc.log
asc2dsp.log
- asc2dsp.new.dsp
- asc2dsp.old.bw
- asc2dsp.old.dsp
+ asc2dsp-new.dsp
+ asc2dsp-old.bw
+ asc2dsp-old.dsp
+ asc2dsp-old.pix
moss_v4.asc
moss_v4.g
moss_v4_asc_v4.g
Modified: brlcad/trunk/regress/asc/asc.sh
===================================================================
--- brlcad/trunk/regress/asc/asc.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/asc/asc.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -102,6 +102,7 @@
# If that didn't work, don't bother going further - we've got a problem.
if [ $STATUS -gt 0 ] ; then
log "-> basic v5 asc.sh round-trip FAILED, see $LOGFILE"
+ cat $LOGFILE
exit $STATUS
fi
@@ -152,6 +153,7 @@
# binary dbupdate should't have significantly altered the file.
#if [ $STATUS -gt 0 ] ; then
# log "-> dbupgrade cycle FAILED, see $LOGFILE"
+# cat $LOGFILE
# exit $STATUS
#fi
@@ -167,6 +169,7 @@
if [ $STATUS -gt 0 ] ; then
log "-> asc.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit $STATUS
else
log "-> asc.sh succeeded"
@@ -183,6 +186,7 @@
# If something went wrong, bail.
if [ $STATUS -gt 0 ] ; then
log "-> g2asc broad object coverage check FAILED, see $LOGFILE"
+ cat $LOGFILE
exit $STATUS
fi
Modified: brlcad/trunk/regress/asc/asc2dsp.sh
===================================================================
--- brlcad/trunk/regress/asc/asc2dsp.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/asc/asc2dsp.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -73,8 +73,8 @@
fi
-BASE1=asc2dsp.old
-BASE2=asc2dsp.new
+BASE1=asc2dsp-old
+BASE2=asc2dsp-new
# we generate one dsp file the old way and one the new way--they should be
identical
@@ -105,6 +105,7 @@
if [ $STATUS -gt 0 ] ; then
log "-> asc2dsp.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
else
log "-> asc2dsp.sh succeeded"
fi
Modified: brlcad/trunk/regress/bots/bots.sh
===================================================================
--- brlcad/trunk/regress/bots/bots.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/bots/bots.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -230,6 +230,7 @@
log "-> BoT check succeeded"
else
log "-> BoT check FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $FAILED
Modified: brlcad/trunk/regress/burst/regress-burst.cmake.in
===================================================================
--- brlcad/trunk/regress/burst/regress-burst.cmake.in 2020-08-13 11:41:10 UTC
(rev 76725)
+++ brlcad/trunk/regress/burst/regress-burst.cmake.in 2020-08-13 12:03:20 UTC
(rev 76726)
@@ -45,7 +45,8 @@
set(burst_log)
if(NOT EXISTS "${CBDIR}/ktank.burst" OR burst_result)
file(APPEND "${LOGFILE}" "Failure: ${burst_result}\n")
- message(FATAL_ERROR "${BURST} failed to process ktank.b, aborting.\nSee
${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "${BURST} failed to process ktank.b, aborting.\nSee
${LOGFILE} for more details.\n${LOG}")
endif(NOT EXISTS "${CBDIR}/ktank.burst" OR burst_result)
# If we copied the input files, clear them out as well
Modified: brlcad/trunk/regress/comgeom/comgeom.sh
===================================================================
--- brlcad/trunk/regress/comgeom/comgeom.sh 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/regress/comgeom/comgeom.sh 2020-08-13 12:03:20 UTC (rev
76726)
@@ -78,7 +78,7 @@
# make our starting database
rm -f comgeom.m35.asc
log "... running gzip decompress"
-$GZIP -d -c "$PATH_TO_THIS/m35.asc.gz" > comgeom.m35.asc
+$GZIP -d -c "$PATH_TO_THIS/../iges/m35.asc.gz" > comgeom.m35.asc
rm -f comgeom.m35.g
run $ASC2G comgeom.m35.asc comgeom.m35.g
@@ -158,6 +158,7 @@
log "-> vdeck/comgeom-g check succeeded"
else
log "-> vdeck/comgeom-g check FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $FAILED
Modified: brlcad/trunk/regress/dsp/dsp.sh
===================================================================
--- brlcad/trunk/regress/dsp/dsp.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/dsp/dsp.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -87,6 +87,7 @@
log "-> dsp.sh succeeded"
else
log "-> dsp.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $FAILED
Modified: brlcad/trunk/regress/dsp/run-dsp-case-set-1.sh
===================================================================
--- brlcad/trunk/regress/dsp/run-dsp-case-set-1.sh 2020-08-13 11:41:10 UTC
(rev 76725)
+++ brlcad/trunk/regress/dsp/run-dsp-case-set-1.sh 2020-08-13 12:03:20 UTC
(rev 76726)
@@ -29,13 +29,16 @@
# convert dsp data file in asc format to pix format
DSPASC=$1/regress/dsp/$BASE2.asc
+ echo "$A2P < $DSPASC > $BASE2.pix"
$A2P < $DSPASC > $BASE2.pix
# convert pix to bw format
# take the blue pixel only
+ echo "$P2B -B1.0 $BASE2.pix > $BASE2.bw"
$P2B -B1.0 $BASE2.pix > $BASE2.bw
# convert pix to dsp format
+ echo "$CV huc nu16 $BASE2.bw $BASE2.dsp"
$CV huc nu16 $BASE2.bw $BASE2.dsp
# build a TGM
Modified: brlcad/trunk/regress/dsp/run-dsp-case-set-2.sh
===================================================================
--- brlcad/trunk/regress/dsp/run-dsp-case-set-2.sh 2020-08-13 11:41:10 UTC
(rev 76725)
+++ brlcad/trunk/regress/dsp/run-dsp-case-set-2.sh 2020-08-13 12:03:20 UTC
(rev 76726)
@@ -31,13 +31,16 @@
# convert dsp data file in asc format to pix format
DSPASC=$1/regress/dsp/$BASE2.asc
+ echo "$A2P < $DSPASC > $BASE2.pix"
$A2P < $DSPASC > $BASE2.pix
# convert pix to bw format
# take the blue pixel only
+ echo "$P2B -B1.0 $BASE2.pix > $BASE2.bw"
$P2B -B1.0 $BASE2.pix > $BASE2.bw
# convert pix to dsp format
+ echo "$CV huc nu16 $BASE2.bw $BASE2.dsp"
$CV huc nu16 $BASE2.bw $BASE2.dsp
# build a TGM
Modified: brlcad/trunk/regress/dsp/run-dsp-case-set-3.sh
===================================================================
--- brlcad/trunk/regress/dsp/run-dsp-case-set-3.sh 2020-08-13 11:41:10 UTC
(rev 76725)
+++ brlcad/trunk/regress/dsp/run-dsp-case-set-3.sh 2020-08-13 12:03:20 UTC
(rev 76726)
@@ -43,13 +43,16 @@
# convert dsp data file in asc format to pix format
DSPASC=$1/regress/dsp/$BASE2.asc
+ echo "$A2P < $DSPASC > $BASE2.pix"
$A2P < $DSPASC > $BASE2.pix
# convert pix to bw format
# take the blue pixel only
+ echo "$P2B -B1.0 $BASE2.pix > $BASE2.bw"
$P2B -B1.0 $BASE2.pix > $BASE2.bw
# convert pix to dsp format
+ echo "$CV huc nu16 $BASE2.bw $BASE2.dsp"
$CV huc nu16 $BASE2.bw $BASE2.dsp
# build a TGM
Modified: brlcad/trunk/regress/flawfinder.sh
===================================================================
--- brlcad/trunk/regress/flawfinder.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/flawfinder.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -70,6 +70,7 @@
log "-> flawfinder.sh succeeded"
else
log "-> flawfinder.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $NUMBER_WRONG
Modified: brlcad/trunk/regress/g-dot.sh
===================================================================
--- brlcad/trunk/regress/g-dot.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/g-dot.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -78,6 +78,7 @@
log "-> g-dot.sh succeeded"
else
log "-> g-dot.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $STATUS
Modified: brlcad/trunk/regress/g-nff.sh
===================================================================
--- brlcad/trunk/regress/g-nff.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/g-nff.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -85,6 +85,7 @@
log "-> g-nff.sh succeeded"
else
log "-> g-nff.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $STATUS
Modified: brlcad/trunk/regress/gchecker/regress-gchecker.cmake.in
===================================================================
--- brlcad/trunk/regress/gchecker/regress-gchecker.cmake.in 2020-08-13
11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/gchecker/regress-gchecker.cmake.in 2020-08-13
12:03:20 UTC (rev 76726)
@@ -30,12 +30,14 @@
set(gchecker_log)
if(NOT EXISTS "${CBDIR}/gchecker_test.g.ck/ck.gchecker_test.g.overlaps")
file(APPEND "${LOGFILE}" "\n\nError: return code ${gchecker_result}")
- message(FATAL_ERROR "${GCHECKER} failed to process gchecker_test.g,
aborting.\nSee ${CBDIR}/gchecker.log for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "${GCHECKER} failed to process gchecker_test.g,
aborting.\nSee ${CBDIR}/gchecker.log for more details.\n${LOG}")
endif(NOT EXISTS "${CBDIR}/gchecker_test.g.ck/ck.gchecker_test.g.overlaps")
if(gchecker_result)
file(APPEND "${LOGFILE}" "\n\nError: return code ${gchecker_result}")
- message(FATAL_ERROR "[gchecker] Failure, see ${LOGFILE} for more info.\n")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "[gchecker] Failure, see ${LOGFILE} for more
info.\n${LOG}")
endif(gchecker_result)
# Local Variables:
Modified: brlcad/trunk/regress/ged/regress-ged_mater.cmake.in
===================================================================
--- brlcad/trunk/regress/ged/regress-ged_mater.cmake.in 2020-08-13 11:41:10 UTC
(rev 76725)
+++ brlcad/trunk/regress/ged/regress-ged_mater.cmake.in 2020-08-13 12:03:20 UTC
(rev 76726)
@@ -19,7 +19,8 @@
string(REPLACE "\\" "" MATER_EXEC "${EXEC}")
if (NOT EXISTS "${MATER_EXEC}")
file(WRITE "${LOGFILE}" "mater test program not found at location
\"${MATER_EXEC}\" - aborting\n")
- message(FATAL_ERROR "Unable to find mater test program, aborting.\nSee
${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find mater test program, aborting.\nSee
${LOGFILE} for more details.\n${LOG}")
endif (NOT EXISTS "${MATER_EXEC}")
# Clean up in case we've run before unsuccessfully
@@ -37,7 +38,8 @@
file(APPEND "${LOGFILE}" "${ged_mater_log}")
set(get_mater_log)
if(ged_mater_result)
- message(FATAL_ERROR "[regress-ged_mater] Failure: ${ged_mater_result}. See
${LOGFILE} for more info.\n")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "[regress-ged_mater] Failure: ${ged_mater_result}. See
${LOGFILE} for more info.\n${LOG}")
endif(ged_mater_result)
execute_process(COMMAND "@CMAKE_COMMAND@" -E remove -f
"${CBDIR}/ged_mater_test.g")
@@ -52,7 +54,8 @@
file(APPEND "${LOGFILE}" "${ged_mater_log}")
set(get_mater_log)
if(ged_mater_result)
- message(FATAL_ERROR "[regress-ged_mater] Failure: ${ged_mater_result}. See
${LOGFILE} for more info.\n")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "[regress-ged_mater] Failure: ${ged_mater_result}. See
${LOGFILE} for more info.\n${LOG}")
endif(ged_mater_result)
# Clean up
Modified: brlcad/trunk/regress/gqa/gqa.sh
===================================================================
--- brlcad/trunk/regress/gqa/gqa.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/gqa/gqa.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -171,6 +171,7 @@
log "-> gqa.sh succeeded"
else
log "-> gqa.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $STATUS
Modified: brlcad/trunk/regress/icv/regress-icv_export.cmake.in
===================================================================
--- brlcad/trunk/regress/icv/regress-icv_export.cmake.in 2020-08-13
11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/icv/regress-icv_export.cmake.in 2020-08-13
12:03:20 UTC (rev 76726)
@@ -14,7 +14,8 @@
string(REPLACE "\\" "" ICV_EXEC "${EXEC}")
if (NOT EXISTS "${ICV_EXEC}")
file(WRITE "${LOGFILE}" "icv not found at location \"${ICV_EXEC}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find icv, aborting.\nSee ${LOGFILE} for more
details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find icv, aborting.\nSee ${LOGFILE} for more
details.\n${LOG}")
endif (NOT EXISTS "${ICV_EXEC}")
# Apparently CMAKE_EXECUTABLE_SUFFIX is not reliably defined in cmake -P - get
@@ -28,7 +29,8 @@
set(PIXCMP_EXEC "${BDIR}/pixcmp${EXE_SUFFIX}")
if (NOT EXISTS "${PIXCMP_EXEC}")
file(WRITE "${LOGFILE}" "pixcmp not found at location \"${PIXCMP_EXEC}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.\n${LOG}")
endif (NOT EXISTS "${PIXCMP_EXEC}")
# Clean up in case we've run before unsuccessfully
@@ -52,7 +54,8 @@
set(icv_log)
if(NOT EXISTS "${TGTIMG}")
file(APPEND "${LOGFILE}" "Failure: ${icv_result}")
- message(FATAL_ERROR "Unable to convert ${SRCIMG} to ${TGTIMG} with
${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to convert ${SRCIMG} to ${TGTIMG} with
${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.\n${LOG}")
endif(NOT EXISTS "${TGTIMG}")
@@ -67,7 +70,8 @@
set(icv_log)
if(NOT EXISTS "${CBDIR}/${TGT}-ctrl.pix")
file(APPEND "${LOGFILE}" "Failure: ${icv_result}")
- message(FATAL_ERROR "Unable to convert ${SRCIMG} to ${CBDIR}/${TGT}-ctrl.pix
with ${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to convert ${SRCIMG} to ${CBDIR}/${TGT}-ctrl.pix
with ${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.\n${LOG}")
endif(NOT EXISTS "${CBDIR}/${TGT}-ctrl.pix")
file(APPEND "${LOGFILE}" "Converting ${TGTIMG} to ${CBDIR}/${TGT}-out.pix\n")
@@ -79,7 +83,8 @@
set(icv_log)
if(NOT EXISTS "${CBDIR}/${TGT}-out.pix")
file(APPEND "${LOGFILE}" "Failure: ${icv_result}")
- message(FATAL_ERROR "Unable to convert ${TGTIMG} to ${CBDIR}/${TGT}-out.pix
with ${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to convert ${TGTIMG} to ${CBDIR}/${TGT}-out.pix
with ${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.\n${LOG}")
endif(NOT EXISTS "${CBDIR}/${TGT}-out.pix")
@@ -94,7 +99,8 @@
# Final success/failure check
if(${pixcmp_val} GREATER 0)
file(APPEND "${LOGFILE}" "Failure: ${pixcmp_val}")
- message(FATAL_ERROR "Differences found between ${CBDIR}/${TGT}-ctrl.pix and
${CBDIR}/${TGT}-out.pix with ${PIXCMP}, aborting.\nSee ${LOGFILE} for more
details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Differences found between ${CBDIR}/${TGT}-ctrl.pix and
${CBDIR}/${TGT}-out.pix with ${PIXCMP}, aborting.\nSee ${LOGFILE} for more
details.\n${LOG}")
else(${pixcmp_val} GREATER 0)
foreach(of ${OUTPUT_FILES})
execute_process(COMMAND "@CMAKE_COMMAND@" -E remove -f "${of}")
Modified: brlcad/trunk/regress/icv/regress-icv_import.cmake.in
===================================================================
--- brlcad/trunk/regress/icv/regress-icv_import.cmake.in 2020-08-13
11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/icv/regress-icv_import.cmake.in 2020-08-13
12:03:20 UTC (rev 76726)
@@ -13,7 +13,8 @@
string(REPLACE "\\" "" ICV_EXEC "${EXEC}")
if (NOT EXISTS "${ICV_EXEC}")
file(WRITE "${LOGFILE}" "icv not found at location \"${ICV_EXEC}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find icv, aborting.\nSee ${LOGFILE} for more
details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find icv, aborting.\nSee ${LOGFILE} for more
details.\n${LOG}")
endif (NOT EXISTS "${ICV_EXEC}")
# Apparently CMAKE_EXECUTABLE_SUFFIX is not reliably defined in cmake -P - get
@@ -27,7 +28,8 @@
set(PIXCMP_EXEC "${BDIR}/pixcmp${EXE_SUFFIX}")
if (NOT EXISTS "${PIXCMP_EXEC}")
file(WRITE "${LOGFILE}" "pixcmp not found at location \"${PIXCMP_EXEC}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.\n${LOG}")
endif (NOT EXISTS "${PIXCMP_EXEC}")
# Clean up in case we've run before unsuccessfully
@@ -43,7 +45,8 @@
set(icv_log)
if(NOT EXISTS "${TGTIMG}")
file(APPEND "${LOGFILE}" "Failure: ${icv_result}")
- message(FATAL_ERROR "Unable to convert ${SRCIMG} to ${TGTIMG} with
${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to convert ${SRCIMG} to ${TGTIMG} with
${ICV_EXEC}, aborting.\nSee ${LOGFILE} for more details.\n${LOG}")
endif(NOT EXISTS "${TGTIMG}")
# pixcmp the results with the control image to make sure icv got it right
@@ -57,7 +60,8 @@
# Final success/failure check
if(${pixcmp_val} GREATER 0)
file(APPEND "${LOGFILE}" "Failure: ${pixcmp_val}")
- message(FATAL_ERROR "Differences found between ${TGTIMG} and ${CTRLIMG} with
${PIXCMP_EXEC}, aborting.\nSee ${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Differences found between ${TGTIMG} and ${CTRLIMG} with
${PIXCMP_EXEC}, aborting.\nSee ${LOGFILE} for more details.\n${LOG}")
else(${pixcmp_val} GREATER 0)
execute_process(COMMAND "@CMAKE_COMMAND@" -E remove -f ${TGTIMG})
endif(${pixcmp_val} GREATER 0)
Modified: brlcad/trunk/regress/iges/iges.sh
===================================================================
--- brlcad/trunk/regress/iges/iges.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/iges/iges.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -87,6 +87,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: mged failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -99,6 +100,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -110,6 +112,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -129,6 +132,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: iges-g failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -139,6 +143,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: iges-g failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -149,6 +154,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: iges-g failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -183,6 +189,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -193,6 +200,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -203,6 +211,7 @@
if [ ! -f "$output" ] ; then
log "ERROR: g-iges failed to create $output"
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -268,6 +277,7 @@
log "-> iges.sh succeeded"
else
log "-> iges.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $STATUS
Modified: brlcad/trunk/regress/library.sh
===================================================================
--- brlcad/trunk/regress/library.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/library.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -207,7 +207,11 @@
# script's location
ensearch ( ) {
ensearch_file="$1"
- ensearch_dirs="$ARG1/bin ../bin ../../bin ./bin \"$PATH_TO_THIS/../bin\"
../bench \"$PATH_TO_THIS/../bench\" "
+ ensearch_dirs="\
+ $ARG1/bin ../bin ../../bin ./bin \"$PATH_TO_THIS/../bin\" ../bench
\"$PATH_TO_THIS/../bench\" \
+ $ARG1/Release/bin ../Release/bin ../../Release/bin ./Release/bin
\"$PATH_TO_THIS/../Release/bin\" \
+ $ARG1/Debug/bin ../Debug/bin ../../Debug/bin ./Debug/bin
\"$PATH_TO_THIS/../Debug/bin\" \
+ "
if test "x$ensearch_file" = "x" ; then
# nothing to do
Modified: brlcad/trunk/regress/licenses/regress-licenses.cmake.in
===================================================================
--- brlcad/trunk/regress/licenses/regress-licenses.cmake.in 2020-08-13
11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/licenses/regress-licenses.cmake.in 2020-08-13
12:03:20 UTC (rev 76726)
@@ -12,7 +12,8 @@
if(license_result)
file(APPEND ${LOGFILE} "${license_log}\n")
- message(FATAL_ERROR "[license check] Failure: ${license_result} - see
details in log file: ${LOGFILE}\n")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "[license check] Failure: ${license_result} - see
details in log file: ${LOGFILE}\n${LOG}")
endif(license_result)
# Local Variables:
Modified: brlcad/trunk/regress/lights/lights.sh
===================================================================
--- brlcad/trunk/regress/lights/lights.sh 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/regress/lights/lights.sh 2020-08-13 12:03:20 UTC (rev
76726)
@@ -100,9 +100,9 @@
log "... running $PIXDIFF lights.pix $PATH_TO_THIS/lights.ref.pix >
lights.diff.pix"
rm -f lights.diff.pix
-$PIXDIFF lights.pix $PATH_TO_THIS/lights.ref.pix > lights.diff.pix 2>> $LOGFILE
+$PIXDIFF lights.pix "$PATH_TO_THIS/lights.ref.pix" > lights.diff.pix 2>>
$LOGFILE
-NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'`
+NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'`
log "lights.pix $NUMBER_WRONG off by many"
if [ X$NUMBER_WRONG = X0 ] ; then
@@ -109,6 +109,7 @@
log "-> lights.sh succeeded"
else
log "-> lights.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $NUMBER_WRONG
Modified: brlcad/trunk/regress/mged/mged.sh
===================================================================
--- brlcad/trunk/regress/mged/mged.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/mged/mged.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -185,6 +185,7 @@
log "-> mged check succeeded"
else
log "-> mged check FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $FAILED
Modified: brlcad/trunk/regress/mged/regress-mged.cmake.in
===================================================================
--- brlcad/trunk/regress/mged/regress-mged.cmake.in 2020-08-13 11:41:10 UTC
(rev 76725)
+++ brlcad/trunk/regress/mged/regress-mged.cmake.in 2020-08-13 12:03:20 UTC
(rev 76726)
@@ -12,7 +12,8 @@
string(REPLACE "\\" "" MGED_EXEC "${EXEC}")
if (NOT EXISTS "${MGED_EXEC}")
file(WRITE "${LOGFILE}" "mged not found at location \"${MGED_EXEC}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find mged, aborting.\nSee ${LOGFILE} for more
details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find mged, aborting.\nSee ${LOGFILE} for more
details.\n${LOG}")
endif (NOT EXISTS "${MGED_EXEC}")
# Create the .g file
@@ -25,7 +26,8 @@
file(APPEND "${LOGFILE}" "${mged_log}")
set(mged_log)
if(mged_result)
- message(FATAL_ERROR "[mged ${TNAME}] Failure: ${mged_result}. See ${LOGFILE}
for more info.\n")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "[mged ${TNAME}] Failure: ${mged_result}. See ${LOGFILE}
for more info.\n${LOG}")
endif(mged_result)
# Run the core test
@@ -36,7 +38,8 @@
file(APPEND "${LOGFILE}" "${mged_log}")
set(mged_log)
if(mged_result)
- message(FATAL_ERROR "[mged ${TNAME}] Failure: ${mged_result}. See ${LOGFILE}
for more info.\n")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "[mged ${TNAME}] Failure: ${mged_result}. See ${LOGFILE}
for more info.\n${LOG}")
endif(mged_result)
# Clean up
Modified: brlcad/trunk/regress/moss/moss.sh
===================================================================
--- brlcad/trunk/regress/moss/moss.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/moss/moss.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -134,8 +134,8 @@
else
log "... running $PIXDIFF moss.pix $PATH_TO_THIS/moss.ref.pix >
moss.pix.diff"
rm -f moss.pix.diff
- $PIXDIFF moss.pix $PATH_TO_THIS/moss.ref.pix > moss.pix.diff 2>>
$LOGFILE
- different="`tail -n1 $LOGFILE | tr , '\012' | grep many`"
+ $PIXDIFF moss.pix "$PATH_TO_THIS/moss.ref.pix" > moss.pix.diff 2>>
$LOGFILE
+ different="`tail -n1 "$LOGFILE" | tr , '\012' | grep many`"
log "moss.pix vs $PATH_TO_THIS/moss.ref.pix differences:"
log "$different"
fi
@@ -152,7 +152,7 @@
rm -f moss.roundtrip.diff
$PIXDIFF moss.pix moss.pix.png.pix > moss.roundtrip.diff 2>> $LOGFILE
- NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'`
+ NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'`
log "moss.pix $NUMBER_WRONG off by many"
fi
@@ -161,6 +161,7 @@
log "-> moss.sh succeeded"
else
log "-> moss.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $NUMBER_WRONG
Modified: brlcad/trunk/regress/nirt/nirt.sh
===================================================================
--- brlcad/trunk/regress/nirt/nirt.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/nirt/nirt.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -569,6 +569,7 @@
log "-> nirt.sh succeeded"
else
log "-> nirt.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $STATUS
Modified: brlcad/trunk/regress/nurbs/regress-nurbs-test.cmake.in
===================================================================
--- brlcad/trunk/regress/nurbs/regress-nurbs-test.cmake.in 2020-08-13
11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/nurbs/regress-nurbs-test.cmake.in 2020-08-13
12:03:20 UTC (rev 76726)
@@ -12,7 +12,8 @@
string(REPLACE "\\" "" NHIT "${EXEC}")
if (NOT EXISTS "${NHIT}")
file(WRITE "${LOGFILE}" "analyze_nhit not found at location \"${NHIT}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find analyze_nhit, aborting.\nSee ${LOGFILE}
for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find analyze_nhit, aborting.\nSee ${LOGFILE}
for more details.\n${LOG}")
endif (NOT EXISTS "${NHIT}")
# Canonicalize path - if we have an absolute path use it, but if the .g file is
@@ -34,7 +35,8 @@
)
if(nurbs_result)
- message(FATAL_ERROR "[nurbs] Failure, unexpected result running ${NHIT}
@NHIT_OPTS@ @NHIT_GFILE@ @NHIT_ARGS@\n ${nurbs_log}\n")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "[nurbs] Failure, unexpected result running ${NHIT}
@NHIT_OPTS@ @NHIT_GFILE@ @NHIT_ARGS@\n ${nurbs_log}\n${LOG}")
endif(nurbs_result)
# Local Variables:
Modified: brlcad/trunk/regress/pkg/regress-pkg.cmake.in
===================================================================
--- brlcad/trunk/regress/pkg/regress-pkg.cmake.in 2020-08-13 11:41:10 UTC
(rev 76725)
+++ brlcad/trunk/regress/pkg/regress-pkg.cmake.in 2020-08-13 12:03:20 UTC
(rev 76726)
@@ -11,7 +11,8 @@
string(REPLACE "\\" "" RPKG "${EXEC}")
if (NOT EXISTS "${RPKG}")
file(WRITE "${LOGFILE}" "regress_pkg not found at location \"${RPKG}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find regress_pkg, aborting.\nSee ${LOGFILE}
for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find regress_pkg, aborting.\nSee ${LOGFILE}
for more details.\n${LOG}")
endif (NOT EXISTS "${RPKG}")
execute_process(
Modified: brlcad/trunk/regress/red/red.sh
===================================================================
--- brlcad/trunk/regress/red/red.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/red/red.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -492,6 +492,7 @@
log "-> mged 'red' check succeeded"
else
log "-> mged 'red' check FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $STATUS
Modified: brlcad/trunk/regress/repository/regress-repository.cmake.in
===================================================================
--- brlcad/trunk/regress/repository/regress-repository.cmake.in 2020-08-13
11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/repository/regress-repository.cmake.in 2020-08-13
12:03:20 UTC (rev 76726)
@@ -10,7 +10,8 @@
)
if(repository_result)
file(APPEND ${LOGFILE} "${repository_log}\n")
- message(FATAL_ERROR "[repository check] Failure: ${repository_result} - see
details in log file: ${LOGFILE}\n")
+ file(READ ${LOGFILE} LOGMSG)
+ message(FATAL_ERROR "[repository check] Failure: ${repository_result} - see
details in log file: ${LOGFILE}\n${LOGMSG}")
endif(repository_result)
# Local Variables:
Modified: brlcad/trunk/regress/rtedge/rtedge.sh
===================================================================
--- brlcad/trunk/regress/rtedge/rtedge.sh 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/regress/rtedge/rtedge.sh 2020-08-13 12:03:20 UTC (rev
76726)
@@ -238,6 +238,7 @@
log "-> rtcheck check succeeded"
else
log "-> rtcheck check FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit $FAILURES
Modified: brlcad/trunk/regress/rtwizard/regress-rtwiz.cmake.in
===================================================================
--- brlcad/trunk/regress/rtwizard/regress-rtwiz.cmake.in 2020-08-13
11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/rtwizard/regress-rtwiz.cmake.in 2020-08-13
12:03:20 UTC (rev 76726)
@@ -14,7 +14,8 @@
string(REPLACE "\\" "" RTWIZ "${EXEC}")
if (NOT EXISTS "${RTWIZ}")
file(WRITE "${LOGFILE}" "rtwizard not found at location \"${RTWIZ}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find rtwizard, aborting.\nSee ${LOGFILE} for
more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find rtwizard, aborting.\nSee ${LOGFILE} for
more details.\n${LOG}")
endif (NOT EXISTS "${RTWIZ}")
# Apparently CMAKE_EXECUTABLE_SUFFIX is not reliably defined in cmake -P - get
@@ -28,7 +29,8 @@
set(PIXCMP_EXEC "${BDIR}/pixcmp${EXE_SUFFIX}")
if (NOT EXISTS "${PIXCMP_EXEC}")
file(WRITE "${LOGFILE}" "pixcmp not found at location \"${PIXCMP_EXEC}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.\n${LOG}")
endif (NOT EXISTS "${PIXCMP_EXEC}")
# Reconstruct the tree root from the EXEC path, and identify the input file
location
@@ -48,7 +50,8 @@
set(rtwiz_log)
if(NOT EXISTS "${TGTIMG}")
file(APPEND "${LOGFILE}" "Failure: ${rtwiz_result}")
- message(FATAL_ERROR "Unable to generate ${TGTIMG} with ${RTWIZ},
aborting.\nSee ${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to generate ${TGTIMG} with ${RTWIZ},
aborting.\nSee ${LOGFILE} for more details.\n${LOG}")
endif(NOT EXISTS "${TGTIMG}")
# pixcmp the results with the control image to make sure rtwiz got it right
@@ -61,7 +64,8 @@
if(pixcmp_result)
file(APPEND "${LOGFILE}" "Failure: ${pixcmp_result}")
- message(FATAL_ERROR "Differences found between ${TGTIMG} and ${CTRLIMG} with
${PIXCMP_EXEC}, aborting.\nSee ${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Differences found between ${TGTIMG} and ${CTRLIMG} with
${PIXCMP_EXEC}, aborting.\nSee ${LOGFILE} for more details.\n${LOG}")
endif(pixcmp_result)
execute_process(COMMAND "@CMAKE_COMMAND@" -E remove -f ${TGTIMG})
Modified: brlcad/trunk/regress/shaders/shaders.sh
===================================================================
--- brlcad/trunk/regress/shaders/shaders.sh 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/regress/shaders/shaders.sh 2020-08-13 12:03:20 UTC (rev
76726)
@@ -78,7 +78,8 @@
$GENCOLOR -r205 0 16 32 64 128 | dd of=shaders.ebm.bw bs=1024 count=1 2>>
$LOGFILE
-EAGLECAD=$PATH_TO_THIS/shaders.eagleCAD-512x438.pix
+EAGLECAD=shaders.eagleCAD-working.pix
+cp "$PATH_TO_THIS/shaders.eagleCAD-512x438.pix" $EAGLECAD
log "... creating shader geometry file (shaders.g)"
rm -f shaders.mged shaders.g shaders.rt shaders.half.prj shaders.ell_2.prj
@@ -92,7 +93,7 @@
in half.s half 0 0 1 -1
r half.r u half.s
-prj_add shaders.half.prj $EAGLECAD 512 438
+prj_add shaders.half.prj "$EAGLECAD" 512 438
mater half.r "stack prj shaders.half.prj;plastic di=.8 sp=.3" 76 158 113 0
g all.g half.r
@@ -190,7 +191,7 @@
center -640 -1280 100
size 300
press top
-prj_add shaders.ell_2.prj $EAGLECAD 512 438
+prj_add shaders.ell_2.prj "$EAGLECAD" 512 438
mater ell_2.r "stack prj shaders.ell_2.prj;plastic di=.9" 200 200 200 0
#
@@ -220,6 +221,8 @@
if [ ! -f shaders.rt ] ; then
log "ERROR: mged failed to create shaders.rt"
log "-> shaders.sh FAILED, see $LOGFILE"
+ rm -f $EAGLECAD
+ cat $LOGFILE
exit 1
fi
@@ -249,6 +252,8 @@
if [ ! -f shaders.rt.pix ] ; then
log "ERROR: shaders raytrace failed to create shaders.rt.pix"
log "-> shaders.sh FAILED, see $LOGFILE"
+ rm -f $EAGLECAD
+ cat "$LOGFILE"
exit 1
fi
@@ -257,9 +262,9 @@
else
log "... running $PIXDIFF shaders.rt.pix $PATH_TO_THIS/shaders.ref.pix >
shaders.rt.diff.pix"
rm -f shaders.rt.diff.pix
- $PIXDIFF shaders.rt.pix $PATH_TO_THIS/shaders.ref.pix >
shaders.rt.diff.pix 2>> $LOGFILE
+ $PIXDIFF shaders.rt.pix "$PATH_TO_THIS/shaders.ref.pix" >
shaders.rt.diff.pix 2>> $LOGFILE
- NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}' |
tail -${TAIL_N}1`
+ NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'
| tail -${TAIL_N}1`
log "shaders.rt.pix $NUMBER_WRONG off by many"
fi
@@ -268,8 +273,10 @@
log "-> shaders.sh succeeded"
else
log "-> shaders.sh FAILED, see $LOGFILE"
+ cat "$LOGFILE"
fi
+rm -f $EAGLECAD
exit $NUMBER_WRONG
# Local Variables:
Modified: brlcad/trunk/regress/solids/solids.sh
===================================================================
--- brlcad/trunk/regress/solids/solids.sh 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/regress/solids/solids.sh 2020-08-13 12:03:20 UTC (rev
76726)
@@ -85,6 +85,7 @@
if [ ! -f solids.simple.rt ] ; then
log "ERROR: mged failed to create solids.simple.rt script"
log "-> solids.sh FAILED (test 1 of 2), see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
mv solids.simple.rt solids.simple.orig.rt
@@ -98,6 +99,7 @@
./solids.simple.rt >> $LOGFILE 2>&1
if [ ! -f solids.simple.rt.pix ] ; then
log "ERROR: raytrace failed, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
if [ ! -f "$PATH_TO_THIS/solids.simple.ref.pix" ] ; then
@@ -106,10 +108,10 @@
fi
rm -f solids.simple.pix.diff
-$PIXDIFF solids.simple.rt.pix $PATH_TO_THIS/solids.simple.ref.pix >
solids.simple.pix.diff 2>> $LOGFILE
+$PIXDIFF solids.simple.rt.pix "$PATH_TO_THIS/solids.simple.ref.pix" >
solids.simple.pix.diff 2>> $LOGFILE
log "... running tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'"
-NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'`
+NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'`
log "solids.simple.rt.pix $NUMBER_WRONG off by many"
if [ X$NUMBER_WRONG = X0 ] ; then
@@ -116,6 +118,7 @@
log "-> solids.sh succeeded (test 1 of 2)"
else
log "-> solids.sh FAILED (test 1 of 2), see $LOGFILE"
+ cat $LOGFILE
fi
@@ -129,6 +132,7 @@
if [ ! -f solids.ebm.bw ] ; then
log "ERROR: Failed to create file 'solids.ebm.bw'"
log "-> solids.sh FAILED, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -139,6 +143,7 @@
if [ ! -f solids.dsp.pix ] ; then
log "ERROR: Failed to generate file 'solids.dsp.pix'"
log "-> solids.sh FAILED (test 2 of 2), see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
@@ -150,6 +155,7 @@
if [ ! -f solids.rt ] ; then
log "ERROR: mged failed to create solids.rt script"
log "-> solids.sh FAILED (test 2 of 2), see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
run mv solids.rt solids.orig.rt
@@ -162,6 +168,7 @@
run ./solids.rt
if [ ! -f solids.rt.pix ] ; then
log "ERROR: solids raytrace failed, see $LOGFILE"
+ cat $LOGFILE
exit 1
fi
if [ ! -f "$PATH_TO_THIS/solids.ref.pix" ] ; then
@@ -171,10 +178,10 @@
log "... running $PIXDIFF solids.rt.pix $PATH_TO_THIS/solids.ref.pix >
solids.pix.diff"
rm -f solids.pix.diff
-$PIXDIFF solids.rt.pix $PATH_TO_THIS/solids.ref.pix > solids.pix.diff 2>
$LOGFILE
+$PIXDIFF solids.rt.pix "$PATH_TO_THIS/solids.ref.pix" > solids.pix.diff 2>
$LOGFILE
-tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $0}'
-NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'`
+tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $0}'
+NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'`
log "solids.rt.pix $NUMBER_WRONG off by many"
@@ -182,6 +189,7 @@
log "-> solids.sh succeeded (test 2 of 2)"
else
log "-> solids.sh FAILED (test 2 of 2), see $LOGFILE"
+ cat $LOGFILE
fi
exit $NUMBER_WRONG
Modified: brlcad/trunk/regress/spdi/spdi.sh
===================================================================
--- brlcad/trunk/regress/spdi/spdi.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/spdi/spdi.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -124,8 +124,8 @@
log "... running $PIXDIFF spdi.pix $PATH_TO_THIS/spdi.ref.pix > spdi.diff.pix"
rm -f spdi.diff.pix
-$PIXDIFF spdi.pix $PATH_TO_THIS/spdi.ref.pix > spdi.diff.pix 2>> $LOGFILE
-NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'`
+$PIXDIFF spdi.pix "$PATH_TO_THIS/spdi.ref.pix" > spdi.diff.pix 2>> $LOGFILE
+NUMBER_WRONG=`tail -n1 "$LOGFILE" | tr , '\012' | awk '/many/ {print $1}'`
log "spdi.pix $NUMBER_WRONG off by many"
@@ -133,6 +133,7 @@
log "-> spdi.sh succeeded"
else
log "-> spdi.sh FAILED, see $LOGFILE"
+ cat "$LOGFILE"
fi
exit $NUMBER_WRONG
Modified: brlcad/trunk/regress/usage.sh
===================================================================
--- brlcad/trunk/regress/usage.sh 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/regress/usage.sh 2020-08-13 12:03:20 UTC (rev 76726)
@@ -209,6 +209,7 @@
log "-> usage check succeeded"
else
log "-> usage check FAILED, see $LOGFILE"
+ cat $LOGFILE
fi
exit 0
Modified: brlcad/trunk/regress/user/regress-user.cmake.in
===================================================================
--- brlcad/trunk/regress/user/regress-user.cmake.in 2020-08-13 11:41:10 UTC
(rev 76725)
+++ brlcad/trunk/regress/user/regress-user.cmake.in 2020-08-13 12:03:20 UTC
(rev 76726)
@@ -11,7 +11,8 @@
string(REPLACE "\\" "" USER_EXEC "${EXEC}")
if (NOT EXISTS "${USER_EXEC}")
file(WRITE "${LOGFILE}" "cad_user not found at location \"${USER_EXEC}\" -
aborting\n")
- message(FATAL_ERROR "Unable to find cad_user, aborting.\nSee ${LOGFILE} for
more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "Unable to find cad_user, aborting.\nSee ${LOGFILE} for
more details.\n${LOG}")
endif (NOT EXISTS "${USER_EXEC}")
# Reconstruct the tree root from the EXEC path, and identify the input file
location
@@ -28,7 +29,8 @@
file(APPEND "${LOGFILE}" "${user_log}")
if(user_result)
file(APPEND "${LOGFILE}" "Failure: ${user_result}")
- message(FATAL_ERROR "3rd party user simulation run failed, aborting.\nSee
${LOGFILE} for more details.")
+ file(READ "${LOGFILE}" LOG)
+ message(FATAL_ERROR "3rd party user simulation run failed, aborting.\nSee
${LOGFILE} for more details.\n${LOG}")
endif(user_result)
# Local Variables:
Modified: brlcad/trunk/regress/weight/weight.sh
===================================================================
--- brlcad/trunk/regress/weight/weight.sh 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/regress/weight/weight.sh 2020-08-13 12:03:20 UTC (rev
76726)
@@ -260,6 +260,7 @@
log "-> weight.sh succeeded (2 of 2)"
else
log "-> weight.sh FAILED (2 of 2), see $LOGFILE"
+ cat $LOGFILE
fi
exit $STATUS
Modified: brlcad/trunk/src/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/CMakeLists.txt 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/src/CMakeLists.txt 2020-08-13 12:03:20 UTC (rev 76726)
@@ -50,12 +50,6 @@
# Level 3 directories contain BRL-CAD's executables. Setting
# the BRLCAD_ENABLE_TARGETS level to 3 will enable all programs.
-# FIXME: Ideally these should all be in the below list,
-# need to fix them on Windows.
-if(NOT WIN32)
- set(non_win32_dirs remrt)
-endif(NOT WIN32)
-
set(level_3_dirs
brlman
burst
@@ -73,7 +67,7 @@
util
qged
external
- ${non_win32_dirs}
+ remrt
# tclscripts must come before applications like
# mged and archer that need the scripts in place to
# run. The script target lists are defined when the tclscripts
Modified: brlcad/trunk/src/fb/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/fb/CMakeLists.txt 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/src/fb/CMakeLists.txt 2020-08-13 12:03:20 UTC (rev 76726)
@@ -32,6 +32,8 @@
if(TARGET libtermio)
BRLCAD_ADDEXEC(fbcolor fbcolor.c "libdm;libtermio")
ADD_TARGET_DEPS(fbcolor dm-ogl dm-wgl)
+else(TARGET libtermio)
+ CMAKEFILES(fbcolor.c)
endif(TARGET libtermio)
BRLCAD_ADDEXEC(fbfade "fbfade.c;ioutil.c" libdm)
ADD_TARGET_DEPS(fbfade dm-ogl dm-wgl)
@@ -52,6 +54,8 @@
if(TARGET libtermio)
BRLCAD_ADDEXEC(fbpoint fbpoint.c "libdm;libbu;libtermio;libpkg")
ADD_TARGET_DEPS(fbpoint dm-ogl dm-wgl)
+else(TARGET libtermio)
+ CMAKEFILES(fbpoint.c)
endif(TARGET libtermio)
BRLCAD_ADDEXEC(fbstretch "fbstretch.c;ioutil.c" libdm)
ADD_TARGET_DEPS(fbstretch dm-ogl dm-wgl)
@@ -58,6 +62,8 @@
if(TARGET libtermio)
BRLCAD_ADDEXEC(fbzoom fbzoom.c "libdm;libtermio")
ADD_TARGET_DEPS(fbzoom dm-ogl dm-wgl)
+else(TARGET libtermio)
+ CMAKEFILES(fbzoom.c)
endif(TARGET libtermio)
BRLCAD_ADDEXEC(gif-fb "gif-fb.c;ioutil.c" libdm)
ADD_TARGET_DEPS(gif-fb dm-ogl dm-wgl)
Index: brlcad/trunk/src/libbu
===================================================================
--- brlcad/trunk/src/libbu 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/src/libbu 2020-08-13 12:03:20 UTC (rev 76726)
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
+/brlcad/branches/RELEASE/src/libbu:70323-70333,71915-71935,72826-72858,74376-74454,75372-75681,76704-76725
/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/tests/datetime.c
===================================================================
--- brlcad/trunk/src/libbu/tests/datetime.c 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/src/libbu/tests/datetime.c 2020-08-13 12:03:20 UTC (rev
76726)
@@ -39,7 +39,9 @@
switch (function_num) {
case 0: {
- int64_t time0, time1, time2;
+ int64_t time0 = 0;
+ int64_t time1 = 0;
+ int64_t time2 = 0;
int64_t i = 0;
size_t counter = 1;
Modified: brlcad/trunk/src/libged/ged_init.cpp
===================================================================
--- brlcad/trunk/src/libged/ged_init.cpp 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/src/libged/ged_init.cpp 2020-08-13 12:03:20 UTC (rev
76726)
@@ -171,6 +171,10 @@
continue;
}
ged_cmd_map[key] = cmd;
+
+ // MGED calls many of these commands with an _mged_ prefix -
allow for that
+ std::string mged_key = std::string("_mged_") + key;
+ ged_cmd_map[mged_key] = cmd;
}
ged_handles.insert(dl_handle);
}
Modified: brlcad/trunk/src/librt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librt/CMakeLists.txt 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/src/librt/CMakeLists.txt 2020-08-13 12:03:20 UTC (rev
76726)
@@ -300,6 +300,7 @@
test_nurbsfit.cpp
test_root3-subd.cpp
timer-nt.c
+ timer42.c
timerunix.c
uvpoints.cpp
)
Modified: brlcad/trunk/src/libtclcad/tclcad_init.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad_init.c 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/src/libtclcad/tclcad_init.c 2020-08-13 12:03:20 UTC (rev
76726)
@@ -161,114 +161,90 @@
#endif
int
+#ifdef HAVE_TK
tclcad_init(Tcl_Interp *interp, int init_gui, struct bu_vls *tlog)
+#else
+tclcad_init(Tcl_Interp *interp, int UNUSED(init_gui), struct bu_vls *tlog)
+#endif
{
- int try_auto_path = 0;
- int init_tcl = 1;
- int init_itcl = 1;
-#ifdef HAVE_TK
- int init_tk = 1;
- int init_itk = 1;
-#endif
- int ret = TCL_OK;
+ if (library_initialized(0))
+ return TCL_OK;
- if (!interp) return TCL_ERROR;
+ if (Tcl_Init(interp) == TCL_ERROR) {
+ return TCL_ERROR;
+ }
-#ifndef HAVE_TK
+#ifdef HAVE_TK
if (init_gui) {
- if (tlog) bu_vls_printf(tlog, "tclcad_init ERROR: graphical
initialization requested, no graphics support available.\n");
- return TCL_ERROR;
+ if (Tk_Init(interp) == TCL_ERROR) {
+ return TCL_ERROR;
+ }
}
#endif
- /* a two-pass init loop. the first pass just tries default init
- * routines while the second calls tclcad_auto_path() to help it
- * find other, potentially uninstalled, resources.
- */
- while (1) {
+ /* Locate the BRL-CAD-specific Tcl scripts, set the auto_path */
+ tclcad_auto_path(interp);
- /* not called first time through, give Tcl_Init() a chance */
- if (try_auto_path) {
- /* Locate the BRL-CAD-specific Tcl scripts, set the auto_path */
- tclcad_auto_path(interp);
- }
+ /* Initialize [incr Tcl] */
+ if (Tcl_Eval(interp, "package require Itcl") != TCL_OK) {
+ if (tlog) bu_vls_printf(tlog, "Itcl init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
+ return TCL_ERROR;
+ }
- /* Initialize Tcl */
- Tcl_ResetResult(interp);
- if (init_tcl && Tcl_Init(interp) == TCL_ERROR) {
- if (!try_auto_path) {
- try_auto_path = 1;
- continue;
- }
- if (tlog) bu_vls_printf(tlog, "Tcl_Init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
- ret = TCL_ERROR;
- break;
+#ifdef HAVE_TK
+ /* Initialize [incr Tk] */
+ if (init_gui) {
+ if (Tcl_Eval(interp, "package require Itk") != TCL_OK) {
+ if (tlog) bu_vls_printf(tlog, "Itk init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
+ return TCL_ERROR;
}
- init_tcl = 0;
-#ifdef HAVE_TK
- if (init_gui) {
- /* Initialize Tk */
- Tcl_ResetResult(interp);
- if (init_tk && Tk_Init(interp) == TCL_ERROR) {
- if (!try_auto_path) {
- try_auto_path=1;
- continue;
- }
- if (tlog) bu_vls_printf(tlog, "Tk_Init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
- ret = TCL_ERROR;
- break;
- }
- Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
- init_tk=0;
+ /* Initialize the Iwidgets package */
+ if (Tcl_Eval(interp, "package require Iwidgets") != TCL_OK) {
+ if (tlog) bu_vls_printf(tlog, "Iwidgets init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
+ return TCL_ERROR;
}
+ }
#endif
- /* Initialize [incr Tcl] */
- Tcl_ResetResult(interp);
+ /* Initialize libbu */
+ if (Bu_Init(interp) == TCL_ERROR) {
+ if (tlog) bu_vls_printf(tlog, "Bu_Init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
+ return TCL_ERROR;
+ }
- /* Locate the BRL-CAD-specific Tcl scripts, set the auto_path */
- tclcad_auto_path(interp);
+ /* Initialize libbn */
+ if (Bn_Init(interp) == TCL_ERROR) {
+ if (tlog) bu_vls_printf(tlog, "Bn_Init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
+ return TCL_ERROR;
+ }
- /* NOTE: Calling "package require Itcl" may be a problem - there have
- * been reports of the Combination Editor in mged failing with an
- * iwidgets class already loaded error if we don't perform Itcl_Init()
- * here (TODO: still true, and if so why??).
- */
- if (init_itcl) {
- ret = Tcl_Eval(interp, "package require Itcl");
- if (ret == TCL_ERROR) {
- if (tlog) bu_vls_printf(tlog, "Itcl_Init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
- break;
- }
- }
- init_itcl = 0;
+ /* Initialize librt */
+ if (Rt_Init(interp) == TCL_ERROR) {
+ if (tlog) bu_vls_printf(tlog, "Rt_Init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
+ return TCL_ERROR;
+ }
-#ifdef HAVE_TK
- if (init_gui && init_itk) {
- /* Initialize [incr Tk] */
- ret = Tcl_Eval(interp, "package require Itk");
- if (ret == TCL_ERROR) {
- if (tlog) bu_vls_printf(tlog, "Itk_Init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
- break;
- }
- init_itk=0;
- }
-#endif
+ /* Initialize libdm */
+ if (Dm_Init(interp) == TCL_ERROR) {
+ if (tlog) bu_vls_printf(tlog, "Dm_Init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
+ return TCL_ERROR;
+ }
- /* don't actually want to loop forever */
- break;
+ /* Initialize the GED object */
+ if (Ged_Init(interp) == TCL_ERROR) {
+ if (tlog) bu_vls_printf(tlog, "Ged_Init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
+ return TCL_ERROR;
+ }
- } /* end iteration over Init() routines that need auto_path */
- Tcl_ResetResult(interp);
+ /* initialize command history objects */
+ Cho_Init(interp);
- /* if we haven't loaded by now, load auto_path so we find our tclscripts */
- if (!try_auto_path) {
- /* Locate the BRL-CAD-specific Tcl scripts */
- tclcad_auto_path(interp);
- }
+ Tcl_PkgProvide(interp, "Tclcad", brlcad_version());
- /* Import Itcl/Itk and iwidgets
+ (void)library_initialized(1);
+
+ /* Import Itcl/Itk and iwidgets into global namespace
*
* TODO - this is probably a bad idea - figure out why we're doing it and
* whether we really need to... */
@@ -276,8 +252,7 @@
if (Tcl_Import(interp, Tcl_GetGlobalNamespace(interp),
"::itcl::*", /* allowOverwrite */ 1) != TCL_OK) {
if (tlog) bu_vls_printf(tlog, "Tcl_Import ERROR:\n%s\n",
Tcl_GetStringResult(interp));
- ret = TCL_ERROR;
- Tcl_ResetResult(interp);
+ return TCL_ERROR;
}
#ifdef HAVE_TK
if (init_gui) {
@@ -284,20 +259,12 @@
if (Tcl_Import(interp, Tcl_GetGlobalNamespace(interp),
"::itk::*", /* allowOverwrite */ 1) != TCL_OK) {
if (tlog) bu_vls_printf(tlog, "Tcl_Import ERROR:\n%s\n",
Tcl_GetStringResult(interp));
- ret = TCL_ERROR;
- Tcl_ResetResult(interp);
+ return TCL_ERROR;
}
- if (Tcl_Eval(interp, "package require Iwidgets") != TCL_OK) {
- if (tlog) bu_vls_printf(tlog, "Tcl_Eval ERROR:\n%s\n",
Tcl_GetStringResult(interp));
- ret = TCL_ERROR;
- Tcl_ResetResult(interp);
- } else {
- if (Tcl_Import(interp, Tcl_GetGlobalNamespace(interp),
- "::iwidgets::*", /* allowOverwrite */ 1) != TCL_OK) {
- if (tlog) bu_vls_printf(tlog, "Tcl_Import ERROR:\n%s\n",
Tcl_GetStringResult(interp));
- ret = TCL_ERROR;
- Tcl_ResetResult(interp);
- }
+ if (Tcl_Import(interp, Tcl_GetGlobalNamespace(interp),
+ "::iwidgets::*", /* allowOverwrite */ 1) != TCL_OK) {
+ if (tlog) bu_vls_printf(tlog, "Tcl_Import ERROR:\n%s\n",
Tcl_GetStringResult(interp));
+ return TCL_ERROR;
}
}
#endif
@@ -320,58 +287,19 @@
}
#endif
- /* BRL-CAD specific components */
-
- /* Initialize libbu */
- if (Bu_Init(interp) == TCL_ERROR) {
- if (tlog) bu_vls_printf(tlog, "Bu_Init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
- ret = TCL_ERROR;
- Tcl_ResetResult(interp);
- }
-
- /* Initialize libbn */
- if (Bn_Init(interp) == TCL_ERROR) {
- if (tlog) bu_vls_printf(tlog, "Bn_Init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
- ret = TCL_ERROR;
- Tcl_ResetResult(interp);
- }
-
- /* Initialize librt */
- if (Rt_Init(interp) == TCL_ERROR) {
- if (tlog) bu_vls_printf(tlog, "Rt_Init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
- ret = TCL_ERROR;
- Tcl_ResetResult(interp);
- }
- Tcl_StaticPackage(interp, "Rt", Rt_Init, (Tcl_PackageInitProc *) NULL);
-
- /* Initialize libstruct dm */
- if (Dm_Init(interp) == TCL_ERROR) {
- if (tlog) bu_vls_printf(tlog, "Dm_Init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
- ret = TCL_ERROR;
- Tcl_ResetResult(interp);
- }
- Tcl_StaticPackage(interp, "Dm", (int (*)(struct Tcl_Interp *))Dm_Init,
(Tcl_PackageInitProc *) NULL);
- Tcl_StaticPackage(interp, "Fb", (int (*)(struct Tcl_Interp *))Dm_Init,
(Tcl_PackageInitProc *) NULL);
-
- /* Initialize libged */
- if (Ged_Init(interp) == TCL_ERROR) {
- if (tlog) bu_vls_printf(tlog, "Ged_Init ERROR:\n%s\n",
Tcl_GetStringResult(interp));
- ret = TCL_ERROR;
- Tcl_ResetResult(interp);
- }
-
- /* Initialize history */
- Cho_Init(interp);
-
#ifdef HAVE_TK
/* If we're doing Tk, make sure we have a window */
if (init_gui) {
Tk_Window tkwin = Tk_MainWindow(interp);
- if (!tkwin) ret = TCL_ERROR;
+ if (!tkwin) return TCL_ERROR;
}
#endif
- return ret;
+ Tcl_PkgProvide(interp, "Tclcad", brlcad_version());
+
+ (void)library_initialized(1);
+
+ return TCL_OK;
}
void
Modified: brlcad/trunk/src/libtermio/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libtermio/CMakeLists.txt 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/src/libtermio/CMakeLists.txt 2020-08-13 12:03:20 UTC (rev
76726)
@@ -1,3 +1,10 @@
+set(TERMIO_SRCS
+ termio.c
+ termcap.c
+ tgoto.c
+ tputs.c
+ )
+
if (NOT WIN32)
# Include directories needed by libtermio users
set(TERMIO_INCLUDE_DIRS
@@ -10,13 +17,6 @@
-DB_TERMCAP=\"${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/termio/termcap\"
)
- set(TERMIO_SRCS
- termio.c
- termcap.c
- tgoto.c
- tputs.c
- )
-
BRLCAD_ADDDATA(termcap termio)
BRLCAD_ADDLIB(libtermio "${TERMIO_SRCS}" "libbu")
@@ -24,8 +24,10 @@
endif(NOT WIN32)
CMAKEFILES(
+ ${TERMIO_SRCS}
CMakeLists.txt
termcap.h
+ termcap
)
# Local Variables:
Modified: brlcad/trunk/src/remrt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/remrt/CMakeLists.txt 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/src/remrt/CMakeLists.txt 2020-08-13 12:03:20 UTC (rev
76726)
@@ -1,25 +1,34 @@
-set(REMRTBIN_INCLUDE_DIRS
- ${REMRT_INCLUDE_DIRS}
- ${OPTICAL_INCLUDE_DIRS}
- ${FB_INCLUDE_DIRS}
- ${PKG_INCLUDE_DIRS}
- )
-LIST(REMOVE_DUPLICATES REMRTBIN_INCLUDE_DIRS)
-include_directories(${REMRTBIN_INCLUDE_DIRS})
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${TCL_INCLUDE_PATH}
- )
+if (NOT WIN32)
+ set(REMRTBIN_INCLUDE_DIRS
+ ${REMRT_INCLUDE_DIRS}
+ ${OPTICAL_INCLUDE_DIRS}
+ ${FB_INCLUDE_DIRS}
+ ${PKG_INCLUDE_DIRS}
+ )
+ LIST(REMOVE_DUPLICATES REMRTBIN_INCLUDE_DIRS)
+ include_directories(${REMRTBIN_INCLUDE_DIRS})
-BRLCAD_ADDEXEC(remrt "../rt/opt.c;ihost.c;remrt.c" "liboptical;libdm")
-ADD_TARGET_DEPS(remrt dm-ogl dm-wgl)
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TCL_INCLUDE_PATH}
+ )
-BRLCAD_ADDEXEC(rtsrv
"../rt/usage.cpp;../rt/view.c;../rt/do.c;../rt/heatgraph.c;../rt/opt.c;../rt/scanline.c;../rt/worker.c;rtsrv.c"
"libdm;liboptical;libpkg;libicv")
-set_property(TARGET rtsrv APPEND PROPERTY COMPILE_DEFINITIONS "RTSRV")
-ADD_TARGET_DEPS(rtsrv dm-ogl dm-wgl)
+ BRLCAD_ADDEXEC(remrt "../rt/opt.c;ihost.c;remrt.c" "liboptical;libdm")
+ ADD_TARGET_DEPS(remrt dm-ogl dm-wgl)
-CMAKEFILES(ihost.h protocol.h)
+ BRLCAD_ADDEXEC(rtsrv
"../rt/usage.cpp;../rt/view.c;../rt/do.c;../rt/heatgraph.c;../rt/opt.c;../rt/scanline.c;../rt/worker.c;rtsrv.c"
"libdm;liboptical;libpkg;libicv")
+ set_property(TARGET rtsrv APPEND PROPERTY COMPILE_DEFINITIONS "RTSRV")
+ ADD_TARGET_DEPS(rtsrv dm-ogl dm-wgl)
+endif (NOT WIN32)
+
+CMAKEFILES(
+ ihost.c
+ ihost.h
+ protocol.h
+ remrt.c
+ rtsrv.c
+ )
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/trunk/src/rt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/rt/CMakeLists.txt 2020-08-13 11:41:10 UTC (rev 76725)
+++ brlcad/trunk/src/rt/CMakeLists.txt 2020-08-13 12:03:20 UTC (rev 76726)
@@ -63,7 +63,7 @@
ADD_TARGET_DEPS(rtscale dm-ogl dm-wgl)
BRLCAD_ADDEXEC(rt "${LIBRTUIF_SOURCES};view.c"
"${OPENCL_LIBS};${RT_STD_LIBS};libdm")
-ADD_TARGET_DEPS(rt dm-ogl dm-wgl)
+ADD_TARGET_DEPS(rt dm-ogl dm-wgl dm-txt)
BRLCAD_ADDEXEC(rtarea "${LIBRTUIF_SOURCES};viewarea.c" "${RT_STD_LIBS}")
set_property(TARGET rtarea APPEND PROPERTY COMPILE_DEFINITIONS "RT_TXT_OUTPUT")
Modified: brlcad/trunk/src/util/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/util/CMakeLists.txt 2020-08-13 11:41:10 UTC (rev
76725)
+++ brlcad/trunk/src/util/CMakeLists.txt 2020-08-13 12:03:20 UTC (rev
76726)
@@ -147,6 +147,8 @@
#maintained and ported
if(NOT WIN32)
BRLCAD_ADDEXEC(ttcp ttcp.c
"${SOCKET_LIBRARY};${NSL_LIBRARY};${NETWORK_LIBRARY}")
+else(NOT WIN32)
+ CMAKEFILES(ttcp.c)
endif(NOT WIN32)
BRLCAD_ADDEXEC(wavelet wavelet.c "libdm;libbn;libbu")
ADD_TARGET_DEPS(wavelet dm-ogl dm-wgl)
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
