[brlcad-commits] SF.net SVN: brlcad:[32171] brlcad/branches/pre-7-12-6
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Menu
▾
▴
[brlcad-commits] SF.net SVN: brlcad:[32171] brlcad/branches/pre-7-12-6
|
From: <sta...@us...> - 2008-07-31 22:45:10
|
Revision: 32171
http://brlcad.svn.sourceforge.net/brlcad/?rev=32171&view=rev
Author: starseeker
Date: 2008-07-31 22:44:57 +0000 (Thu, 31 Jul 2008)
Log Message:
-----------
OK, take a step back. Reverting to 32083.
Modified Paths:
--------------
brlcad/branches/pre-7-12-6/BUGS
brlcad/branches/pre-7-12-6/Makefile.am
brlcad/branches/pre-7-12-6/NEWS
brlcad/branches/pre-7-12-6/TODO
brlcad/branches/pre-7-12-6/configure.ac
brlcad/branches/pre-7-12-6/doc/html/manuals/Install.html
brlcad/branches/pre-7-12-6/doc/pkg.tr
brlcad/branches/pre-7-12-6/include/bu.h
brlcad/branches/pre-7-12-6/include/common.h
brlcad/branches/pre-7-12-6/include/conf/CMakeLists.txt
brlcad/branches/pre-7-12-6/include/conf/Makefile.am
brlcad/branches/pre-7-12-6/include/config_win.h
brlcad/branches/pre-7-12-6/include/dm.h
brlcad/branches/pre-7-12-6/include/raytrace.h
brlcad/branches/pre-7-12-6/include/tclcad.h
brlcad/branches/pre-7-12-6/include/vmath.h
brlcad/branches/pre-7-12-6/misc/win32-msvc/CMakeLists.txt
brlcad/branches/pre-7-12-6/misc/win32-msvc/Dll/CMakeLists.txt
brlcad/branches/pre-7-12-6/misc/win32-msvc8/libdm/libdm.vcproj
brlcad/branches/pre-7-12-6/misc/win32-msvc8/libtclcad/libtclcad.vcproj
brlcad/branches/pre-7-12-6/misc/win32-msvc8/mged/mged.vcproj
brlcad/branches/pre-7-12-6/regress/gqa.sh
brlcad/branches/pre-7-12-6/regress/iges.sh
brlcad/branches/pre-7-12-6/regress/lights.sh
brlcad/branches/pre-7-12-6/regress/mged.sh
brlcad/branches/pre-7-12-6/regress/moss.sh
brlcad/branches/pre-7-12-6/regress/shaders.sh
brlcad/branches/pre-7-12-6/regress/solids.sh
brlcad/branches/pre-7-12-6/regress/spdi.sh
brlcad/branches/pre-7-12-6/regress/weight.sh
brlcad/branches/pre-7-12-6/sh/elapsed.sh
brlcad/branches/pre-7-12-6/src/conv/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/conv/fast4-g.c
brlcad/branches/pre-7-12-6/src/conv/g2asc.c
brlcad/branches/pre-7-12-6/src/libbn/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/libbn/mat.c
brlcad/branches/pre-7-12-6/src/libbu/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/libbu/bu_tcl.c
brlcad/branches/pre-7-12-6/src/libbu/parse.c
brlcad/branches/pre-7-12-6/src/libfb/if_4d.c
brlcad/branches/pre-7-12-6/src/libged/view_obj.c
brlcad/branches/pre-7-12-6/src/libged/wdb_obj.c
brlcad/branches/pre-7-12-6/src/librt/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/librt/prep.c
brlcad/branches/pre-7-12-6/src/librt/primitives/dsp/dsp.c
brlcad/branches/pre-7-12-6/src/librt/primitives/extrude/extrude.c
brlcad/branches/pre-7-12-6/src/librt/primitives/pipe/pipe.c
brlcad/branches/pre-7-12-6/src/librt/primitives/sketch/sketch.c
brlcad/branches/pre-7-12-6/src/librt/primitives/tor/tor.c
brlcad/branches/pre-7-12-6/src/librt/shoot.c
brlcad/branches/pre-7-12-6/src/librt/tcl.c
brlcad/branches/pre-7-12-6/src/librtserver/rtserver.c
brlcad/branches/pre-7-12-6/src/librtserver/rtserverTest.c
brlcad/branches/pre-7-12-6/src/libsysv/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/libtclcad/Makefile.am
brlcad/branches/pre-7-12-6/src/libwdb/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/mged/edsol.c
brlcad/branches/pre-7-12-6/src/other/blt/Makefile.am
brlcad/branches/pre-7-12-6/src/other/libregex/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/other/libz/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/other/openNURBS/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/other/tk/generic/tk.h
brlcad/branches/pre-7-12-6/src/proc-db/tire.c
brlcad/branches/pre-7-12-6/src/rt/Makefile.am
brlcad/branches/pre-7-12-6/src/rt/rtexample.c
brlcad/branches/pre-7-12-6/src/rt/viewarea.c
Removed Paths:
-------------
brlcad/branches/pre-7-12-6/current_successful_compile_rev.txt
brlcad/branches/pre-7-12-6/sh/cmakecheck.sh
Property Changed:
----------------
brlcad/branches/pre-7-12-6/include/conf/
brlcad/branches/pre-7-12-6/include/conf/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/libbn/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/libbu/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/librt/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/libsysv/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/libwdb/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/other/libregex/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/other/libz/CMakeLists.txt
brlcad/branches/pre-7-12-6/src/other/openNURBS/CMakeLists.txt
Modified: brlcad/branches/pre-7-12-6/BUGS
===================================================================
--- brlcad/branches/pre-7-12-6/BUGS 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/BUGS 2008-07-31 22:44:57 UTC (rev 32171)
@@ -15,16 +15,6 @@
Recent Bugs
-----------
-* fast4-g skips lines while processing if there are DOS line endings
-
-* pipe primitive has a BU_GETSTRUCT malloc getting called during
- raytracing that kills performance by more than an order of magnitude
- (especially when the light source is a pipe and there are a lot of
- shadow rays)
-
-* bump shader seems to be busted. only renders as flat by itself and
- stacked with phong it seems to ignore the uv settings.
-
* rtweight prints incorrect units when units are set to ft. Appears
to trace back to unit handling in view_end in viewweight.c. This
logic should be replaced using the proper libbu functions.
@@ -129,8 +119,8 @@
off-by-many on the edge of the middle ARB8 when using an optimized
-O3 compile (-fno-unsafe-math-optimizations makes no difference)
-* triangulation of some pipe in toyjeep.g fails (rather reliably) on
- some given bend. fails in nmg_triangulate model().
+* tessellation of some pipe in toyjeep.g fails (rather reliably) on
+ some given bend
* tgc reports one hit errors though hit point has 0,0,0 direction
implying that maybe the point was supposedly deleted.
Modified: brlcad/branches/pre-7-12-6/Makefile.am
===================================================================
--- brlcad/branches/pre-7-12-6/Makefile.am 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/Makefile.am 2008-07-31 22:44:57 UTC (rev 32171)
@@ -318,7 +318,6 @@
echo "TOO MANY EMPTY PKGINDEX.TCL/TCLINDEX FILES" ; \
exit 1 ; \
fi
- ${SH} $(top_srcdir)/sh/cmakecheck.sh
find $(distdir) -type f \( -name '.cvsignore' -or -name 'brlcad_config.h' \) -exec rm -f {} \;
find $(distdir) -type d \( -name 'CVS' -or -name '.svn' \) -prune -exec rm -rf {} \;
@@ -436,17 +435,17 @@
@$(ECHO)
@if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "xfast" -o "x$(.TARGETS)" = "xfast" ; then \
$(ECHO) $(ECHO_N) "Elapsed compilation time: " ;\
- ${SH} $(top_srcdir)/sh/elapsed.sh `cat $(top_builddir)/include/conf/TS` ;\
+ sh $(top_srcdir)/sh/elapsed.sh `cat $(top_builddir)/include/conf/DATE` ;\
$(ECHO) $(ECHO_N) "Elapsed time since configuration: " ;\
- ${SH} $(top_srcdir)/sh/elapsed.sh ${CONFIG_TS} ;\
+ sh $(top_srcdir)/sh/elapsed.sh ${CONFIG_TIME} ;\
$(ECHO) "---" ;\
$(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\
$(ECHO) "Run 'make benchmark' to run the BRL-CAD Benchmark Suite" ;\
elif test "x$(MAKECMDGOALS)" = "xinstall-am" -o "x$(.TARGETS)" = "xinstall-am" ; then \
$(ECHO) $(ECHO_N) "Elapsed installation time: " ;\
- ${SH} $(top_srcdir)/sh/elapsed.sh `cat $(top_builddir)/include/conf/TS` ;\
+ sh $(top_srcdir)/sh/elapsed.sh `cat $(top_builddir)/include/conf/DATE` ;\
$(ECHO) $(ECHO_N) "Elapsed time since configuration: " ;\
- ${SH} $(top_srcdir)/sh/elapsed.sh ${CONFIG_TS} ;\
+ sh $(top_srcdir)/sh/elapsed.sh ${CONFIG_TIME} ;\
$(ECHO) "---" ;\
$(ECHO) "Run 'make test' to run the BRL-CAD Test Suite" ;\
$(ECHO) "Run 'make benchmark' to run the BRL-CAD Benchmark Suite" ;\
@@ -460,9 +459,9 @@
$(ECHO) "$${separator}****" ;\
elif test "x$(MAKECMDGOALS)" = "x" -a "x$(.TARGETS)" = "x" ; then \
$(ECHO) $(ECHO_N) "Elapsed time: " ;\
- ${SH} $(top_srcdir)/sh/elapsed.sh `cat $(top_builddir)/include/conf/TS` ;\
+ sh $(top_srcdir)/sh/elapsed.sh `cat $(top_builddir)/include/conf/DATE` ;\
$(ECHO) $(ECHO_N) "Elapsed time since configuration: " ;\
- ${SH} $(top_srcdir)/sh/elapsed.sh ${CONFIG_TS} ;\
+ sh $(top_srcdir)/sh/elapsed.sh ${CONFIG_TIME} ;\
$(ECHO) "---" ;\
$(ECHO) "Run 'make benchmark' to run the BRL-CAD Benchmark Suite" ;\
fi
Modified: brlcad/branches/pre-7-12-6/NEWS
===================================================================
--- brlcad/branches/pre-7-12-6/NEWS 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/NEWS 2008-07-31 22:44:57 UTC (rev 32171)
@@ -14,12 +14,6 @@
--- 2008-06-XX Release 7.12.5 ---
----------------------------------------------------------------------
-* tweak tread 2 in tire tool; avoid artifacts on tread wall - C. Yapp
-* fixed mged 'dbconcat' hang when not specifying an affix - Bob Parker
-* fixed primitive selection solid_illum bug in mged - Bob Parker
-* fix bug in tire tool's geometry causing 'nicks' in tread - C. Yapp
-* increased raytrace performace of pipe primitive - John Anderson
-* fixed bugs handling invalid extrude objects - Sean Morrison
* fixed dependency bug in library pkg-config files - Sean Morrison
* platform installers use consistent naming conventions- Sean Morrison
* added -C color option to the mged 'E' command - Bob Parker
Modified: brlcad/branches/pre-7-12-6/TODO
===================================================================
--- brlcad/branches/pre-7-12-6/TODO 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/TODO 2008-07-31 22:44:57 UTC (rev 32171)
@@ -20,16 +20,15 @@
* stabilize and test mged
(massive command restructuring in progress with libged)
+* verify fast4-g doesn't vomit warning messages about string
+ truncation (should be fixed already)
+
* change rtarea output to have new cpa values in their own section
THESE SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS
-------------------------------------------------
-* make fast4-g not skip every other line if there are DOS line endings
-
-* implement make, ted, edsol, mirror, and analyze for hyp primitive
-
* fix incrTcl pathing issues when only using system tcl/tk
(get incrTcl subconfigure to work like was done for Tcl)
@@ -61,10 +60,6 @@
THESE ARE LOWER PRIORITY OR FOR FUTURE RELEASES
-----------------------------------------------
-* investigate why solids.sh fails on three pixels on some 64-bit
- platforms. it grazingly hits/misses a tgc causing a regression
- failure.
-
* develop a low-level tool for investigating, reporting statistics on,
and repairing geometry database files. the tool should nominally
perform big/little endian conversions, report number and types of
Modified: brlcad/branches/pre-7-12-6/configure.ac
===================================================================
--- brlcad/branches/pre-7-12-6/configure.ac 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/configure.ac 2008-07-31 22:44:57 UTC (rev 32171)
@@ -114,17 +114,18 @@
# force locale setting to C so things like date output as expected
LC_ALL=C
-LANG=C
CONFIG_DAY=`date +%d`
CONFIG_MONTH=`date +%m`
CONFIG_YEAR=`date +%Y`
CONFIG_DATE="${CONFIG_YEAR}${CONFIG_MONTH}${CONFIG_DAY}"
-CONFIG_TS="`date -R 2>/dev/null || date +'%a, %d %b %Y %H:%M:%S %z' 2>/dev/null || date`" # try RFC 2822
+CONFIG_TIME="`date '+%H %M %S'`"
+CONFIG_TS="`date`"
AC_SUBST(CONFIG_DAY)
AC_SUBST(CONFIG_MONTH)
AC_SUBST(CONFIG_YEAR)
AC_SUBST(CONFIG_DATE)
+AC_SUBST(CONFIG_TIME)
AC_SUBST(CONFIG_TS)
@@ -1986,13 +1987,14 @@
if test "x$bc_compliant_float" = "xno" || test "x$bc_compliant_double" = "xno" ; then
AC_MSG_NOTICE([}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}])
AC_MSG_WARN([The floating point implementation does not seem to be IEEE 754])
- AC_MSG_WARN([compliant. The behavior of htond and htonf may be incorrect.])
+ AC_MSG_WARN([compliant. The behavior or htond and htonf may be incorrect.])
AC_MSG_NOTICE([{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{])
sleep 1
fi
dnl AC_C_PROTOTYPES
AM_C_PROTOTYPES
+AC_DEFINE(USE_PROTOTYPES,1,heh)
AC_C_CONST
AC_C_INLINE
@@ -2826,16 +2828,13 @@
dnl *** tcl+itcl sanity ***
-dnl See if the tcl we're using is compatible with the incrTcl we're using.
-dnl Our incrTcl is latest sources that make it only work with 8.5+
+dnl See if the tcl we're using is compatible with the incrTcl we're using
if test "x$TCL" = "x$LIBTCL" ; then
- if test "x$ITCL" != "x$LIBITCL" && test "x$TCL_VERSION" != "x8.5" ; then
+ if test "x$ITCL" != "x$LIBITCL" ; then
# apparently want to use system tcl with non-system incrTcl
# is that sane? probably not until 8.5 is everywhere.
- AC_MSG_NOTICE([}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}])
AC_MSG_WARN([Unable to find a system incrTcl compatible with the available system Tcl])
AC_MSG_WARN([Enabling compilation of both Tcl and incrTcl])
- AC_MSG_NOTICE([{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{])
# nope!
build_brlcad_tcl="yes"
build_brlcad_tk="yes"
@@ -2853,7 +2852,7 @@
TCLSTUB='-L${top_builddir}/src/other/tcl/unix'" -ltclstub${TCL_VERSION}"
TCL_CPPFLAGS='-I${top_srcdir}/src/other/tcl/generic -I${top_srcdir}/src/other/tcl/unix'
- TK='-L${top_builddir}/src/other/tk/unix'" -ltk${TK_VERSION}"
+ TK='-L${top_builddir}/src/other/tk/unix'" -ltk${TCL_VERSION}"
TKSTUB='-L${top_builddir}/src/other/tk/unix'" -ltkstub${TK_VERSION}"
TK_CPPFLAGS='-I${top_srcdir}/src/other/tk/generic -I${top_srcdir}/src/other/tk/unix -I${top_srcdir}/src/other/tk/win'
if test "x$bc_build_aquatk" = "xyes" ; then
@@ -3153,7 +3152,7 @@
dnl *** Boost ***
dnl Header only Library requiring no build
-BOOST_CPPFLAGS='-I${top_srcdir}/src/other'
+BOOST_CPPFLAGS='-I${top_srcdir}/src/other/boost'
AC_SUBST(BOOST_CPPFLAGS)
dnl *** libm ***
@@ -3602,7 +3601,9 @@
AC_DEFINE(PARALLEL, 1, [Define to enable SMP architecture parallel computation support ])
fi
+AC_DEFINE_UNQUOTED([USE_FBSERV], [1], [Required for libdm/mged to allow direct fbserv render connections])
+
#
# set up the BRL-CAD libraries
#
@@ -3617,6 +3618,7 @@
MULTISPECTRAL='${top_builddir}/src/libmultispectral/libmultispectral.la'
OPTICAL='${top_builddir}/src/liboptical/liboptical.la'
ORLE='${top_builddir}/src/liborle/liborle.la'
+PC='${top_builddir}/src/libpc/libpc.la'
PKG='${top_builddir}/src/libpkg/libpkg.la'
RT='${top_builddir}/src/librt/librt.la'
SYSV='${top_builddir}/src/libsysv/libsysv.la'
@@ -3639,6 +3641,7 @@
FB_LIBS="${BU} ${BU_LIBS} ${PKG} ${TCL} ${SOCKET} ${NSL}" # additional/optional FB_LIBS: ${TK} ${X_LIBS} ${LIBGL}
OPTICAL_LIBS="${RT} ${RT_LIBS} ${BN} ${BN_LIBS} ${BU} ${BU_LIBS} ${TCL}"
MULTISPECTRAL_LIBS="${OPTICAL} ${OPTICAL_LIBS} ${RT} ${RT_LIBS} ${BN} ${BN_LIBS} ${BU} ${BU_LIBS}"
+PC_LIBS="${WDB} ${WDB_LIBS}"
DM_LIBS="${GED} ${GED_LIBS} ${RT} ${RT_LIBS} ${FB} ${FB_LIBS} ${PNG} ${TK} ${X_LIBS} ${FRAMEWORK_CARBON}"
TCLCAD_LIBS="${GED} ${GED_LIBS} ${DM} ${DM_LIBS} ${FB} ${FB_LIBS} ${ITK} ${ITCL} ${TK} ${TCLSTUB} ${BLT} ${TCL}"
BRLCAD_LIBS="${GED} ${GED_LIBS} ${WDB} ${WDB_LIBS} ${RT} ${RT_LIBS} ${BN} ${BN_LIBS} ${BU} ${BU_LIBS}"
@@ -3654,6 +3657,7 @@
AC_SUBST(OPTICAL)
AC_SUBST(ORLE)
AC_SUBST(PKG)
+AC_SUBST(PC)
AC_SUBST(RT)
AC_SUBST(SYSV)
AC_SUBST(TCLCAD)
@@ -3671,6 +3675,7 @@
AC_SUBST(MULTISPECTRAL_LIBS)
AC_SUBST(OPTICAL_LIBS)
AC_SUBST(ORLE_LIBS)
+AC_SUBST(PC_LIBS)
AC_SUBST(PKG_LIBS)
AC_SUBST(RT_LIBS)
AC_SUBST(SYSV_LIBS)
@@ -3738,7 +3743,8 @@
doc/Makefile
doc/book/Makefile
doc/docbook/Makefile
- doc/docbook/oed/Makefile
+ doc/docbook/tutorials/Makefile
+ doc/docbook/tutorials/oed/Makefile
doc/html/Makefile
doc/html/ReleaseNotes/Makefile
doc/html/ReleaseNotes/Rel5.0/Makefile
@@ -3779,12 +3785,14 @@
misc/pkgconfig/libfft.pc
misc/pkgconfig/libmultispectral.pc
misc/pkgconfig/liboptical.pc
+ misc/pkgconfig/libpc.pc
misc/pkgconfig/libpkg.pc
misc/pkgconfig/librt.pc
misc/pkgconfig/libwdb.pc
misc/win32-msvc/Dll/Makefile
misc/win32-msvc/Makefile
misc/win32-msvc8/Makefile
+ misc/win32-msvc9/Makefile
pix/Makefile
sh/Makefile
src/Makefile
@@ -3855,6 +3863,7 @@
src/libmultispectral/Makefile
src/liboptical/Makefile
src/liborle/Makefile
+ src/libpc/Makefile
src/libpkg/Makefile
src/librt/Makefile
src/librtserver/Makefile
@@ -3992,7 +4001,7 @@
dnl Compute configuration time elapsed
dnl
if test -x "${srcdir}/sh/elapsed.sh" ; then
- time_elapsed="`${srcdir}/sh/elapsed.sh $CONFIG_TS`"
+ time_elapsed="`${srcdir}/sh/elapsed.sh $CONFIG_TIME`"
else
time_elapsed="unknown"
fi
Deleted: brlcad/branches/pre-7-12-6/current_successful_compile_rev.txt
===================================================================
--- brlcad/branches/pre-7-12-6/current_successful_compile_rev.txt 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/current_successful_compile_rev.txt 2008-07-31 22:44:57 UTC (rev 32171)
@@ -1,13 +0,0 @@
-32075, sans:
- change to libged/Makefile.am from 31282 that somehow got incorporated in 32048.
-svn merge -r 32048:32047 on that one file
-
-32082, sans:
- changes to configure.ac in 32082 that incorporated the new tutorials directory without it being present and misc/win32-msvc9 without it being included, src/libpc ditto - may want to revert that configure inclusion and do a more selective commit of its contents.
-
-32085,86 - incorporated change from 31629 somewhere in here that breaks things in extrude.c
- Sync up to this point, then redo the merge and commit of this stage from trunk while taking more care about what gets in extrude.c
- Same deal with pipe.c, sketch.c
- raytrace.h change is a problem here too.
-
-
Modified: brlcad/branches/pre-7-12-6/doc/html/manuals/Install.html
===================================================================
--- brlcad/branches/pre-7-12-6/doc/html/manuals/Install.html 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/doc/html/manuals/Install.html 2008-07-31 22:44:57 UTC (rev 32171)
@@ -762,6 +762,8 @@
offering in-bound remote framebuffer service via
<b>fbserv</b>, the framebuffer server and remote-framebuffer daemon.
(Note that in previous releases, this function was provided by <b>rfbd</b>.
+This release continues to provide an <b>rfbd</b> program, but you should
+switch to <b>fbserv</b>).
If you wish to do this, you should be sure that
the IF_REMOTE capability has been selected for <b>libfb</b>.
(In the supported configurations, it is).
Modified: brlcad/branches/pre-7-12-6/doc/pkg.tr
===================================================================
--- brlcad/branches/pre-7-12-6/doc/pkg.tr 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/doc/pkg.tr 2008-07-31 22:44:57 UTC (rev 32171)
@@ -6,7 +6,7 @@
writing. It is intended that an RFC be published at some point,
but for now this (plus the source code) is all the documentation we have.
In the CAD distribution, the remote framebuffer interface (libfb/if_remote.c)
-and server (fbserv), communicate using this protocol.
+and server (rfbd), communicate using this protocol.
Contributors:
Modified: brlcad/branches/pre-7-12-6/include/bu.h
===================================================================
--- brlcad/branches/pre-7-12-6/include/bu.h 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/include/bu.h 2008-07-31 22:44:57 UTC (rev 32171)
@@ -58,9 +58,6 @@
# endif
#endif
-#define BRLCAD_OK 0
-#define BRLCAD_ERROR 1
-
/** @def BU_DIR_SEPARATOR
* define BU_DIR_SEPARATOR to the directory separator character
*/
@@ -1013,10 +1010,6 @@
((_bv)->bits[(bit)>>BU_BITV_SHIFT] |= (((bitv_t)1)<<((bit)&BU_BITV_MASK)))
#define BU_BITCLR(_bv, bit) \
((_bv)->bits[(bit)>>BU_BITV_SHIFT] &= ~(((bitv_t)1)<<((bit)&BU_BITV_MASK)))
-
-/**
- * requires #include <string.h>
- */
#define BU_BITV_ZEROALL(_bv) \
{ memset((char *)((_bv)->bits), 0, BU_BITS2BYTES( (_bv)->nbits )); }
@@ -2258,14 +2251,7 @@
const struct bu_external *ip));
BU_EXPORT BU_EXTERN(char *bu_next_token,
(char *str));
-BU_EXPORT BU_EXTERN(int bu_structparse_argv,
- (struct bu_vls *log,
- int argc,
- char **argv,
- const struct bu_structparse *desc,
- char *base));
-
/** @} */
/** @addtogroup bitv */
/** @{ */
@@ -2666,11 +2652,11 @@
BU_EXPORT BU_EXTERN(void bu_observer_free, (struct bu_observer *));
-BU_EXPORT BU_EXTERN(void bu_tcl_structparse_get_terse_form,
+BU_EXPORT BU_EXTERN(void bu_structparse_get_terse_form,
(Tcl_Interp *interp,
const struct bu_structparse *sp));
-BU_EXPORT BU_EXTERN(int bu_tcl_structparse_argv,
+BU_EXPORT BU_EXTERN(int bu_structparse_argv,
(Tcl_Interp *interp,
int argc,
char **argv,
@@ -2707,13 +2693,13 @@
int argc,
char **argv));
-BU_EXPORT BU_EXTERN(int bu_tcl_get_value_by_keyword,
+BU_EXPORT BU_EXTERN(int bu_get_value_by_keyword,
(ClientData clientData,
Tcl_Interp *interp,
int argc,
char **argv));
-BU_EXPORT BU_EXTERN(int bu_tcl_get_all_keyword_values,
+BU_EXPORT BU_EXTERN(int bu_get_all_keyword_values,
(ClientData clientData,
Tcl_Interp *interp,
int argc,
Modified: brlcad/branches/pre-7-12-6/include/common.h
===================================================================
--- brlcad/branches/pre-7-12-6/include/common.h 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/include/common.h 2008-07-31 22:44:57 UTC (rev 32171)
@@ -49,11 +49,6 @@
# endif
#endif /* _WIN32 */
-/* support ANSI function declarations */
-#ifndef USE_PROTOTYPES
-# define USE_PROTOTYPES 1
-#endif
-
/* provide declaration markers for header externals */
#ifdef __cplusplus
# define __BEGIN_DECLS extern "C" {
@@ -84,13 +79,6 @@
# endif
#endif
-/* ansi c89 does not allow the 'inline' keyword */
-#ifdef __STRICT_ANSI__
-# ifndef inline
-# define inline /***/
-# endif
-#endif
-
#endif /* __COMMON_H__ */
/** @} */
/*
Property changes on: brlcad/branches/pre-7-12-6/include/conf
___________________________________________________________________
Modified: svn:ignore
- COUNT
DATE
HOST
Makefile
Makefile.in
PATH
TS
USER
+ COUNT
DATE
HOST
PATH
USER
Makefile
Makefile.in
Modified: brlcad/branches/pre-7-12-6/include/conf/CMakeLists.txt
===================================================================
--- brlcad/branches/pre-7-12-6/include/conf/CMakeLists.txt 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/include/conf/CMakeLists.txt 2008-07-31 22:44:57 UTC (rev 32171)
@@ -1,32 +1,32 @@
-# update COUNT
-find_file(countFile COUNT ${CMAKE_CURRENT_SOURCE_DIR})
-
-if(countFile)
- file(READ COUNT buildCounter)
-else(countFile)
- set(buildCounter 0)
-endif(countFile)
-
-math(EXPR buildCounter "${buildCounter} + 1")
-file(WRITE COUNT ${buildCounter})
-
-
-# update DATE
-execute_process(COMMAND cmd /c date /t OUTPUT_VARIABLE currentDate OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE currentTime OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-file(WRITE DATE "\"${currentDate} ${currentTime}\"")
-
-
-# update HOST
-file(WRITE HOST "\"$ENV{COMPUTERNAME}\"")
-
-
-# update PATH
-set(programPath "\"$ENV{ProgramFiles}\\BRL-CAD\"")
-string(REPLACE "\\" "\\\\" programPathForC ${programPath})
-file(WRITE PATH ${programPathForC})
-
-
-# update USER
-file(WRITE USER "\"$ENV{USERNAME}\"")
+# update COUNT
+find_file(countFile COUNT ${CMAKE_CURRENT_SOURCE_DIR})
+
+if(countFile)
+ file(READ COUNT buildCounter)
+else(countFile)
+ set(buildCounter 0)
+endif(countFile)
+
+math(EXPR buildCounter "${buildCounter} + 1")
+file(WRITE COUNT ${buildCounter})
+
+
+# update DATE
+execute_process(COMMAND cmd /c date /t OUTPUT_VARIABLE currentDate OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE currentTime OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+file(WRITE DATE "\"${currentDate} ${currentTime}\"")
+
+
+# update HOST
+file(WRITE HOST "\"$ENV{COMPUTERNAME}\"")
+
+
+# update PATH
+set(programPath "\"$ENV{ProgramFiles}\\BRL-CAD\"")
+string(REPLACE "\\" "\\\\" programPathForC ${programPath})
+file(WRITE PATH ${programPathForC})
+
+
+# update USER
+file(WRITE USER "\"$ENV{USERNAME}\"")
Property changes on: brlcad/branches/pre-7-12-6/include/conf/CMakeLists.txt
___________________________________________________________________
Deleted: svn:mime-type
- text/plain
Deleted: svn:eol-style
- native
Modified: brlcad/branches/pre-7-12-6/include/conf/Makefile.am
===================================================================
--- brlcad/branches/pre-7-12-6/include/conf/Makefile.am 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/include/conf/Makefile.am 2008-07-31 22:44:57 UTC (rev 32171)
@@ -1,33 +1,26 @@
# $Id$
COUNT: DATE HOST PATH USER
- test -f $@ && expr `cat COUNT` + 1 > $@ || $(ECHO) "1" > $@
+ test -f $@ && expr `cat COUNT` + 1 > $@ || echo "1" > $@
DATE: HOST PATH USER $(top_builddir)/include/brlcad_config.h
- $(ECHO) "\"`LANG=C date -R 2>/dev/null || date +'%a, %d %b %Y %H:%M:%S %z' 2>/dev/null || date`\"" > $@
+ echo "\"`date`\"" > $@
HOST: $(top_builddir)/include/brlcad_config.h
- $(ECHO) "\"`hostname`\"" > $@
+ echo "\"`hostname`\"" > $@
PATH: $(top_builddir)/include/brlcad_config.h
- $(ECHO) "\"$(DESTDIR)$(prefix)\"" > $@
+ echo "\"$(DESTDIR)$(prefix)\"" > $@
USER: $(top_builddir)/include/brlcad_config.h
- $(ECHO) "\"`whoami`\"" > $@
+ echo "\"`whoami`\"" > $@
-# updated every time make is invoked for timing the compile
-TS:
- $(ECHO) "\"`LANG=C date -R 2>/dev/null || date +'%a, %d %b %Y %H:%M:%S %z' 2>/dev/null || date`\"" > $@
-
-.PHONY: TS
-
# this causes them to be dependencies on the 'all' target
BUILT_SOURCES = \
COUNT \
DATE \
HOST \
PATH \
- TS \
USER
EXTRA_DIST = \
@@ -43,12 +36,12 @@
DATE \
HOST \
PATH \
- TS \
USER
DISTCLEANFILES = \
$(CLEANFILES) \
- COUNT \
- TS
+ COUNT
+all-am: $(BUILT_SOURCES)
+
include $(top_srcdir)/misc/Makefile.defs
Modified: brlcad/branches/pre-7-12-6/include/config_win.h
===================================================================
--- brlcad/branches/pre-7-12-6/include/config_win.h 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/include/config_win.h 2008-07-31 22:44:57 UTC (rev 32171)
@@ -32,8 +32,8 @@
#ifndef IGNORE_CONFIG_H
#if defined(_WIN32)
-/* !!! this should not be here, should fix the build system settings */
#define __STDC__ 1
+#define USE_PROTOTYPES 1
/* 4244 conversion from type 1 to type 2
* 4305 truncation
Modified: brlcad/branches/pre-7-12-6/include/dm.h
===================================================================
--- brlcad/branches/pre-7-12-6/include/dm.h 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/include/dm.h 2008-07-31 22:44:57 UTC (rev 32171)
@@ -30,9 +30,6 @@
#include "bu.h"
#include "vmath.h"
-
-#define USE_FBSERV 1
-
#ifdef USE_FBSERV
# include "fbserv_obj.h"
#endif
Modified: brlcad/branches/pre-7-12-6/include/raytrace.h
===================================================================
--- brlcad/branches/pre-7-12-6/include/raytrace.h 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/include/raytrace.h 2008-07-31 22:44:57 UTC (rev 32171)
@@ -493,7 +493,7 @@
/* Add a new primitive id above here (this is will break v5 format)
* XXX must update the non-geometric object id's below XXX
*/
-#define ID_MAX_SOLID 41 /**< @brief Maximum defined ID_xxx for solids */
+#define ID_MAX_SOLID 39 /**< @brief Maximum defined ID_xxx for solids */
/*
* Non-geometric objects
@@ -502,16 +502,14 @@
#define ID_BINEXPM 32 /**< @brief Experimental binary */
#define ID_BINUNIF 33 /**< @brief Uniform-array binary */
#define ID_BINMIME 34 /**< @brief MIME-typed binary */
-#define ID_CONSTRAINT 39 /**< @brief Constraint object */
/* XXX - superellipsoid should be 31, but is not v5 compatible */
#define ID_SUPERELL 35 /**< @brief Superquadratic ellipsoid */
#define ID_METABALL 36 /**< @brief Metaball */
#define ID_BREP 37 /**< @brief B-rep object */
#define ID_HYP 38 /**< @brief Hyperboloid of one sheet */
-#define ID_REVOLVE 40 /**< @brief Solid of Revolutin */
-#define ID_MAXIMUM 41 /**< @brief Maximum defined ID_xxx value */
+#define ID_MAXIMUM 39 /**< @brief Maximum defined ID_xxx value */
/**
* M A T E R _ I N F O
@@ -1106,11 +1104,19 @@
struct bu_list l;
int type;
struct db_i * dbip;
+ struct bu_vls wdb_name; /**< @brief database object name */
struct db_tree_state wdb_initial_tree_state;
struct rt_tess_tol wdb_ttol;
struct bn_tol wdb_tol;
struct resource* wdb_resp;
+ /* for catching log messages */
+ struct bu_vls wdb_log;
+
+ void *wdb_result;
+ struct bu_vls wdb_result_str;
+ unsigned int wdb_result_flags;
+
/* variables for name prefixing */
struct bu_vls wdb_prestr;
int wdb_ncharadd;
@@ -1121,12 +1127,8 @@
int wdb_air_default;
int wdb_mat_default;/**< @brief GIFT material code */
int wdb_los_default;/**< @brief Line-of-sight estimate */
-
- /* These members are marked for removal */
- struct bu_vls wdb_name; /**< @brief database object name */
struct bu_observer wdb_observers;
Tcl_Interp * wdb_interp;
-
};
#define RT_CHECK_WDB(_p) BU_CKMAG(_p, RT_WDB_MAGIC, "rt_wdb")
@@ -1258,7 +1260,7 @@
};
#define RT_CK_PIECELIST(_p) BU_CKMAG(_p, RT_PIECELIST_MAGIC, "struct rt_piecelist")
-/* Used to set globals declared in bot.c */
+/* Used to set globals declared in g_bot.c */
#define RT_DEFAULT_MINPIECES 32
#define RT_DEFAULT_TRIS_PER_PIECE 4
@@ -1732,8 +1734,7 @@
/**
* R T _ P T _ N O D E
*
- * Used by rpc.c, ehy.c, epa.c, eto.c and rhc.c
- * to contain forward-linked lists of points.
+ * Used by g_rpc.c and others to contain forward-linked lists of points.
*/
struct rt_pt_node {
point_t p; /**< @brief a point */
@@ -1784,58 +1785,6 @@
};
/**
- * Structures required for describing Parameters, parameter sets
- */
-
-/* To be removed */
-struct pc_parameter {
- char *name;
- int parametrized;
- fastf_t value;
- fastf_t min;
- fastf_t max;
- fastf_t step;
-};
-
-/* To be removed */
-struct pc_param_set {
- long len;
- struct pc_parameter * p;
-};
-
-/**
- * A composite set of parameters constraints with respect to those
- * parameters. Used for declaration by each geometry object
- */
-struct pc_p_set {
- char pname[10];
- enum ptype {
- pc_value,
- pc_point,
- pc_vector
- } ptype;
- union {
- fastf_t *valuep;
- pointp_t pointp;
- vectp_t vectorp;
- } pval;
-};
-struct pc_c_set {
- char cname[10];
- enum ctype {
- pc_inequality,
- pc_equation
- } ctype;
- int n;
-};
-struct pc_pc_set {
- int n_params;
- int n_constraints;
- struct pc_p_set * ps;
- struct pc_c_set * cs;
-};
-
-/**
* R T _ F U N C T A B
*
* Object-oriented interface to BRL-CAD geometry.
@@ -1946,18 +1895,27 @@
const struct bu_structparse *ft_parsetab; /**< @brief rt_xxx_parse */
size_t ft_internal_size; /**< @brief sizeof(struct rt_xxx_internal) */
unsigned long ft_internal_magic; /**< @brief RT_XXX_INTERNAL_MAGIC */
- int (*ft_get) BU_ARGS((struct bu_vls *,
- const struct rt_db_internal *, const char *item));
- int (*ft_adjust) BU_ARGS((struct bu_vls *,
- struct rt_db_internal *,
- int /*argc*/, char ** /*argv*/,
- struct resource * /*resp*/));
- int (*ft_form) BU_ARGS((struct bu_vls *,
- const struct rt_functab *));
-
+#if defined(TCL_OK)
+ int (*ft_tclget) BU_ARGS((Tcl_Interp *,
+ const struct rt_db_internal *, const char *item));
+ int (*ft_tcladjust) BU_ARGS((Tcl_Interp *,
+ struct rt_db_internal *,
+ int /*argc*/, char ** /*argv*/,
+ struct resource * /*resp*/));
+ int (*ft_tclform) BU_ARGS((const struct rt_functab *,
+ Tcl_Interp *));
+#else
+ int (*ft_tclget) BU_ARGS((genptr_t /*interp*/,
+ const struct rt_db_internal *, const char *item));
+ int (*ft_tcladjust) BU_ARGS((genptr_t /*interp*/,
+ struct rt_db_internal *,
+ int /*argc*/, char ** /*argv*/,
+ struct resource * /*resp*/));
+ int (*ft_tclform) BU_ARGS((const struct rt_functab *,
+ genptr_t /*interp*/));
+#endif
void (*ft_make) BU_ARGS((const struct rt_functab *,
struct rt_db_internal *, double /*diameter*/));
- int (*ft_params) BU_ARGS((struct pc_pc_set *,const struct rt_db_internal */*ip*/));
};
RT_EXPORT extern const struct rt_functab rt_functab[];
@@ -2540,19 +2498,9 @@
genptr_t gp,
int id,
double local2mm));
-RT_EXPORT BU_EXTERN(void wdb_init,
- (struct rt_wdb *wdbp,
- struct db_i *dbip,
- int mode));
RT_EXPORT BU_EXTERN(void wdb_close,
(struct rt_wdb *wdbp));
-RT_EXPORT BU_EXTERN(int wdb_import_from_path,
- (struct bu_vls *log,
- struct rt_db_internal *ip,
- const char *path,
- struct rt_wdb *wdb));
-
/* db_anim.c */
RT_EXPORT BU_EXTERN(struct animate *db_parse_1anim,
(struct db_i *dbip,
@@ -2846,12 +2794,12 @@
int subtreecount,
struct resource *resp));
-/* tgc.c */
+/* g_tgc.c */
RT_EXPORT BU_EXTERN(void rt_pt_sort,
(register fastf_t t[],
int npts));
-/* ell.c */
+/* g_ell.c */
RT_EXPORT BU_EXTERN(void rt_ell_16pts,
(register fastf_t *ov,
register fastf_t *V,
@@ -2961,7 +2909,7 @@
struct resource *resp,
const int minor_type));
-/* extrude.c */
+/* g_extrude.c */
RT_EXPORT BU_EXTERN(int rt_extrude_import5,
(struct rt_db_internal *ip,
const struct bu_external *ep,
@@ -3298,7 +3246,7 @@
struct db_traverse *dtp));
*/
-/* arb.c */
+/* g_arb.c */
RT_EXPORT BU_EXTERN(int rt_arb_get_cgtype,
()); /* needs rt_arb_internal for arg list */
RT_EXPORT BU_EXTERN(int rt_arb_std_type,
@@ -3348,7 +3296,7 @@
RT_EXPORT extern short earb5[9][18];
RT_EXPORT extern short earb4[5][18];
-/* epa.c */
+/* g_epa.c */
RT_EXPORT BU_EXTERN(void rt_ell,
(fastf_t *ov,
const fastf_t *V,
@@ -3356,7 +3304,7 @@
const fastf_t *B,
int sides));
-/* pipe.c */
+/* g_pipe.c */
RT_EXPORT BU_EXTERN(void rt_vls_pipept,
(struct bu_vls *vp,
int seg_no,
@@ -3367,7 +3315,7 @@
RT_EXPORT BU_EXTERN(int rt_pipe_ck,
(const struct bu_list *headp));
-/* metaball.c */
+/* g_metaball.c */
struct rt_metaball_internal;
RT_EXPORT BU_EXTERN(void rt_vls_metaballpt,
(struct bu_vls *vp,
@@ -3386,7 +3334,7 @@
RT_EXPORT BU_EXTERN(const char *rt_metaball_lookup_type_name,
(const int id));
-/* rpc.c */
+/* g_rpc.c */
RT_EXPORT BU_EXTERN(int rt_mk_parabola,
(struct rt_pt_node *pts,
fastf_t r,
@@ -3428,12 +3376,12 @@
int g,
int b));
-/* ars.c */
+/* g_ars.c */
RT_EXPORT BU_EXTERN(void rt_hitsort,
(struct hit h[],
int nh));
-/* pg.c */
+/* g_pg.c */
RT_EXPORT BU_EXTERN(int rt_pg_to_bot,
(struct rt_db_internal *ip,
const struct bn_tol *tol,
@@ -3449,12 +3397,12 @@
const struct rt_tess_tol *ttol,
const struct bn_tol *tol));
-/* hf.c */
+/* g_hf.c */
RT_EXPORT BU_EXTERN(int rt_hf_to_dsp,
(struct rt_db_internal *db_intern,
struct resource *resp));
-/* dsp.c */
+/* g_dsp.c */
RT_EXPORT BU_EXTERN(int dsp_pos,
(point_t out,
struct soltab *stp,
@@ -3668,7 +3616,7 @@
double mm2local));
#ifdef __RTGEOM_H__
-/* sketch.c */
+/* g_sketch.c */
RT_EXPORT BU_EXTERN(void rt_sketch_ifree,
(struct rt_db_internal *ip));
RT_EXPORT BU_EXTERN(int curve_to_vlist,
@@ -3681,9 +3629,9 @@
struct curve *crv));
RT_EXPORT BU_EXTERN(int rt_check_curve,
- (const struct curve *crv,
- const struct rt_sketch_internal *skt,
- int noisy));
+ (struct curve *crv,
+ struct rt_sketch_internal *skt,
+ int noisey));
RT_EXPORT BU_EXTERN(void rt_curve_reverse_segment,
(long *lng));
@@ -3694,6 +3642,10 @@
(struct curve *crv_out,
const struct curve *crv_in));
+RT_EXPORT BU_EXTERN(int rt_check_curve,
+ (struct curve *crv,
+ struct rt_sketch_internal *skt,
+ int noisey));
RT_EXPORT BU_EXTERN(void rt_curve_free,
(struct curve *crv));
RT_EXPORT BU_EXTERN(void rt_copy_curve,
@@ -4631,7 +4583,7 @@
const fastf_t tol_coll,
const fastf_t min_angle));
-/* bot.c */
+/* g_bot.c */
RT_EXPORT BU_EXTERN(int rt_bot_edge_in_list,
(const int v1,
const int v2,
@@ -4702,11 +4654,11 @@
RT_EXPORT BU_EXTERN(char *nmg_manifolds,
(struct model *m));
-/* nmg.c */
+/* g_nmg.c */
RT_EXPORT BU_EXTERN(int nmg_ray_segs,
(struct ray_data *rd));
-/* torus.c */
+/* g_torus.c */
RT_EXPORT BU_EXTERN(int rt_num_circular_segments,
(double maxerr,
double radius));
@@ -4779,7 +4731,7 @@
int *array_len));
-/* rhc.c */
+/* g_rhc.c */
RT_EXPORT BU_EXTERN(int rt_mk_hyperbola,
(struct rt_pt_node *pts,
fastf_t r,
@@ -5859,15 +5811,15 @@
/* XXX do not rely on *_ifree() functions, why are these needed? */
#ifdef _RT_DECL_IFREE
-/* defined in dsp.c */
+/* defined in g_dsp.c */
RT_EXPORT BU_EXTERN(void rt_dsp_ifree,
(struct rt_db_internal *ip));
-/* defined in ebm.c */
+/* defined in g_ebm.c */
RT_EXPORT BU_EXTERN(void rt_ebm_ifree,
(struct rt_db_internal *ip));
-/* defined in vol.c */
+/* defined in g_vol.c */
RT_EXPORT BU_EXTERN(void rt_vol_ifree,
(struct rt_db_internal *ip));
#endif
@@ -5878,10 +5830,10 @@
RT_EXPORT BU_EXTERN(void rt_binunif_dump,
(struct rt_binunif_internal *bip));
-/* defined in cline.c */
+/* defined in g_cline.c */
RT_EXPORT extern fastf_t rt_cline_radius;
-/* defined in bot.c */
+/* defined in g_bot.c */
RT_EXPORT extern int rt_bot_minpieces;
RT_EXPORT extern int rt_bot_tri_per_piece;
#ifdef __RTGEOM_H__
@@ -5895,14 +5847,7 @@
fastf_t min_edge_length));
#endif
-/* defined in pc_constraint.c */
-RT_EXPORT BU_EXTERN(int pc_constraint_export,(struct bu_external *ep, const struct rt_db_internal *ip, double local2mm,\
- const struct db_i *dbip, struct resource *resp));
-RT_EXPORT BU_EXTERN(int pc_constraint_import,(struct rt_db_internal *ip, const struct bu_external *ep, \
- const mat_t mat, const struct db_i *dbip, struct resource *resp, const int minor_type));
-RT_EXPORT BU_EXTERN(void pc_constraint_ifree,(struct rt_db_internal *ip, struct resource *resp));
-
/*
* Constants provided and used by the RT library.
*/
Modified: brlcad/branches/pre-7-12-6/include/tclcad.h
===================================================================
--- brlcad/branches/pre-7-12-6/include/tclcad.h 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/include/tclcad.h 2008-07-31 22:44:57 UTC (rev 32171)
@@ -33,11 +33,9 @@
#define __TCLCAD_H__
#include "common.h"
+
#include "tcl.h"
-#include "ged.h"
-#include "fbserv_obj.h"
-
__BEGIN_DECLS
#ifndef TCLCAD_EXPORT
@@ -66,48 +64,12 @@
# define TCLCAD_ARGS(args) ()
#endif
-#define GED_OBJ_NUM_VIEWS 4
-#define GED_OBJ_FB_MODE_OFF 0
-#define GED_OBJ_FB_MODE_UNDERLAY 1
-#define GED_OBJ_FB_MODE_INTERLAY 2
-#define GED_OBJ_FB_MODE_OVERLAY 3
-struct ged_dm_view {
- struct bu_list l;
- struct bu_vls gdv_name;
- struct ged_view *gdv_view;
- struct dm *gdv_dmp;
- struct fbserv_obj gdv_fbs;
- struct ged_obj *gdv_gop; /* Pointer back to its ged object */
-};
-
-struct ged_obj {
- struct bu_list l;
- struct ged *go_gedp;
-#if 1
- struct ged_dm_view go_head_views;
-#else
- struct ged_view *go_views[GED_OBJ_NUM_VIEWS];
- struct dm *go_dmp;
-#endif
- struct bu_vls go_name;
- struct bu_observer go_observers;
- Tcl_Interp *go_interp;
-};
-
-#define GED_OBJ_NULL (struct ged_obj *)0
-
-
TCLCAD_EXPORT TCLCAD_EXTERN(int tclcad_tk_setup, (Tcl_Interp *interp));
TCLCAD_EXPORT TCLCAD_EXTERN(void tclcad_auto_path, (Tcl_Interp *interp));
TCLCAD_EXPORT TCLCAD_EXTERN(void tclcad_tcl_library, (Tcl_Interp *interp));
TCLCAD_EXPORT TCLCAD_EXTERN(int Tclcad_Init, (Tcl_Interp *interp));
-/* defined in tcl.c */
-TCLCAD_EXPORT BU_EXTERN(int Go_Init,
- (Tcl_Interp *interp));
-
-
__END_DECLS
#endif /* __TCLCAD_H__ */
Modified: brlcad/branches/pre-7-12-6/include/vmath.h
===================================================================
--- brlcad/branches/pre-7-12-6/include/vmath.h 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/include/vmath.h 2008-07-31 22:44:57 UTC (rev 32171)
@@ -587,10 +587,6 @@
(a)[_vadd3] = (b)[_vadd3] + (c)[_vadd3] + (d)[_vadd3]; \
}
-#define V2ADD3(a, b, c, d) { \
- (a)[X] = (b)[X] + (c)[X] + (d)[X];\
- (a)[Y] = (b)[Y] + (c)[Y] + (d)[Y];}
-
/** @brief Add 4 vectors at `b', `c', `d', and `e', store result at `a' */
#ifdef SHORT_VECTORS
#define VADD4(a, b, c, d, e) VADD4N(a, b, c, d, e, 3)
Modified: brlcad/branches/pre-7-12-6/misc/win32-msvc/CMakeLists.txt
===================================================================
--- brlcad/branches/pre-7-12-6/misc/win32-msvc/CMakeLists.txt 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/misc/win32-msvc/CMakeLists.txt 2008-07-31 22:44:57 UTC (rev 32171)
@@ -25,4 +25,3 @@
# buld tools
add_subdirectory(../../src/conv .)
add_subdirectory(../../src/conv/3dm .)
-add_subdirectory(../../src/conv/patch .)
Modified: brlcad/branches/pre-7-12-6/misc/win32-msvc/Dll/CMakeLists.txt
===================================================================
--- brlcad/branches/pre-7-12-6/misc/win32-msvc/Dll/CMakeLists.txt 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/misc/win32-msvc/Dll/CMakeLists.txt 2008-07-31 22:44:57 UTC (rev 32171)
@@ -43,7 +43,7 @@
# build the BrlcadCore.dll
set(BRLCADCORE_SOURCES
- BrlcadCore.def
+ brlcad.def
BrlcadCore.rc
)
Modified: brlcad/branches/pre-7-12-6/misc/win32-msvc8/libdm/libdm.vcproj
===================================================================
--- brlcad/branches/pre-7-12-6/misc/win32-msvc8/libdm/libdm.vcproj 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/misc/win32-msvc8/libdm/libdm.vcproj 2008-07-31 22:44:57 UTC (rev 32171)
@@ -52,7 +52,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../include;../../../src/other/libz;../../../src/other/libpng;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/tk/generic;../../../src/other/tk/win;../../../src/other/tk/xlib"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DM_EXPORT_DLL;DM_WGL;IF_WGL;IF_REMOTE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DM_EXPORT_DLL;DM_WGL;IF_WGL;IF_REMOTE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;USE_FBSERV;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
@@ -154,7 +154,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../include;../../../src/other/libz;../../../src/other/libpng;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/tk/generic;../../../src/other/tk/win;../../../src/other/tk/xlib"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DM_EXPORT_DLL;DM_WGL;IF_WGL;IF_REMOTE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DM_EXPORT_DLL;DM_WGL;IF_WGL;IF_REMOTE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;USE_FBSERV;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
Modified: brlcad/branches/pre-7-12-6/misc/win32-msvc8/libtclcad/libtclcad.vcproj
===================================================================
--- brlcad/branches/pre-7-12-6/misc/win32-msvc8/libtclcad/libtclcad.vcproj 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/misc/win32-msvc8/libtclcad/libtclcad.vcproj 2008-07-31 22:44:57 UTC (rev 32171)
@@ -53,7 +53,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../include;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/tk/generic;../../../src/other/tk/win;../../../src/other/tk/bitmaps;../../../src/other/tk/xlib;../../../src/other/incrTcl/itcl/generic;../../../src/other/incrTcl/itk/generic;../../../src/other/blt/src"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TCLCAD_EXPORT_DLL;DM_WGL;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;IF_WGL;IF_REMOTE;_CRT_SECURE_NO_WARNINGS;inline=__inline"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TCLCAD_EXPORT_DLL;DM_WGL;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS;inline=__inline"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
@@ -83,7 +83,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="imm32.lib comctl32.lib tcl85.lib tk85.lib itcl34.lib itk34.lib libbu.lib libbn.lib librt.lib libfb.lib libdm.lib BLT24.lib libged.lib"
+ AdditionalDependencies="imm32.lib comctl32.lib tcl85.lib tk85.lib itcl34.lib itk34.lib libbu.lib libbn.lib librt.lib libfb.lib libdm.lib BLT24.lib"
OutputFile=".\$(PlatformName)\$(ConfigurationName)/libtclcad.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -230,10 +230,6 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
>
<File
- RelativePath="..\..\..\src\libtclcad\ged_obj.c"
- >
- </File>
- <File
RelativePath="..\..\..\src\libtclcad\tclcad.c"
>
</File>
Modified: brlcad/branches/pre-7-12-6/misc/win32-msvc8/mged/mged.vcproj
===================================================================
--- brlcad/branches/pre-7-12-6/misc/win32-msvc8/mged/mged.vcproj 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/misc/win32-msvc8/mged/mged.vcproj 2008-07-31 22:44:57 UTC (rev 32171)
@@ -48,7 +48,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../include;../../../src/mged;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/tk/generic;../../../src/other/tk/xlib;../../../src/other/incrTcl/itcl/generic;../../../src/other/incrTcl/itk/generic"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;DM_WGL;IF_WGL;_CRT_SECURE_NO_WARNINGS"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;DM_WGL;IF_WGL;USE_FBSERV;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
@@ -147,7 +147,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../include;../../../src/mged;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/tk/generic;../../../src/other/tk/xlib;../../../src/other/incrTcl/itcl/generic;../../../src/other/incrTcl/itk/generic"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;DM_WGL;IF_WGL;_CRT_SECURE_NO_WARNINGS;TCL_CFG_DO64BIT;STDC_HEADERS;_stati64=_stat64"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TCL_THREADS=1;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;DM_WGL;IF_WGL;USE_FBSERV;_CRT_SECURE_NO_WARNINGS;TCL_CFG_DO64BIT;STDC_HEADERS;_stati64=_stat64"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
Modified: brlcad/branches/pre-7-12-6/regress/gqa.sh
===================================================================
--- brlcad/branches/pre-7-12-6/regress/gqa.sh 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/regress/gqa.sh 2008-07-31 22:44:57 UTC (rev 32171)
@@ -1,7 +1,7 @@
#!/bin/sh
-LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$LD_LIBRARY_PATH
-DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$DYLD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$DYLD_LIBRARY_PATH
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH
rm -f gqa.g density_table.txt gqa.log gqa_mged.log gqa.mged
Modified: brlcad/branches/pre-7-12-6/regress/iges.sh
===================================================================
--- brlcad/branches/pre-7-12-6/regress/iges.sh 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/regress/iges.sh 2008-07-31 22:44:57 UTC (rev 32171)
@@ -1,7 +1,7 @@
#!/bin/sh
-LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$LD_LIBRARY_PATH
-DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$DYLD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$DYLD_LIBRARY_PATH
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH
rm -f iges.log iges.g iges_file.iges iges_stdout_new.g iges_new.g iges_stdout.iges iges_file.iges
Modified: brlcad/branches/pre-7-12-6/regress/lights.sh
===================================================================
--- brlcad/branches/pre-7-12-6/regress/lights.sh 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/regress/lights.sh 2008-07-31 22:44:57 UTC (rev 32171)
@@ -1,7 +1,7 @@
#!/bin/sh
-LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$LD_LIBRARY_PATH
-DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$DYLD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$DYLD_LIBRARY_PATH
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH
rm -f lights.pix
Modified: brlcad/branches/pre-7-12-6/regress/mged.sh
===================================================================
--- brlcad/branches/pre-7-12-6/regress/mged.sh 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/regress/mged.sh 2008-07-31 22:44:57 UTC (rev 32171)
@@ -50,10 +50,6 @@
FAILED=0
-LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$LD_LIBRARY_PATH
-DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$DYLD_LIBRARY_PATH
-export LD_LIBRARY_PATH DYLD_LIBRARY_PATH
-
# test all commands
echo "testing mged commands..."
Modified: brlcad/branches/pre-7-12-6/regress/moss.sh
===================================================================
--- brlcad/branches/pre-7-12-6/regress/moss.sh 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/regress/moss.sh 2008-07-31 22:44:57 UTC (rev 32171)
@@ -1,7 +1,7 @@
#!/bin/sh
-LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$LD_LIBRARY_PATH
-DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$DYLD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$DYLD_LIBRARY_PATH
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH
rm -f moss.pix moss.log moss.png moss2.pix
Modified: brlcad/branches/pre-7-12-6/regress/shaders.sh
===================================================================
--- brlcad/branches/pre-7-12-6/regress/shaders.sh 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/regress/shaders.sh 2008-07-31 22:44:57 UTC (rev 32171)
@@ -1,7 +1,7 @@
#!/bin/sh
-LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$LD_LIBRARY_PATH
-DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$DYLD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$DYLD_LIBRARY_PATH
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH
EAGLECAD=eagleCAD-512x438.pix
Modified: brlcad/branches/pre-7-12-6/regress/solids.sh
===================================================================
--- brlcad/branches/pre-7-12-6/regress/solids.sh 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/regress/solids.sh 2008-07-31 22:44:57 UTC (rev 32171)
@@ -1,7 +1,7 @@
#!/bin/sh
-LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$LD_LIBRARY_PATH
-DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$DYLD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$DYLD_LIBRARY_PATH
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH
rm -f dsp.dat ebm.bw solids.rt solids.g solids.log solids.rt.pix solids.pix.diff solids.mged
Modified: brlcad/branches/pre-7-12-6/regress/spdi.sh
===================================================================
--- brlcad/branches/pre-7-12-6/regress/spdi.sh 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/regress/spdi.sh 2008-07-31 22:44:57 UTC (rev 32171)
@@ -1,7 +1,7 @@
#!/bin/sh
-LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$LD_LIBRARY_PATH
-DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$DYLD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$DYLD_LIBRARY_PATH
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH
rm -f spdi.g spdi.log spdi spdi.pix spdi_mged.log spdi.mged
Modified: brlcad/branches/pre-7-12-6/regress/weight.sh
===================================================================
--- brlcad/branches/pre-7-12-6/regress/weight.sh 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/regress/weight.sh 2008-07-31 22:44:57 UTC (rev 32171)
@@ -1,8 +1,7 @@
-
#!/bin/sh
-LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$LD_LIBRARY_PATH
-DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$DYLD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=../src/other/tcl/unix:../src/other/tk/unix:$$DYLD_LIBRARY_PATH
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH
TOP_SRCDIR=$1
Deleted: brlcad/branches/pre-7-12-6/sh/cmakecheck.sh
===================================================================
--- brlcad/branches/pre-7-12-6/sh/cmakecheck.sh 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/sh/cmakecheck.sh 2008-07-31 22:44:57 UTC (rev 32171)
@@ -1,80 +0,0 @@
-#!/bin/sh
-# C M A K E C H E C K . S H
-# BRL-CAD
-#
-# Copyright (c) 2008 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-#
-# This is a simple helper script to check whether the CMakeLists.txt
-# files are in sync with the Makefile.am files.
-#
-###
-
-
-for dir in src/libbn src/libbu src/libged src/librt src/libsysv src/libwdb ; do
-
- if test ! -f $dir/CMakeLists.txt ; then
- echo "ERROR: cannot find $dir/CMakeLists.txt"
- exit 1
- fi
-
- # get a list of all the source files listed in CMakeLists.txt
- cmfiles="`cat $dir/CMakeLists.txt | sed '/set([A-Z_]*SOURCES/,/)/{s/[[:space:]]*\(.*\)[[:space:]]*/::\1/;}' | grep -v '[)(}{]' | grep '::' | sed 's/:://' | sort | uniq`"
-
- if test ! -f $dir/Makefile.am ; then
- echo "ERROR: cannot find $dir/Makefile.am"
- exit 1
- fi
-
- # get a list of all the source files listed in Makefile.am
- amfiles="`cat $dir/Makefile.am | perl -pi -e 's/\\\\\n//g' | grep \"^[a-zA-Z_]*SOURCES\" | sed 's/.*SOURCES[[:space:]]*=[[:space:]]*//;/[{(]/d' | sort | uniq`"
-
- for file in $amfiles ; do
- result="`echo \"$cmfiles\" | grep $file`"
- if test "x$result" = "x" ; then
- echo "MISSING from $dir/CMakeLists.txt: $file"
- fi
- done
-
-done
-
-
-
-# Local Variables:
-# tab-width: 8
-# mode: sh
-# sh-indentation: 4
-# sh-basic-offset: 4
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=4 tabstop=8
Modified: brlcad/branches/pre-7-12-6/sh/elapsed.sh
===================================================================
--- brlcad/branches/pre-7-12-6/sh/elapsed.sh 2008-07-31 21:10:58 UTC (rev 32170)
+++ brlcad/branches/pre-7-12-6/sh/elapsed.sh 2008-07-31 22:44:57 UTC (rev 32171)
@@ -42,10 +42,9 @@
#
# sh elapsed.sh 12 03 24
# or
-# sh elapsed.sh `date`
-# or
-# some_date=`date -R` sh elapsed.sh $some_date
-# etc.
+# some_date=`date`
+# ..
+# sh elapsed.sh $some_date
#
# Alternatively, the script can be used as a utility function in
# scripts. With the --seconds argument, the number of seconds that
@@ -65,62 +64,34 @@
# Author -
# Christopher Sean Morrison
#
-###
+# $(#)$Header$ (BRL)
ARGS="$*"
ARG_1="$1"
ARG_2="$2"
ARG_4="$4"
-ARG_5="$5"
CONFIG_TIME="$ARGS"
-if test "x$ONLY_SECONDS" = "x" ; then
- ONLY_SECONDS=
+ONLY_SECONDS=no
+case "x$ARG_1" in
+ x-[sS]) ONLY_SECONDS=yes ; shift ;;
+ x--[sS]) ONLY_SECONDS=yes ; shift ;;
+ x-[sS][eE][cC][oO][nN][dD][sS]) ONLY_SECONDS=yes ; shift ;;
+ x--[sS][eE][cC][oO][nN][dD][sS]) ONLY_SECONDS=yes ; shift ;;
+ x-*) usage="Usage: $0 time"
+ echo "$usage" 1>&2
+ echo "Unrecognized option [$1]"
+ exit 1
+ ;;
+esac
+if test "x$ONLY_SECONDS" = "xyes" ; then
+ ARGS="$*"
+ ARG_1="$1"
+ ARG_2="$2"
+ ARG_4="$4"
+ CONFIG_TIME="$ARGS"
fi
-if test "x$DEBUG" = "x" ; then
- DEBUG=
-fi
-for arg in $ARGS ; do
- case "x$arg" in
- x-[sS]) ONLY_SECONDS=yes ; shift ;;
- x--[sS]) ONLY_SECONDS=yes ; shift ;;
- x-[sS][eE][cC][oO][nN][dD][sS]) ONLY_SECONDS=yes ; shift ;;
- x--[sS][eE][cC][oO][nN][dD][sS]) ONLY_SECONDS=yes ; shift ;;
- x-[dD]) DEBUG=yes ; shift ;;
- x--[dD]) DEBUG=yes ; shift ;;
- x-[dD][eE][bB][uU][gG]) DEBUG=yes ; shift ;;
- x--[dD][eE][bB][uU][gG]) DEBUG=yes ; shift ;;
- x-*)
- echo "Usage: $0 [-s|--seconds] [-d|--debug] {RFC 2822 DATE | UNIX DATE | HOUR MIN SEC | SECONDS}" 1>&2
- echo "Unrecognized option [$1]"
- exit 1
- ;;
- x*)
- break
- ;;
- esac
-done
-
-# done processing args, reset indices after shifting
-ARGS="$*"
-ARG_1="$1"
-ARG_2="$2"
-ARG_4="$4"
-ARG_5="$5"
-CONFIG_TIME="$ARGS"
-
-if test "x$DEBUG" = "xyes" ; then
- echo "Debug output is enabled (DEBUG=[yes])"
- echo "ARGS=[$ARGS]"
- echo "ARG_1=[$ARG_1]"
- echo "ARG_2=[$ARG_2]"
- echo "ARG_4=[$ARG_4]"
- echo "ARG_5=[$ARG_5]"
- echo "CONFIG_TIME=[$CONFIG_TIME]"
- echo "ONLY_SECONDS=[$ONLY_SECONDS]"
-fi
-
# force locale setting to C so things like date output as expected
LC_ALL=C
@@ -136,23 +107,9 @@
CONFIG_TIME="`echo $ARGS | tr : ' '`"
fi
-# check if this is a standard unix or iso date string based on length
-if test `echo $ARGS | wc | awk '{print $2}'` -eq 6 ; then
- if test `echo $ARGS | awk '{print $4}' | tr : ' ' | wc | awk '{print $2}'` -eq 3 ; then
- if test "x$DEBUG" = "xyes" ; then
- echo "ARGS appears to be a UNIX date string"
- fi
- CONFIG_TIME="`echo $ARGS | awk '{print $4}' | tr : ' '`"
- elif test `echo $ARGS | awk '{print $5}' | tr : ' ' | wc | awk '{print $2}'` -eq 3 ; then
- if test "x$DEBUG" = "xyes" ; then
- ...
[truncated message content] |