Revision: 76051
http://sourceforge.net/p/brlcad/code/76051
Author: starseeker
Date: 2020-06-06 19:32:28 +0000 (Sat, 06 Jun 2020)
Log Message:
-----------
Merge changes from trunk - r76037 through r76050
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/CMakeLists.txt
brlcad/branches/dm-fb-merge/bench/CMakeLists.txt
brlcad/branches/dm-fb-merge/include/brlcad_ident.h.in
brlcad/branches/dm-fb-merge/include/brlcad_version.h.in
brlcad/branches/dm-fb-merge/include/bu/cmd.h
brlcad/branches/dm-fb-merge/include/bu/path.h
brlcad/branches/dm-fb-merge/include/bu/tc.h
brlcad/branches/dm-fb-merge/include/common.h
brlcad/branches/dm-fb-merge/misc/CMake/BRLCAD_Targets.cmake
brlcad/branches/dm-fb-merge/misc/debian/changelog
brlcad/branches/dm-fb-merge/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf
brlcad/branches/dm-fb-merge/misc/macosx/Resources/Welcome.rtfd/TXT.rtf
brlcad/branches/dm-fb-merge/regress/CMakeLists.txt
brlcad/branches/dm-fb-merge/regress/ged/CMakeLists.txt
brlcad/branches/dm-fb-merge/regress/pkg/CMakeLists.txt
brlcad/branches/dm-fb-merge/regress/repository/CMakeLists.txt
brlcad/branches/dm-fb-merge/regress/rtwizard/regress-rtwiz.cmake.in
brlcad/branches/dm-fb-merge/src/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/bwish/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/bwish/cmd.c
brlcad/branches/dm-fb-merge/src/conv/step/ap203e2-g/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/conv/step/ap214-g/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/conv/step/ap242-g/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/conv/step/g-ap203e2/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/conv/step/g-ap214/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/conv/step/g-ap242/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/conv/step/g-step/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/conv/step/ifc-g/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/conv/step/util/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/external/Creo/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/external/Cubit/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/external/Unigraphics/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libbu/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/libbu/tests/dylib/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/mged/dozoom.c
brlcad/branches/dm-fb-merge/src/remrt/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/dm-fb-merge/regress/user/
Removed Paths:
-------------
brlcad/branches/dm-fb-merge/src/libbu/cmdhist.c
Property Changed:
----------------
brlcad/branches/dm-fb-merge/
brlcad/branches/dm-fb-merge/bench/
brlcad/branches/dm-fb-merge/include/
brlcad/branches/dm-fb-merge/regress/
brlcad/branches/dm-fb-merge/src/libbu/
brlcad/branches/dm-fb-merge/src/other/
brlcad/branches/dm-fb-merge/src/other/libregex/
Index: brlcad/branches/dm-fb-merge
===================================================================
--- brlcad/branches/dm-fb-merge 2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge 2020-06-06 19:32:28 UTC (rev 76051)
Property changes on: brlcad/branches/dm-fb-merge
___________________________________________________________________
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,75682-75685
+/brlcad/branches/RELEASE:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75685
/brlcad/branches/bioh:75720-75736,75740-75742,75860-75891,75894-75986
/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
## -8,4 +8,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:75440-76037
\ No newline at end of property
+/brlcad/trunk:75440-76050
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/CMakeLists.txt 2020-06-06 19:21:40 UTC (rev
76050)
+++ brlcad/branches/dm-fb-merge/CMakeLists.txt 2020-06-06 19:32:28 UTC (rev
76051)
@@ -972,6 +972,12 @@
endif(NOT COMMAND CONFIG_H_APPEND)
CONFIG_H_APPEND(BRLCAD "/**** Define statements for CMake ****/\n")
+CONFIG_H_APPEND(BRLCAD "#if !defined(BRLCADBUILD)\n")
+CONFIG_H_APPEND(BRLCAD " # pragma message \"Warning: included
brlcad_config.h (compile-time API) without BRLCADBUILD defined\"\n")
+CONFIG_H_APPEND(BRLCAD "#endif\n")
+CONFIG_H_APPEND(BRLCAD "#if !defined(HAVE_CONFIG_H)\n")
+CONFIG_H_APPEND(BRLCAD " # pragma message \"Warning: included
brlcad_config.h (compile-time API) without HAVE_CONFIG_H defined\"\n")
+CONFIG_H_APPEND(BRLCAD "#endif\n")
CONFIG_H_APPEND(BRLCAD "#ifndef __CONFIG_H__\n")
CONFIG_H_APPEND(BRLCAD "#define __CONFIG_H__\n")
Index: brlcad/branches/dm-fb-merge/bench
===================================================================
--- brlcad/branches/dm-fb-merge/bench 2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/bench 2020-06-06 19:32:28 UTC (rev 76051)
Property changes on: brlcad/branches/dm-fb-merge/bench
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/osg/bench:62110-62113
/brlcad/branches/prep-cache/bench:68236-68933
/brlcad/branches/tcltk86/bench:68300-75257
-/brlcad/trunk/bench:75630-75814
\ No newline at end of property
+/brlcad/trunk/bench:75630-75814,76038-76050
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/bench/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/bench/CMakeLists.txt 2020-06-06 19:21:40 UTC
(rev 76050)
+++ brlcad/branches/dm-fb-merge/bench/CMakeLists.txt 2020-06-06 19:32:28 UTC
(rev 76051)
@@ -2,11 +2,7 @@
include_directories(${BU_INCLUDE_DIRS})
-add_definitions(
- -DHAVE_CONFIG_H
- -DBRLCADBUILD
- -DCONSOLE
- )
+add_definitions(-DCONSOLE)
BRLCAD_ADDEXEC(pixcmp pixcmp.c libbu)
set(BARK_SOURCES
Index: brlcad/branches/dm-fb-merge/include
===================================================================
--- brlcad/branches/dm-fb-merge/include 2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/include 2020-06-06 19:32:28 UTC (rev 76051)
Property changes on: brlcad/branches/dm-fb-merge/include
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/include:57439,57447-57860,69901-69913,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140
+/brlcad/branches/RELEASE/include:57439,57447-57860,69901-69913,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75681
/brlcad/branches/bioh/include:75720-75736,75740-75742,75860-75891,75894-75986
/brlcad/branches/brep-debug/include: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/include:62518
## -8,4 +8,4 ##
/brlcad/branches/osg/include:62110-62113
/brlcad/branches/prep-cache/include:68236-68933
/brlcad/branches/tcltk86/include:68300-75257
-/brlcad/trunk/include:75463-75467,75630-75814,75880-76037
\ No newline at end of property
+/brlcad/trunk/include:75463-75467,75630-75814,75880-76050
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/include/brlcad_ident.h.in
===================================================================
--- brlcad/branches/dm-fb-merge/include/brlcad_ident.h.in 2020-06-06
19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/include/brlcad_ident.h.in 2020-06-06
19:32:28 UTC (rev 76051)
@@ -34,6 +34,16 @@
#include "common.h"
+/* If the caller is not using this correctly per the above NOTE, issue a
+ * message about it but don't hault the build. Usage without defines set isn't
+ * correct, but will probably function anyway... */
+#if !defined(BRLCADBUILD)
+# pragma message "Warning: included brlcad_ident.h (compile-time API) without
BRLCADBUILD defined"
+#endif
+#if !defined(HAVE_CONFIG_H)
+# pragma message "Warning: included brlcad_ident.h (compile-time API) without
HAVE_CONFIG_H defined"
+#endif
+
/* for snprintf */
#include <stdio.h>
/* for strlen */
@@ -41,7 +51,6 @@
#include "brlcad_version.h"
-
/* Compilation Settings */
/**
Modified: brlcad/branches/dm-fb-merge/include/brlcad_version.h.in
===================================================================
--- brlcad/branches/dm-fb-merge/include/brlcad_version.h.in 2020-06-06
19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/include/brlcad_version.h.in 2020-06-06
19:32:28 UTC (rev 76051)
@@ -36,6 +36,15 @@
#include "common.h"
+/* If the caller is not using this correctly per the above NOTE, issue a
+ * message about it but don't hault the build. Usage without defines set isn't
+ * correct, but will probably function anyway... */
+#if !defined(BRLCADBUILD)
+# pragma message "Warning: included brlcad_version.h (compile-time API)
without BRLCADBUILD defined"
+#endif
+#if !defined(HAVE_CONFIG_H)
+# pragma message "Warning: included brlcad_version.h (compile-time API)
without HAVE_CONFIG_H defined"
+#endif
/**************************************************/
/* Compile-time version information (discouraged) */
Modified: brlcad/branches/dm-fb-merge/include/bu/cmd.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/bu/cmd.h 2020-06-06 19:21:40 UTC
(rev 76050)
+++ brlcad/branches/dm-fb-merge/include/bu/cmd.h 2020-06-06 19:32:28 UTC
(rev 76051)
@@ -30,9 +30,6 @@
#include "common.h"
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
#include <time.h>
#include "bsocket.h" /* for timeval */
@@ -52,28 +49,6 @@
int (*ct_func)(void *data, int argc, const char *argv[]);
};
-/* deprecated 2016-01-14 */
-struct bu_cmdhist {
- struct bu_vls h_command;
- struct timeval h_start;
- struct timeval h_finish;
- int h_status;
-};
-#define BU_CMDHIST_NULL (struct bu_cmdhist *)NULL
-
-struct bu_cmdhist_list {
- size_t size, capacity;
- size_t current;
- struct bu_cmdhist *cmdhist;
-};
-
-/* deprecated 2016-01-14 */
-struct bu_cmdhist_obj {
- struct bu_vls cho_name;
- struct bu_cmdhist_list cmdhist;
-};
-#define BU_CMDHIST_OBJ_NULL (struct bu_cmdhist_obj *)NULL
-
__BEGIN_DECLS
/** @brief Routine(s) for processing subcommands */
Modified: brlcad/branches/dm-fb-merge/include/bu/path.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/bu/path.h 2020-06-06 19:21:40 UTC
(rev 76050)
+++ brlcad/branches/dm-fb-merge/include/bu/path.h 2020-06-06 19:32:28 UTC
(rev 76051)
@@ -27,10 +27,6 @@
#include <stdlib.h> /* for getenv */
#include <limits.h> /* for NAME_MAX */
-#ifdef HAVE_DLFCN_H
-# include <dlfcn.h> /* for RTLD_* */
-#endif
-
#include "bu/defines.h"
#include "bu/magic.h"
#include "bu/vls.h"
Modified: brlcad/branches/dm-fb-merge/include/bu/tc.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/bu/tc.h 2020-06-06 19:21:40 UTC (rev
76050)
+++ brlcad/branches/dm-fb-merge/include/bu/tc.h 2020-06-06 19:32:28 UTC (rev
76051)
@@ -34,6 +34,14 @@
#define _BU_TCM_H
#include "common.h"
+
+#if !defined(BRLCADBUILD)
+# error "Warning: included bu/tc.h (compile-time API) without BRLCADBUILD
defined"
+#endif
+#if !defined(HAVE_CONFIG_H)
+# error "Warning: included bu/tc.h (compile-time API) without HAVE_CONFIG_H
defined"
+#endif
+
#include "bu/defines.h"
#include "bio.h" /* For windows.h */
Modified: brlcad/branches/dm-fb-merge/include/common.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/common.h 2020-06-06 19:21:40 UTC
(rev 76050)
+++ brlcad/branches/dm-fb-merge/include/common.h 2020-06-06 19:32:28 UTC
(rev 76051)
@@ -67,35 +67,35 @@
extern double drand48(void);
# endif
-#if !defined(__cplusplus) || defined(HAVE_SHARED_RINT_TEST)
+# if !defined(__cplusplus) || defined(HAVE_SHARED_RINT_TEST)
/* make sure lrint() is provided */
-# if !defined(lrint)
-# if !defined(HAVE_LRINT)
-# define lrint(_x) (((_x) < 0.0) ? (long int)ceil((_x)-0.5) : (long
int)floor((_x)+0.5))
-# elif !defined(HAVE_WINDOWS_H) && !defined(HAVE_DECL_LRINT)
+# if !defined(lrint)
+# if !defined(HAVE_LRINT)
+# define lrint(_x) (((_x) < 0.0) ? (long int)ceil((_x)-0.5) : (long
int)floor((_x)+0.5))
+# elif !defined(HAVE_WINDOWS_H) && !defined(HAVE_DECL_LRINT)
long int lrint(double x);
-# define HAVE_DECL_LRINT 1
-# endif
-# endif
+# define HAVE_DECL_LRINT 1
+# endif
+# endif
-# if !defined(HAVE_LRINT)
-# define HAVE_LRINT 1
-# endif
+# if !defined(HAVE_LRINT)
+# define HAVE_LRINT 1
+# endif
/* make sure rint() is provided */
-# if !defined(rint)
-# if !defined(HAVE_RINT)
-# define rint(_x) (((_x) < 0.0) ? ceil((_x)-0.5) : floor((_x)+0.5))
-# elif !defined(HAVE_WINDOWS_H) && !defined(HAVE_DECL_RINT)
+# if !defined(rint)
+# if !defined(HAVE_RINT)
+# define rint(_x) (((_x) < 0.0) ? ceil((_x)-0.5) : floor((_x)+0.5))
+# elif !defined(HAVE_WINDOWS_H) && !defined(HAVE_DECL_RINT)
double rint(double x);
-# define HAVE_DECL_RINT 1
-# endif
-# endif
+# define HAVE_DECL_RINT 1
+# endif
+# endif
-# if !defined(HAVE_RINT)
-# define HAVE_RINT 1
-# endif
-#endif
+# if !defined(HAVE_RINT)
+# define HAVE_RINT 1
+# endif
+# endif
/* strict c89 doesn't declare snprintf() */
# if defined(HAVE_SNPRINTF) && !defined(HAVE_DECL_SNPRINTF) &&
!defined(snprintf) && !defined(__cplusplus)
@@ -151,12 +151,14 @@
#endif
/* make sure the old bsd types are defined for portability */
-#if !defined(HAVE_U_TYPES)
+#if defined(BRLCADBUILD) && defined(HAVE_CONFIG_H)
+# if !defined(HAVE_U_TYPES)
typedef unsigned char u_char;
typedef unsigned int u_int;
typedef unsigned long u_long;
typedef unsigned short u_short;
-# define HAVE_U_TYPES 1
+# define HAVE_U_TYPES 1
+# endif
#endif
/* We want 64 bit (large file) I/O capabilities whenever they are available.
@@ -170,16 +172,18 @@
* regardless, we use it so make sure it's declared by using the
* similar POSIX ptrdiff_t type.
*/
-#ifndef HAVE_SSIZE_T
-# ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-# endif
-# include <limits.h>
-# include <stddef.h>
-# ifndef SSIZE_MAX
+#if defined(BRLCADBUILD) && defined(HAVE_CONFIG_H)
+# ifndef HAVE_SSIZE_T
+# ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+# endif
+# include <limits.h>
+# include <stddef.h>
+# ifndef SSIZE_MAX
typedef ptrdiff_t ssize_t;
-# define HAVE_SSIZE_T 1
-# endif
+# define HAVE_SSIZE_T 1
+# endif
+# endif
#endif
/* make sure most of the C99 stdint types are provided including the
Modified: brlcad/branches/dm-fb-merge/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/branches/dm-fb-merge/misc/CMake/BRLCAD_Targets.cmake 2020-06-06
19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/misc/CMake/BRLCAD_Targets.cmake 2020-06-06
19:32:28 UTC (rev 76051)
@@ -364,6 +364,9 @@
add_executable(${execname} ${srcslist})
endif(E_GUI)
+ # Set the standard build definitions for all BRL-CAD targets
+ target_compile_definitions(${execname} PRIVATE BRLCADBUILD HAVE_CONFIG_H)
+
# Let CMAKEFILES know what's going on
CMAKEFILES(${srcslist})
@@ -465,6 +468,9 @@
set(lsrcslist $<TARGET_OBJECTS:${libname}-obj>)
set_target_properties(${libname}-obj PROPERTIES FOLDER "BRL-CAD OBJECT
Libraries${SUBFOLDER}")
+ # Set the standard build definitions for all BRL-CAD targets
+ target_compile_definitions(${libname}-obj PRIVATE BRLCADBUILD
HAVE_CONFIG_H)
+
if(HIDE_INTERNAL_SYMBOLS)
string(REPLACE "lib" "" LOWERCORE "${libname}")
string(TOUPPER ${LOWERCORE} UPPER_CORE)
@@ -486,6 +492,9 @@
add_library(${libname} SHARED ${lsrcslist} ${L_SHARED_SRCS})
+ # Set the standard build definitions for all BRL-CAD targets
+ target_compile_definitions(${libname} PRIVATE BRLCADBUILD HAVE_CONFIG_H)
+
if(HIDE_INTERNAL_SYMBOLS)
string(REPLACE "lib" "" LOWERCORE "${libname}")
string(TOUPPER ${LOWERCORE} UPPER_CORE)
@@ -502,6 +511,10 @@
set(libstatic ${libname}-static)
endif(L_STATIC)
add_library(${libstatic} STATIC ${lsrcslist} ${L_STATIC_SRCS})
+
+ # Set the standard build definitions for all BRL-CAD targets
+ target_compile_definitions(${libstatic} PRIVATE BRLCADBUILD HAVE_CONFIG_H)
+
if(NOT MSVC)
set_target_properties(${libstatic} PROPERTIES OUTPUT_NAME "${libname}")
endif(NOT MSVC)
Modified: brlcad/branches/dm-fb-merge/misc/debian/changelog
===================================================================
--- brlcad/branches/dm-fb-merge/misc/debian/changelog 2020-06-06 19:21:40 UTC
(rev 76050)
+++ brlcad/branches/dm-fb-merge/misc/debian/changelog 2020-06-06 19:32:28 UTC
(rev 76051)
@@ -1,3 +1,10 @@
+brlcad (7.30.8-0) unstable; urgency=low
+
+ * update brlcad version
+
+ -- Cliff Yapp <[email protected]> Wed, 13 Apr 2020 05:34:29 UTC
+
+
brlcad (7.30.6-0) unstable; urgency=low
* update brlcad version
Modified: brlcad/branches/dm-fb-merge/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf
===================================================================
--- brlcad/branches/dm-fb-merge/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf
2020-06-06 19:32:28 UTC (rev 76051)
@@ -11,7 +11,7 @@
\f0\i\b\fs72 \cf0 README
\fs36 \
-\f1\i0\b0\fs28 This is BRL-CAD 7.30.6 for Mac OS X. Please send any bugs,
comments, questions, or suggestions to the project website.\
+\f1\i0\b0\fs28 This is BRL-CAD 7.30.8 for Mac OS X. Please send any bugs,
comments, questions, or suggestions to the project website.\
\fs22 \
Modified: brlcad/branches/dm-fb-merge/misc/macosx/Resources/Welcome.rtfd/TXT.rtf
===================================================================
--- brlcad/branches/dm-fb-merge/misc/macosx/Resources/Welcome.rtfd/TXT.rtf
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/misc/macosx/Resources/Welcome.rtfd/TXT.rtf
2020-06-06 19:32:28 UTC (rev 76051)
@@ -4,7 +4,7 @@
\margl1440\margr1440\vieww8020\viewh6280\viewkind0
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\f0\fs22 \cf0 This installer will guide you through the installation of
BRL-CAD 7.30.6 for Mac OS X and Darwin.\
+\f0\fs22 \cf0 This installer will guide you through the installation of
BRL-CAD 7.30.8 for Mac OS X and Darwin.\
\
This distribution of BRL-CAD requires approximately 500 MB of available disk
space and does not include source code.\
\
Index: brlcad/branches/dm-fb-merge/regress
===================================================================
--- brlcad/branches/dm-fb-merge/regress 2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/regress 2020-06-06 19:32:28 UTC (rev 76051)
Property changes on: brlcad/branches/dm-fb-merge/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
+/brlcad/branches/RELEASE/regress:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75372-75681
/brlcad/branches/bioh/regress:75860-75891,75894-75986
/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
## -8,4 +8,4 ##
/brlcad/branches/osg/regress:62110-62113
/brlcad/branches/prep-cache/regress:68236-68933
/brlcad/branches/tcltk86/regress:68300-75257
-/brlcad/trunk/regress:75512-75597,75630-76034
\ No newline at end of property
+/brlcad/trunk/regress:75512-75597,75630-76034,76038-76050
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/regress/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/regress/CMakeLists.txt 2020-06-06 19:21:40 UTC
(rev 76050)
+++ brlcad/branches/dm-fb-merge/regress/CMakeLists.txt 2020-06-06 19:32:28 UTC
(rev 76051)
@@ -55,6 +55,9 @@
# Repository check
add_subdirectory(repository)
+# Simulation of a 3rd party BRL-CAD library client code
+add_subdirectory(user)
+
if(SH_EXEC)
add_test(NAME regress-moss COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/moss.sh" ${CMAKE_SOURCE_DIR})
Modified: brlcad/branches/dm-fb-merge/regress/ged/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/regress/ged/CMakeLists.txt 2020-06-06
19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/regress/ged/CMakeLists.txt 2020-06-06
19:32:28 UTC (rev 76051)
@@ -3,13 +3,7 @@
include_directories(${GED_INCLUDE_DIRS})
-add_definitions(
- -DHAVE_CONFIG_H
- -DBRLCADBUILD
- )
-
BRLCAD_ADDEXEC(regress_mater mater.c libged TEST_USESDATA)
-target_compile_definitions(regress_mater PUBLIC BRLCADBUILD HAVE_CONFIG_H)
BRLCAD_REGRESSION_TEST(regress-ged_mater "regress_mater;density_DATAFILES_cp"
EXEC regress_mater)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/regress-ged_mater.log")
Modified: brlcad/branches/dm-fb-merge/regress/pkg/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/regress/pkg/CMakeLists.txt 2020-06-06
19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/regress/pkg/CMakeLists.txt 2020-06-06
19:32:28 UTC (rev 76051)
@@ -6,7 +6,6 @@
)
BRLCAD_ADDEXEC(regress_pkg regress_pkg.cpp
"libpkg;libbu;${CMAKE_THREAD_LIBS_INIT}" NO_INSTALL)
-target_compile_definitions(regress_pkg PUBLIC BRLCADBUILD HAVE_CONFIG_H)
set_target_properties(regress_pkg PROPERTIES FOLDER "BRL-CAD Regression
Tests/libpkg")
BRLCAD_REGRESSION_TEST(regress-pkg "regress_pkg" EXEC regress_pkg STAND_ALONE)
Modified: brlcad/branches/dm-fb-merge/regress/repository/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/regress/repository/CMakeLists.txt
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/regress/repository/CMakeLists.txt
2020-06-06 19:32:28 UTC (rev 76051)
@@ -6,7 +6,6 @@
# Build a scanner to check the repository for various problems
BRLCAD_ADDEXEC(repocheck repocheck.cpp "libbu;${CMAKE_THREAD_LIBS_INIT}" TEST)
-target_compile_definitions(repocheck PUBLIC BRLCADBUILD HAVE_CONFIG_H)
if (O3_COMPILER_FLAG)
# This check benefits greatly from optimization. If we have the O3 flag, use
# it - whether or not the standard build settings would add it.
Modified: brlcad/branches/dm-fb-merge/regress/rtwizard/regress-rtwiz.cmake.in
===================================================================
--- brlcad/branches/dm-fb-merge/regress/rtwizard/regress-rtwiz.cmake.in
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/regress/rtwizard/regress-rtwiz.cmake.in
2020-06-06 19:32:28 UTC (rev 76051)
@@ -32,7 +32,7 @@
endif (NOT EXISTS "${PIXCMP_EXEC}")
# Reconstruct the tree root from the EXEC path, and identify the input file
location
-string(REGEX_REPLACE "${BIN_DIR}$" "" RDIR "${BDIR}")
+string(REGEX REPLACE "${BIN_DIR}$" "" RDIR "${BDIR}")
set(SRCFILE "${RDIR}/${INPUTFILE}")
# Clean up in case we've run before
Modified: brlcad/branches/dm-fb-merge/src/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/CMakeLists.txt 2020-06-06 19:21:40 UTC
(rev 76050)
+++ brlcad/branches/dm-fb-merge/src/CMakeLists.txt 2020-06-06 19:32:28 UTC
(rev 76051)
@@ -5,14 +5,6 @@
# Minimal directories required for any BRL-CAD functionality
-# Define some common definitions here that are used
-# in most BRL-CAD directories
-
-add_definitions(
- -DHAVE_CONFIG_H
- -DBRLCADBUILD=1
- )
-
if(MSVC)
add_definitions(
-D_CRT_SECURE_NO_WARNINGS
Modified: brlcad/branches/dm-fb-merge/src/bwish/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/bwish/CMakeLists.txt 2020-06-06
19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/bwish/CMakeLists.txt 2020-06-06
19:32:28 UTC (rev 76051)
@@ -32,7 +32,7 @@
endif(TARGET libtermio)
BRLCAD_ADDEXEC(bwish "main.c;cmd.c;input.c" "${bwish_libs}" GUI)
- set_target_properties(bwish PROPERTIES COMPILE_DEFINITIONS "BWISH=1")
+ set_property(TARGET bwish APPEND PROPERTY COMPILE_DEFINITIONS "BWISH=1")
set_target_properties(bwish PROPERTIES FOLDER "BRL-CAD Executables")
if (TARGET itcl_pkgIndex)
Modified: brlcad/branches/dm-fb-merge/src/bwish/cmd.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/bwish/cmd.c 2020-06-06 19:21:40 UTC (rev
76050)
+++ brlcad/branches/dm-fb-merge/src/bwish/cmd.c 2020-06-06 19:32:28 UTC (rev
76051)
@@ -33,6 +33,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
#ifdef BWISH
# include "tk.h"
#else
@@ -44,6 +48,26 @@
#include "bu/str.h"
#include "libtermio.h"
+struct bu_cmdhist {
+ struct bu_vls h_command;
+ struct timeval h_start;
+ struct timeval h_finish;
+ int h_status;
+};
+#define BU_CMDHIST_NULL (struct bu_cmdhist *)NULL
+
+struct bu_cmdhist_list {
+ size_t size, capacity;
+ size_t current;
+ struct bu_cmdhist *cmdhist;
+};
+
+struct bu_cmdhist_obj {
+ struct bu_vls cho_name;
+ struct bu_cmdhist_list cmdhist;
+};
+#define BU_CMDHIST_OBJ_NULL (struct bu_cmdhist_obj *)NULL
+
#define BU_CMDHIST_LIST_INIT_CAPACITY 8
/* defined in tcl.c */
Modified: brlcad/branches/dm-fb-merge/src/conv/step/ap203e2-g/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/conv/step/ap203e2-g/CMakeLists.txt
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/conv/step/ap203e2-g/CMakeLists.txt
2020-06-06 19:32:28 UTC (rev 76051)
@@ -249,7 +249,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND ap203e2g_IMPORTS ${ap203e2g_IMPORTS})
- set_target_properties(step-g PROPERTIES COMPILE_DEFINITIONS
"${ap203e2g_IMPORTS}")
+ set_property(TARGET step-g APPEND PROPERTY COMPILE_DEFINITIONS
"${ap203e2g_IMPORTS}")
endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/branches/dm-fb-merge/src/conv/step/ap214-g/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/conv/step/ap214-g/CMakeLists.txt
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/conv/step/ap214-g/CMakeLists.txt
2020-06-06 19:32:28 UTC (rev 76051)
@@ -250,7 +250,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND ap214g_IMPORTS ${ap214g_IMPORTS})
- set_target_properties(step-g PROPERTIES COMPILE_DEFINITIONS
"${ap214g_IMPORTS}")
+ set_property(TARGET step-g APPEND PROPERTY COMPILE_DEFINITIONS
"${ap214g_IMPORTS}")
endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/branches/dm-fb-merge/src/conv/step/ap242-g/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/conv/step/ap242-g/CMakeLists.txt
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/conv/step/ap242-g/CMakeLists.txt
2020-06-06 19:32:28 UTC (rev 76051)
@@ -249,7 +249,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND ap242g_IMPORTS ${ap242g_IMPORTS})
- set_target_properties(step-g PROPERTIES COMPILE_DEFINITIONS
"${ap242g_IMPORTS}")
+ set_property(TARGET step-g APPEND PROPERTY COMPILE_DEFINITIONS
"${ap242g_IMPORTS}")
endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/branches/dm-fb-merge/src/conv/step/g-ap203e2/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/conv/step/g-ap203e2/CMakeLists.txt
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/conv/step/g-ap203e2/CMakeLists.txt
2020-06-06 19:32:28 UTC (rev 76051)
@@ -57,7 +57,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND gap203e2_IMPORTS ${gap203e2_IMPORTS})
- set_target_properties(g-step PROPERTIES COMPILE_DEFINITIONS
"${gap203e2_IMPORTS}")
+ set_property(TARGET g-step APPEND PROPERTY COMPILE_DEFINITIONS
"${gap203e2_IMPORTS}")
endif (HIDE_INTERNAL_SYMBOLS)
set(IGNORE_FILES
Modified: brlcad/branches/dm-fb-merge/src/conv/step/g-ap214/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/conv/step/g-ap214/CMakeLists.txt
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/conv/step/g-ap214/CMakeLists.txt
2020-06-06 19:32:28 UTC (rev 76051)
@@ -58,7 +58,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND gap214_IMPORTS ${gap214_IMPORTS})
- set_target_properties(g-ap214 PROPERTIES COMPILE_DEFINITIONS
"${gap214_IMPORTS}")
+ set_property(TARGET g-ap214 APPEND PROPERTY COMPILE_DEFINITIONS
"${gap214_IMPORTS}")
set_property(SOURCE
${CMAKE_CURRENT_BINARY_DIR}/AUTOMOTIVE_DESIGN/SdaiAUTOMOTIVE_DESIGN.cc
APPEND PROPERTY COMPILE_FLAGS "/bigobj")
Modified: brlcad/branches/dm-fb-merge/src/conv/step/g-ap242/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/conv/step/g-ap242/CMakeLists.txt
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/conv/step/g-ap242/CMakeLists.txt
2020-06-06 19:32:28 UTC (rev 76051)
@@ -54,7 +54,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND gap242_IMPORTS ${gap242_IMPORTS})
- set_target_properties(g-ap242 PROPERTIES COMPILE_DEFINITIONS
"${gap242_IMPORTS}")
+ set_property(TARGET g-ap242 APPEND PROPERTY COMPILE_DEFINITIONS
"${gap242_IMPORTS}")
set_property(SOURCE
${CMAKE_CURRENT_BINARY_DIR}/AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF/SdaiAP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF.cc
APPEND PROPERTY COMPILE_FLAGS "/bigobj")
Modified: brlcad/branches/dm-fb-merge/src/conv/step/g-step/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/conv/step/g-step/CMakeLists.txt
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/conv/step/g-step/CMakeLists.txt
2020-06-06 19:32:28 UTC (rev 76051)
@@ -57,7 +57,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND gstep_IMPORTS ${gstep_IMPORTS})
- set_target_properties(g-step PROPERTIES COMPILE_DEFINITIONS
"${gstep_IMPORTS}")
+ set_property(TARGET g-step APPEND PROPERTY COMPILE_DEFINITIONS
"${gstep_IMPORTS}")
endif (HIDE_INTERNAL_SYMBOLS)
set(IGNORE_FILES
Modified: brlcad/branches/dm-fb-merge/src/conv/step/ifc-g/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/conv/step/ifc-g/CMakeLists.txt
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/conv/step/ifc-g/CMakeLists.txt
2020-06-06 19:32:28 UTC (rev 76051)
@@ -42,7 +42,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND ifcg_IMPORTS ${ifcg_IMPORTS})
- set_target_properties(ifc-g PROPERTIES COMPILE_DEFINITIONS "${ifcg_IMPORTS}")
+ set_property(TARGET ifc-g APPEND PROPERTY COMPILE_DEFINITIONS
"${ifcg_IMPORTS}")
endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/branches/dm-fb-merge/src/conv/step/util/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/conv/step/util/CMakeLists.txt
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/conv/step/util/CMakeLists.txt
2020-06-06 19:32:28 UTC (rev 76051)
@@ -36,7 +36,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND list_elements_IMPORTS ${list_elements_IMPORTS})
- set_target_properties(list_elements PROPERTIES COMPILE_DEFINITIONS
"${list_elements_IMPORTS}")
+ set_property(TARGET list_elements APPEND PROPERTY COMPILE_DEFINITIONS
"${list_elements_IMPORTS}")
endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/branches/dm-fb-merge/src/external/Creo/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/external/Creo/CMakeLists.txt
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/external/Creo/CMakeLists.txt
2020-06-06 19:32:28 UTC (rev 76051)
@@ -273,6 +273,7 @@
# DLLs in place will result in silent failure of the loading step. ***
add_library(creo-brl SHARED ${creo_brl_srcs})
target_link_libraries(creo-brl ${WIN_LIBS} ${CREO_PTK_DLL_LIBS}
${BRLCAD_STATIC_LIBS})
+ set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
install(TARGETS creo-brl
RUNTIME DESTINATION "${MDIR}/${CREO_OBJ_DIR}"
)
Modified: brlcad/branches/dm-fb-merge/src/external/Cubit/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/external/Cubit/CMakeLists.txt
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/external/Cubit/CMakeLists.txt
2020-06-06 19:32:28 UTC (rev 76051)
@@ -23,6 +23,7 @@
add_definitions(-DTEST_BUILD)
add_library(g-sat ${g_sat_srcs})
target_link_libraries(g-sat librt libwdb libbrep libbg libnmg libbn libbu)
+ set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
set_target_properties(g-sat PROPERTIES FOLDER "BRL-CAD Executables/Build
Only")
if(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"BU_DLL_IMPORTS")
Modified: brlcad/branches/dm-fb-merge/src/external/Unigraphics/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/external/Unigraphics/CMakeLists.txt
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/external/Unigraphics/CMakeLists.txt
2020-06-06 19:32:28 UTC (rev 76051)
@@ -25,6 +25,7 @@
add_definitions(-DTEST_BUILD)
add_library(ug-g ${ug_g_srcs})
target_link_libraries(ug-g librt libwdb libbrep libbg libnmg libbn libbu
${TCL_LIBRARY})
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
set_target_properties(ug-g PROPERTIES FOLDER "BRL-CAD Executables/Build
Only")
if(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"BU_DLL_IMPORTS")
Index: brlcad/branches/dm-fb-merge/src/libbu
===================================================================
--- brlcad/branches/dm-fb-merge/src/libbu 2020-06-06 19:21:40 UTC (rev
76050)
+++ brlcad/branches/dm-fb-merge/src/libbu 2020-06-06 19:32:28 UTC (rev
76051)
Property changes on: brlcad/branches/dm-fb-merge/src/libbu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
-/brlcad/branches/RELEASE/src/libbu:70323-70333,71915-71935,72826-72858,74376-74454
+/brlcad/branches/RELEASE/src/libbu:70323-70333,71915-71935,72826-72858,74376-74454,75372-75681
/brlcad/branches/bioh/src/libbu:75720-75736,75860-75891,75894-75986
/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/tcltk86/src/libbu:68300-75257
-/brlcad/trunk/src/libbu:75512-75597,75630-75814,75880-75987
\ No newline at end of property
+/brlcad/trunk/src/libbu:75512-75597,75630-75814,75880-75987,76038-76050
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/src/libbu/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libbu/CMakeLists.txt 2020-06-06
19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/libbu/CMakeLists.txt 2020-06-06
19:32:28 UTC (rev 76051)
@@ -56,7 +56,6 @@
brlcad_path.c
bu_init.cpp
cmd.c
- cmdhist.c
color.cpp
convert.c
crashreport.c
Deleted: brlcad/branches/dm-fb-merge/src/libbu/cmdhist.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libbu/cmdhist.c 2020-06-06 19:21:40 UTC
(rev 76050)
+++ brlcad/branches/dm-fb-merge/src/libbu/cmdhist.c 2020-06-06 19:32:28 UTC
(rev 76051)
@@ -1,260 +0,0 @@
-/* C M D H I S T . C
- * BRL-CAD
- *
- * Copyright (c) 1998-2020 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-
-#include "common.h"
-
-#include <string.h>
-
-#include "bu/cmd.h"
-#include "bu/malloc.h"
-#include "bu/str.h"
-
-#define BU_CMDHIST_OBJ_LIST_INIT_CAPACITY 8
-
-/**
- * Stores the given command with start and finish times in the
- * history vls'es. 'status' is either BRLCAD_OK or BRLCAD_ERROR.
- */
-HIDDEN void
-cmdhist_record(struct bu_cmdhist_obj *chop, struct bu_vls *cmdp, struct
timeval *start, struct timeval *finish, int status)
-{
- struct bu_cmdhist *new_hist;
- const char *eol = "\n";
-
- if (UNLIKELY(BU_STR_EQUAL(bu_vls_addr(cmdp), eol)))
- return;
-
- if (chop->cmdhist.capacity == 0) {
- chop->cmdhist.capacity = BU_CMDHIST_OBJ_LIST_INIT_CAPACITY;
- chop->cmdhist.cmdhist = (struct bu_cmdhist *)bu_malloc(
- sizeof (struct bu_cmdhist) * chop->cmdhist.capacity,
- "init chop");
- } else if (chop->cmdhist.size == chop->cmdhist.capacity) {
- chop->cmdhist.capacity *= 2;
- chop->cmdhist.cmdhist = (struct bu_cmdhist *)bu_realloc(
- chop->cmdhist.cmdhist,
- sizeof (struct bu_cmdhist_obj) * chop->cmdhist.capacity,
- "init chop");
- }
-
- new_hist = &chop->cmdhist.cmdhist[chop->cmdhist.size];
- bu_vls_init(&new_hist->h_command);
- bu_vls_vlscat(&new_hist->h_command, cmdp);
- new_hist->h_start = *start;
- new_hist->h_finish = *finish;
- new_hist->h_status = status;
- chop->cmdhist.current = chop->cmdhist.size;
- chop->cmdhist.size++;
-}
-
-
-HIDDEN int
-cmdhist_timediff(struct timeval *tvdiff, struct timeval *start, struct timeval
*finish)
-{
- if (UNLIKELY(finish->tv_sec == 0 && finish->tv_usec == 0))
- return -1;
- if (UNLIKELY(start->tv_sec == 0 && start->tv_usec == 0))
- return -1;
-
- tvdiff->tv_sec = finish->tv_sec - start->tv_sec;
- tvdiff->tv_usec = finish->tv_usec - start->tv_usec;
- if (tvdiff->tv_usec < 0) {
- --tvdiff->tv_sec;
- tvdiff->tv_usec += 1000000L;
- }
-
- return 0;
-}
-
-
-int
-bu_cmdhist_history(void *data, int argc, const char *argv[])
-{
- FILE *fp;
- int with_delays = 0;
- struct bu_cmdhist *hp, *hp_prev;
- struct bu_vls str = BU_VLS_INIT_ZERO;
- struct timeval tvdiff;
- struct bu_cmdhist_obj *chop = (struct bu_cmdhist_obj *)data;
- size_t i;
-
- if (argc < 2 || 5 < argc) {
- bu_log("Usage: %s -delays\nList command history.\n", argv[0]);
- return BRLCAD_ERROR;
- }
-
- fp = NULL;
- while (argc >= 3) {
- const char *delays = "-delays";
- const char *outfile = "-outfile";
-
- if (BU_STR_EQUAL(argv[2], delays))
- with_delays = 1;
- else if (BU_STR_EQUAL(argv[2], outfile)) {
- if (fp != NULL) {
- fclose(fp);
- bu_log("%s: -outfile option given more than once\n", argv[0]);
- return BRLCAD_ERROR;
- } else if (argc < 4 || BU_STR_EQUAL(argv[3], delays)) {
- bu_log("%s: I need a file name\n", argv[0]);
- return BRLCAD_ERROR;
- } else {
- fp = fopen(argv[3], "ab+");
- if (UNLIKELY(fp == NULL)) {
- bu_log("%s: error opening file", argv[0]);
- return BRLCAD_ERROR;
- }
- --argc;
- ++argv;
- }
- } else {
- bu_log("Invalid option %s\n", argv[2]);
- }
- --argc;
- ++argv;
- }
-
- for (i = 1; i < chop->cmdhist.size; i++) {
- hp = &(chop->cmdhist.cmdhist[i]);
- hp_prev = &(chop->cmdhist.cmdhist[i - 1]);
- bu_vls_trunc(&str, 0);
- if (with_delays) {
- if (cmdhist_timediff(&tvdiff, &(hp_prev->h_finish), &(hp->h_start))
>= 0)
- bu_vls_printf(&str, "delay %ld %ld\n", (long)tvdiff.tv_sec,
- (long)tvdiff.tv_usec);
-
- }
-
- if (hp->h_status == BRLCAD_ERROR)
- bu_vls_printf(&str, "# ");
- bu_vls_vlscat(&str, &(hp->h_command));
-
- if (fp != NULL)
- bu_vls_fwrite(fp, &str);
- else
- bu_log("%s\n", bu_vls_addr(&str));
- }
-
- if (fp != NULL)
- fclose(fp);
-
- return BRLCAD_OK;
-}
-
-
-int
-bu_cmdhist_add(void *clientData, int argc, const char **argv)
-{
- struct bu_cmdhist_obj *chop = (struct bu_cmdhist_obj *)clientData;
- struct bu_vls vls = BU_VLS_INIT_ZERO;
- struct timeval zero;
-
- if (argc != 3) {
- bu_log("ERROR: expecting only three arguments\n");
- return BRLCAD_ERROR;
- }
-
- if (UNLIKELY(argv[2][0] == '\n' || argv[2][0] == '\0'))
- return BRLCAD_OK;
-
- bu_vls_strcpy(&vls, argv[2]);
- if (argv[2][strlen(argv[2])-1] != '\n')
- bu_vls_putc(&vls, '\n');
-
- zero.tv_sec = zero.tv_usec = 0L;
- cmdhist_record(chop, &vls, &zero, &zero, BRLCAD_OK);
-
- bu_vls_free(&vls);
-
- /* newly added command is in chop->cho_curr */
- return BRLCAD_OK;
-}
-
-
-int
-bu_cmdhist_prev(void *clientData, int argc, const char **UNUSED(argv))
-{
- struct bu_cmdhist_obj *chop = (struct bu_cmdhist_obj *)clientData;
-
- if (argc != 2) {
- bu_log("ERROR: expecting only two arguments\n");
- return BRLCAD_ERROR;
- }
-
- if (chop->cmdhist.capacity != 0 && chop->cmdhist.current > 0) {
- chop->cmdhist.current--;
- }
-
- /* result is at index chop->cmdhist.current */
- return BRLCAD_OK;
-}
-
-
-int
-bu_cmdhist_curr(void *clientData, int argc, const char **UNUSED(argv))
-{
- struct bu_cmdhist_obj *chop = (struct bu_cmdhist_obj *)clientData;
-
- if (argc != 2) {
- bu_log("ERROR: expecting only two arguments\n");
- return BRLCAD_ERROR;
- }
-
- if (chop->cmdhist.capacity > 0) {
- /* result is at index chop->cmdhist.current */
- return BRLCAD_OK;
- }
-
- /* no commands exist yet */
- return BRLCAD_ERROR;
-}
-
-
-int
-bu_cmdhist_next(void *clientData, int argc, const char **UNUSED(argv))
-{
- struct bu_cmdhist_obj *chop = (struct bu_cmdhist_obj *)clientData;
-
- if (argc != 2) {
- bu_log("ERROR: expecting only two arguments\n");
- return BRLCAD_ERROR;
- }
-
- if (chop->cmdhist.capacity == 0 ||
- chop->cmdhist.current == chop->cmdhist.size - 1) {
- return BRLCAD_ERROR;
- }
-
- chop->cmdhist.current++;
-
- /* result is at index chop->cmdhist.current */
- return BRLCAD_OK;
-}
-
-
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
Modified: brlcad/branches/dm-fb-merge/src/libbu/tests/dylib/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libbu/tests/dylib/CMakeLists.txt
2020-06-06 19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/libbu/tests/dylib/CMakeLists.txt
2020-06-06 19:32:28 UTC (rev 76051)
@@ -42,6 +42,7 @@
add_executable(bu_dylib run.c)
target_link_libraries(bu_dylib libdylib libbu)
+set_property(TARGET bu_dylib APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
if (HIDE_INTERNAL_SYMBOLS)
set_property(TARGET bu_dylib APPEND PROPERTY COMPILE_DEFINITIONS
BU_DYLIB_DLL_IMPORTS)
endif (HIDE_INTERNAL_SYMBOLS)
Modified: brlcad/branches/dm-fb-merge/src/mged/dozoom.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/mged/dozoom.c 2020-06-06 19:21:40 UTC
(rev 76050)
+++ brlcad/branches/dm-fb-merge/src/mged/dozoom.c 2020-06-06 19:32:28 UTC
(rev 76051)
@@ -182,9 +182,9 @@
/* draw predictor vlist */
if (mged_variables->mv_predictor) {
dm_set_fg(DMP,
- color_scheme->cs_predictor[0],
- color_scheme->cs_predictor[1],
- color_scheme->cs_predictor[2], 1, 1.0);
+ color_scheme->cs_predictor[0],
+ color_scheme->cs_predictor[1],
+ color_scheme->cs_predictor[2], 1, 1.0);
dm_draw_vlist(DMP, (struct bn_vlist *)&curr_dm_list->dml_p_vlist);
}
@@ -204,14 +204,14 @@
dm_loadmatrix(DMP, mat, which_eye);
inv_viewsize /= modelchanges[15];
dm_set_fg(DMP,
- color_scheme->cs_geo_hl[0],
- color_scheme->cs_geo_hl[1],
- color_scheme->cs_geo_hl[2], 1, 1.0);
+ color_scheme->cs_geo_hl[0],
+ color_scheme->cs_geo_hl[1],
+ color_scheme->cs_geo_hl[2], 1, 1.0);
ndrawn = dm_draw_display_list(DMP, GEDP->ged_gdp->gd_headDisplay, 1.0,
inv_viewsize,
- r, g, b, mged_variables->mv_linewidth,
mged_variables->mv_dlist, 1,
- geometry_default_color, 0,
mged_variables->mv_dlist);
+ r, g, b, mged_variables->mv_linewidth, mged_variables->mv_dlist, 1,
+ geometry_default_color, 0, mged_variables->mv_dlist);
curr_dm_list->dml_ndrawn += ndrawn;
@@ -256,8 +256,8 @@
FOR_ALL_DISPLAYS(dlp, &head_dm_list.l) {
if (dlp->dml_mapped &&
- dm_get_displaylist(dlp->dml_dmp) &&
- dlp->dml_mged_variables->mv_dlist) {
+ dm_get_displaylist(dlp->dml_dmp) &&
+ dlp->dml_mged_variables->mv_dlist) {
if (sp->s_dlist == 0)
sp->s_dlist = dm_gen_dlists(DMP, 1);
@@ -267,9 +267,9 @@
(void)dm_set_fg(DMP, 255, 255, 255, 0, sp->s_transparency);
else
(void)dm_set_fg(DMP,
- (unsigned char)sp->s_color[0],
- (unsigned char)sp->s_color[1],
- (unsigned char)sp->s_color[2], 0,
sp->s_transparency);
+ (unsigned char)sp->s_color[0],
+ (unsigned char)sp->s_color[1],
+ (unsigned char)sp->s_color[2], 0, sp->s_transparency);
(void)dm_draw_vlist(DMP, (struct bn_vlist *)&sp->s_vlist);
(void)dm_end_dlist(DMP);
}
Index: brlcad/branches/dm-fb-merge/src/other
===================================================================
--- brlcad/branches/dm-fb-merge/src/other 2020-06-06 19:21:40 UTC (rev
76050)
+++ brlcad/branches/dm-fb-merge/src/other 2020-06-06 19:32:28 UTC (rev
76051)
Property changes on: brlcad/branches/dm-fb-merge/src/other
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/src/other:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75682-75685
+/brlcad/branches/RELEASE/src/other:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75372-75685
/brlcad/branches/bioh/src/other:75720-75736,75860-75891,75894-75986
/brlcad/branches/brep-debug/src/other: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/src/other:62518
## -8,4 +8,4 ##
/brlcad/branches/osg/src/other:62110-62113
/brlcad/branches/prep-cache/src/other:68236-68933
/brlcad/branches/tcltk86/src/other:68300-75257
-/brlcad/trunk/src/other:75440-75462,75512-75597,75630-75814,75880-75987
\ No newline at end of property
+/brlcad/trunk/src/other:75440-75462,75512-75597,75630-75814,75880-75987,76038-76050
\ No newline at end of property
Index: brlcad/branches/dm-fb-merge/src/other/libregex
===================================================================
--- brlcad/branches/dm-fb-merge/src/other/libregex 2020-06-06 19:21:40 UTC
(rev 76050)
+++ brlcad/branches/dm-fb-merge/src/other/libregex 2020-06-06 19:32:28 UTC
(rev 76051)
Property changes on: brlcad/branches/dm-fb-merge/src/other/libregex
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/src/other/libregex:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454
+/brlcad/branches/RELEASE/src/other/libregex:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75372-75681
/brlcad/branches/bioh/src/other/libregex:75720-75736
/brlcad/branches/brep-debug/src/other/libregex: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/src/other/libregex:62518
## -9,4 +9,4 ##
/brlcad/branches/prep-cache/src/other/libregex:68236-68933
/brlcad/branches/tcltk86/src/other/libregex:68300-75257
/brlcad/branches/thirdparty_rework/src/other/libregex:75102-75103
-/brlcad/trunk/src/other/libregex:75630-75814
\ No newline at end of property
+/brlcad/trunk/src/other/libregex:75630-75814,76038-76050
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/src/remrt/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/remrt/CMakeLists.txt 2020-06-06
19:21:40 UTC (rev 76050)
+++ brlcad/branches/dm-fb-merge/src/remrt/CMakeLists.txt 2020-06-06
19:32:28 UTC (rev 76051)
@@ -15,7 +15,7 @@
BRLCAD_ADDEXEC(remrt "../rt/opt.c;ihost.c;remrt.c" "liboptical;libdm")
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_TARGET_PROPERTIES(rtsrv PROPERTIES COMPILE_DEFINITIONS "RTSRV")
+set_property(TARGET rtsrv APPEND PROPERTY COMPILE_DEFINITIONS "RTSRV")
CMAKEFILES(ihost.h protocol.h)
CMAKEFILES(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
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
