Revision: 41990
http://brlcad.svn.sourceforge.net/brlcad/?rev=41990&view=rev
Author: starseeker
Date: 2011-01-06 21:01:03 +0000 (Thu, 06 Jan 2011)
Log Message:
-----------
Update cmake branch to trunk r41989
Modified Paths:
--------------
brlcad/branches/cmake/doc/deprecation.txt
brlcad/branches/cmake/include/bu.h
brlcad/branches/cmake/sh/conversion.sh
brlcad/branches/cmake/src/adrt/libtie/tie.h
brlcad/branches/cmake/src/adrt/libtie/tie0.c
brlcad/branches/cmake/src/util/dbcp.1
brlcad/branches/cmake/src/util/dbcp.c
Modified: brlcad/branches/cmake/doc/deprecation.txt
===================================================================
--- brlcad/branches/cmake/doc/deprecation.txt 2011-01-06 20:31:39 UTC (rev
41989)
+++ brlcad/branches/cmake/doc/deprecation.txt 2011-01-06 21:01:03 UTC (rev
41990)
@@ -47,6 +47,8 @@
7.18
----
+dbcp
+ dbcp -> dd [deprecated 7.18]
mged
?(*) -> ? -(*)
apropos(*) -> apropos -(*)
Modified: brlcad/branches/cmake/include/bu.h
===================================================================
--- brlcad/branches/cmake/include/bu.h 2011-01-06 20:31:39 UTC (rev 41989)
+++ brlcad/branches/cmake/include/bu.h 2011-01-06 21:01:03 UTC (rev 41990)
@@ -6156,7 +6156,16 @@
/** @} */
+/** @addtogroup file */
+/** @{ */
+/** @file timer.c
+ * Return microsecond accuracy time information.
+ */
+BU_EXPORT BU_EXTERN(int64_t bu_gettime, ());
+/** @} */
+
+
__END_DECLS
#endif /* __BU_H__ */
Modified: brlcad/branches/cmake/sh/conversion.sh
===================================================================
--- brlcad/branches/cmake/sh/conversion.sh 2011-01-06 20:31:39 UTC (rev
41989)
+++ brlcad/branches/cmake/sh/conversion.sh 2011-01-06 21:01:03 UTC (rev
41990)
@@ -534,14 +534,14 @@
$ECHO
$ECHO "Summary:"
$ECHO
-$ECHO " Files: %ld" $files
-$ECHO " Objects: %ld" $count
-$ECHO "Failures: %ld NMG, %ld BoT" $nmg_fail $bot_fail
-$ECHO "NMG conversion: %.1f%% (%ld of %ld objects)" $nmg_percent $nmg_count
$count
-$ECHO "BoT conversion: %.1f%% (%ld of %ld objects)" $bot_percent $bot_count
$count
+$ECHO " Files: %.0f" $files
+$ECHO " Objects: %.0f" $count
+$ECHO "Failures: %.0f NMG, %.0f BoT" $nmg_fail $bot_fail
+$ECHO "NMG conversion: %.1f%% (%.0f of %.0f objects)" $nmg_percent
$nmg_count $count
+$ECHO "BoT conversion: %.1f%% (%.0f of %.0f objects)" $bot_percent
$bot_count $count
$ECHO " Success rate: %.1f%%" $rate
$ECHO
-$ECHO "Elapsed: %d seconds" $elp
+$ECHO "Elapsed: %.0f seconds" $elp
$ECHO "Average: %.1f seconds per object" $avg
$ECHO
$ECHO "Finished running $THIS on `date`"
Modified: brlcad/branches/cmake/src/adrt/libtie/tie.h
===================================================================
--- brlcad/branches/cmake/src/adrt/libtie/tie.h 2011-01-06 20:31:39 UTC (rev
41989)
+++ brlcad/branches/cmake/src/adrt/libtie/tie.h 2011-01-06 21:01:03 UTC (rev
41990)
@@ -173,7 +173,7 @@
#define tie_kdtree_prep TIE_VAL(tie_kdtree_prep)
#define TIE_PREC TIE_VAL(TIE_PREC)
-TIE_EXPORT extern int tie_check_degenerate;
+TIE_EXPORT BU_EXTERN(int tie_check_degenerate,);
TIE_EXPORT BU_EXTERN(void TIE_VAL(tie_init), (tie_t *tie, unsigned int
tri_num, unsigned int kdmethod));
TIE_EXPORT BU_EXTERN(void TIE_VAL(tie_free), (tie_t *tie));
Modified: brlcad/branches/cmake/src/adrt/libtie/tie0.c
===================================================================
--- brlcad/branches/cmake/src/adrt/libtie/tie0.c 2011-01-06 20:31:39 UTC
(rev 41989)
+++ brlcad/branches/cmake/src/adrt/libtie/tie0.c 2011-01-06 21:01:03 UTC
(rev 41990)
@@ -23,9 +23,14 @@
*
*/
#include <bu.h>
+#include "tie.h"
-BU_EXPORT int tie_check_degenerate = 0;
+TIE_EXPORT int tie_check_degenerate = 0;
+#ifdef TIE_PRECISION
+# undef TIE_PRECISION
+#endif
+
#define TIE_PRECISION 0
#include "./tie.c"
#undef TIE_PRECISION
Modified: brlcad/branches/cmake/src/util/dbcp.1
===================================================================
--- brlcad/branches/cmake/src/util/dbcp.1 2011-01-06 20:31:39 UTC (rev
41989)
+++ brlcad/branches/cmake/src/util/dbcp.1 2011-01-06 21:01:03 UTC (rev
41990)
@@ -48,6 +48,9 @@
.SH DESCRIPTION
.I dbcp
is a program for copying data rapidly between devices.
+.PP
+This command is DEPRECATED. Use 'dd' instead.
+.PP
While the primary application is to move data between raw devices such as
tape and disk, it can also be used with pipes.
No special support is required from the operating system;
Modified: brlcad/branches/cmake/src/util/dbcp.c
===================================================================
--- brlcad/branches/cmake/src/util/dbcp.c 2011-01-06 20:31:39 UTC (rev
41989)
+++ brlcad/branches/cmake/src/util/dbcp.c 2011-01-06 21:01:03 UTC (rev
41990)
@@ -78,17 +78,23 @@
char msgchar;
pipefds par2chld, chld2par;
int c;
+ int deprecated = 1;
while ((c = bu_getopt(argc, argv, "v")) != EOF) {
switch (c) {
case 'v':
verbose++;
break;
+ case 'D':
+ deprecated=0;
default:
bu_exit(1, "%s", usage);
}
}
+ if (deprecated)
+ bu_log("DEPRECATED: dbcp is no longer being maintained. Please contact
the developers if you use this tool. Use -D to suppress this message.\n");
+
if (bu_optind >= argc) {
bu_exit(2, "%s", usage);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
