[brlcad-commits] SF.net SVN: brlcad:[33336] brlcad/trunk/AUTHORS
Revision: 6 http://brlcad.svn.sourceforge.net/brlcad/?rev=6view=rev Author: brlcad Date: 2008-12-10 20:29:15 + (Wed, 10 Dec 2008) Log Message: --- ben's okay with it, include the name Modified Paths: -- brlcad/trunk/AUTHORS Modified: brlcad/trunk/AUTHORS === --- brlcad/trunk/AUTHORS2008-12-10 18:38:14 UTC (rev 5) +++ brlcad/trunk/AUTHORS2008-12-10 20:29:15 UTC (rev 6) @@ -435,6 +435,7 @@ 2008 July ARL Student Hire / University of Maryland, Baltimore County +Saunders, Benjamin nicknames Ralith 2008 July Open Source This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33337] brlcad/trunk/src/adrt/slave
Revision: 7
http://brlcad.svn.sourceforge.net/brlcad/?rev=7view=rev
Author: erikgreenwald
Date: 2008-12-10 20:54:59 + (Wed, 10 Dec 2008)
Log Message:
---
re-order headers
Modified Paths:
--
brlcad/trunk/src/adrt/slave/load.c
brlcad/trunk/src/adrt/slave/load_MySQL.c
brlcad/trunk/src/adrt/slave/slave.c
Modified: brlcad/trunk/src/adrt/slave/load.c
===
--- brlcad/trunk/src/adrt/slave/load.c 2008-12-10 20:29:15 UTC (rev 6)
+++ brlcad/trunk/src/adrt/slave/load.c 2008-12-10 20:54:59 UTC (rev 7)
@@ -25,11 +25,12 @@
# define TIE_PRECISION 0
#endif
-#include load.h
#include stdio.h
#include stdlib.h
#include string.h
+#include load.h
+
#include tienet.h
#include umath.h
Modified: brlcad/trunk/src/adrt/slave/load_MySQL.c
===
--- brlcad/trunk/src/adrt/slave/load_MySQL.c2008-12-10 20:29:15 UTC (rev
6)
+++ brlcad/trunk/src/adrt/slave/load_MySQL.c2008-12-10 20:54:59 UTC (rev
7)
@@ -25,7 +25,6 @@
# define TIE_PRECISION 0
#endif
-#include load.h
#include stdio.h
#include stdlib.h
#include string.h
@@ -35,6 +34,8 @@
#include tienet.h
#include umath.h
+#include load.h
+
#ifdef HAVE_MYSQL
# include mysql.h
# define ADRT_MYSQL_USER adrt
Modified: brlcad/trunk/src/adrt/slave/slave.c
===
--- brlcad/trunk/src/adrt/slave/slave.c 2008-12-10 20:29:15 UTC (rev 6)
+++ brlcad/trunk/src/adrt/slave/slave.c 2008-12-10 20:54:59 UTC (rev 7)
@@ -25,8 +25,6 @@
# define TIE_PRECISION 0
#endif
-#include slave.h
-#include load.h
#include stdio.h
#include stdlib.h
#include string.h
@@ -39,6 +37,9 @@
#include tienet.h
#include render_util.h
+#include slave.h
+#include load.h
+
typedef struct adrt_slave_project_s {
tie_t tie;
render_camera_t camera;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33339] brlcad/trunk/src/other/tkhtml3/Makefile.in
Revision: 9
http://brlcad.svn.sourceforge.net/brlcad/?rev=9view=rev
Author: erikgreenwald
Date: 2008-12-10 20:59:37 + (Wed, 10 Dec 2008)
Log Message:
---
carry LDFLAGS
Modified Paths:
--
brlcad/trunk/src/other/tkhtml3/Makefile.in
Modified: brlcad/trunk/src/other/tkhtml3/Makefile.in
===
--- brlcad/trunk/src/other/tkhtml3/Makefile.in 2008-12-10 20:56:01 UTC (rev
8)
+++ brlcad/trunk/src/other/tkhtml3/Makefile.in 2008-12-10 20:59:37 UTC (rev
9)
@@ -98,7 +98,7 @@
CFLAGS_WARNING = @CFLAGS_WARNING@
CLEANFILES = @CLEANFILES@
EXEEXT = @EXEEXT@
-LDFLAGS_DEFAULT= @LDFLAGS_DEFAULT@
+LDFLAGS_DEFAULT= @LDFLAGS_DEFAULT@ ${LDFLAGS}
MAKE_LIB = @MAKE_LIB@
MAKE_SHARED_LIB= @MAKE_SHARED_LIB@
MAKE_STATIC_LIB= @MAKE_STATIC_LIB@
@@ -157,6 +157,7 @@
CPPFLAGS = @CPPFLAGS@
LIBS = -L/usr/lib -L/usr/local/lib @PKG_LIBS@ @LIBS@
+LDFLAGS= @LDFLAGS@
AR = @AR@
CFLAGS = @CFLAGS@
COMPILE= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(AM_CFLAGS) $(CFLAGS)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33341] brlcad/trunk/src/tclscripts/lib/RtControl.tcl
Revision: 33341
http://brlcad.svn.sourceforge.net/brlcad/?rev=33341view=rev
Author: bob1961
Date: 2008-12-10 21:12:55 + (Wed, 10 Dec 2008)
Log Message:
---
Added code to insure the Advanced Settings dialog pops up above the main rt
control dialog.
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/RtControl.tcl
Modified: brlcad/trunk/src/tclscripts/lib/RtControl.tcl
===
--- brlcad/trunk/src/tclscripts/lib/RtControl.tcl 2008-12-10 21:09:38 UTC
(rev 33340)
+++ brlcad/trunk/src/tclscripts/lib/RtControl.tcl 2008-12-10 21:12:55 UTC
(rev 33341)
@@ -110,6 +110,9 @@
private variable isaMged 0
private variable isaGed 0
+protected variable saveVisibilityBinding {}
+protected variable saveFocusOutBinding {}
+
constructor {args} {}
}
@@ -392,6 +395,8 @@
itk_component add adv {
::toplevel $itk_interior.adv
}
+bind $itk_component(adv) Visibility raise $itk_component(adv); break
+bind $itk_component(adv) FocusOut raise $itk_component(adv); break
itk_component add adv_gridF1 {
::frame $itk_component(adv).gridF1
@@ -602,6 +607,11 @@
}
::itcl::body RtControl::activate_adv {} {
+set saveVisibilityBinding [bind $itk_component(hull) Visibility]
+set saveFocusOutBinding [bind $itk_component(hull) FocusOut]
+bind $itk_component(hull) Visibility {}
+bind $itk_component(hull) FocusOut {}
+
raise $itk_component(adv)
# center over control panel
@@ -621,6 +631,10 @@
::itcl::body RtControl::deactivate_adv {} {
set win_geom_adv [wm geometry $itk_component(adv)]
wm withdraw $itk_component(adv)
+
+bind $itk_component(hull) Visibility $saveVisibilityBinding
+bind $itk_component(hull) FocusOut $saveFocusOutBinding
+raise $itk_component(hull)
}
::itcl::body RtControl::center {w gs {cw }} {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33342] brlcad/trunk/src/libged
Revision: 33342
http://brlcad.svn.sourceforge.net/brlcad/?rev=33342view=rev
Author: erikgreenwald
Date: 2008-12-10 21:25:37 + (Wed, 10 Dec 2008)
Log Message:
---
carry const where possible
Modified Paths:
--
brlcad/trunk/src/libged/expand.c
brlcad/trunk/src/libged/ged_private.h
brlcad/trunk/src/libged/importFg4Section.c
brlcad/trunk/src/libged/put_comb.c
brlcad/trunk/src/libged/red.c
Modified: brlcad/trunk/src/libged/expand.c
===
--- brlcad/trunk/src/libged/expand.c2008-12-10 21:12:55 UTC (rev 33341)
+++ brlcad/trunk/src/libged/expand.c2008-12-10 21:25:37 UTC (rev 33342)
@@ -33,7 +33,7 @@
static void
ged_scrape_escapes_AppendResult(struct bu_vls *result,
- char*str);
+ const char *str);
int
ged_expand(struct ged *gedp, int argc, const char *argv[])
@@ -83,7 +83,7 @@
if (regexp == 0) {
if (nummatch 0)
bu_vls_printf(gedp-ged_result_str, );
- ged_scrape_escapes_AppendResult(gedp-ged_result_str, (char
*)argv[whicharg]);
+ ged_scrape_escapes_AppendResult(gedp-ged_result_str,
argv[whicharg]);
++nummatch;
continue;
}
@@ -113,7 +113,7 @@
if (thismatch == 0) {
if (nummatch 0)
bu_vls_printf(gedp-ged_result_str, );
- ged_scrape_escapes_AppendResult(gedp-ged_result_str, (char
*)argv[whicharg]);
+ ged_scrape_escapes_AppendResult(gedp-ged_result_str,
argv[whicharg]);
}
}
@@ -122,7 +122,7 @@
static void
ged_scrape_escapes_AppendResult(struct bu_vls *result,
- char*str)
+ const char *str)
{
char buf[2];
buf[1] = '\0';
Modified: brlcad/trunk/src/libged/ged_private.h
===
--- brlcad/trunk/src/libged/ged_private.h 2008-12-10 21:12:55 UTC (rev
33341)
+++ brlcad/trunk/src/libged/ged_private.h 2008-12-10 21:25:37 UTC (rev
33342)
@@ -302,8 +302,8 @@
struct rt_comb_internal *comb,
struct directory *dp,
int node_count,
- char *old_name,
- char *new_name,
+ const char *old_name,
+ const char *new_name,
struct rt_tree_array *rt_tree_array,
int tree_index));
BU_EXTERN(int ged_save_comb,
Modified: brlcad/trunk/src/libged/importFg4Section.c
===
--- brlcad/trunk/src/libged/importFg4Section.c 2008-12-10 21:12:55 UTC (rev
33341)
+++ brlcad/trunk/src/libged/importFg4Section.c 2008-12-10 21:25:37 UTC (rev
33342)
@@ -101,7 +101,7 @@
static void do_grid(char *line);
static void do_tri(char *line);
static void do_quad(char *line);
-static void make_bot_object(char *name,
+static void make_bot_object(const char *name,
struct rt_wdb *wdbp);
/*** code from libwdb/bot.c
***/
@@ -429,7 +429,7 @@
}
static void
-make_bot_object(char *name,
+make_bot_object(const char *name,
struct rt_wdb *wdbp)
{
int i;
@@ -593,7 +593,7 @@
do_quad(line);
}
-make_bot_object((char *)argv[1], gedp-ged_wdbp);
+make_bot_object(argv[1], gedp-ged_wdbp);
free((void *)lines);
bu_free((void *)grid_pts, importFg4Section: grid_pts);
Modified: brlcad/trunk/src/libged/put_comb.c
===
--- brlcad/trunk/src/libged/put_comb.c 2008-12-10 21:12:55 UTC (rev 33341)
+++ brlcad/trunk/src/libged/put_comb.c 2008-12-10 21:25:37 UTC (rev 33342)
@@ -39,9 +39,9 @@
static struct line_list HeadLines;
-static int ged_put_tree_into_comb(struct ged *gedp, struct rt_comb_internal
*comb, struct directory *dp, char *old_name, char *new_name, char *str);
+static int ged_put_tree_into_comb(struct ged *gedp, struct rt_comb_internal
*comb, struct directory *dp, const char *old_name, const char *new_name, const
char *str);
static int ged_count_nodes(struct ged *gedp, char *line);
-static void put_rgb_into_comb(struct rt_comb_internal *comb, char *str);
+static void put_rgb_into_comb(struct rt_comb_internal *comb, const char *str);
int
ged_put_comb(struct ged *gedp, int argc, const char *argv[])
@@ -151,7 +151,7 @@
offset = 2;
}
-put_rgb_into_comb(comb, (char *)argv[offset + 1]);
+put_rgb_into_comb(comb, argv[offset + 1]);
bu_vls_strcpy(comb-shader, argv[offset +2]);
if (*argv[offset + 3] == 'y' || *argv[offset + 3] == 'Y')
@@ -159,7 +159,7 @@
else
comb-inherit = 0;
-if (ged_put_tree_into_comb(gedp, comb, dp, (char *)argv[1], new_name,
(char *)argv[offset + 4]) == BRLCAD_ERROR) {
+
[brlcad-commits] SF.net SVN: brlcad:[33345] brlcad/trunk/src
Revision: 33345
http://brlcad.svn.sourceforge.net/brlcad/?rev=33345view=rev
Author: bob1961
Date: 2008-12-10 21:35:06 + (Wed, 10 Dec 2008)
Log Message:
---
Make use of libged's tire functionality.
Modified Paths:
--
brlcad/trunk/src/libtclcad/ged_obj.c
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/src/libtclcad/ged_obj.c
===
--- brlcad/trunk/src/libtclcad/ged_obj.c2008-12-10 21:33:24 UTC (rev
33344)
+++ brlcad/trunk/src/libtclcad/ged_obj.c2008-12-10 21:35:06 UTC (rev
33345)
@@ -687,6 +687,7 @@
{solids_on_ray, (char *)0, MAXARGS, go_pass_through_func,
ged_solids_on_ray},
{summary,(char *)0, MAXARGS, go_pass_through_func, ged_summary},
{sync, (char *)0, MAXARGS, go_pass_through_func, ged_sync},
+{tire, (char *)0, MAXARGS, go_pass_through_func, ged_tire},
{title, (char *)0, MAXARGS, go_pass_through_func, ged_title},
{tol,(char *)0, MAXARGS, go_pass_through_func, ged_tol},
{tops, (char *)0, MAXARGS, go_pass_through_func, ged_tops},
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2008-12-10 21:33:24 UTC
(rev 33344)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2008-12-10 21:35:06 UTC
(rev 33345)
@@ -188,6 +188,7 @@
method rotate_arb_face {args}
method shader {args}
method shells {args}
+ method tire{args}
method title {args}
method track {args}
method unhide {args}
@@ -400,7 +401,7 @@
mv mvall nmg_collapse nmg_simplify \
ocenter orotate oscale otranslate
packTree prefix push \
put put_comb putmat pwd r rcodes red
rfarb rm rmater \
- rotate_arb_face shader shells title
track unhide units unpackTree \
+ rotate_arb_face shader shells tire
title track unhide units unpackTree \
vmake wmater xpush Z zap
}
variable mUnwrappedDbCommands {}
@@ -4163,6 +4164,10 @@
eval gedWrapper shells 0 0 1 0 $args
}
+::itcl::body ArcherCore::tire {args} {
+eval gedWrapper tire 0 0 1 1 $args
+}
+
::itcl::body ArcherCore::title {args} {
if {$args == {}} {
return [gedCmd title]
Modified: brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
===
--- brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2008-12-10
21:33:24 UTC (rev 33344)
+++ brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2008-12-10
21:35:06 UTC (rev 33345)
@@ -118,7 +118,11 @@
# Initialize the variables containing the object's specification.
#
::itcl::body CombEditFrame::initGeometry {gdata} {
-set mRegion [bu_get_value_by_keyword region $gdata]
+if {![catch {bu_get_value_by_keyword region $gdata} _region]} {
+ set mRegion $_region
+} else {
+ set mRegion
+}
if {![catch {bu_get_value_by_keyword id $gdata} _id]} {
set mId $_id
Modified: brlcad/trunk/src/tclscripts/lib/Ged.tcl
===
--- brlcad/trunk/src/tclscripts/lib/Ged.tcl 2008-12-10 21:33:24 UTC (rev
33344)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2008-12-10 21:35:06 UTC (rev
33345)
@@ -393,6 +393,7 @@
method solids_on_ray {args}
method summary {args}
method sync {args}
+ method tire {args}
method title {args}
method tol {args}
method tops {args}
@@ -1929,6 +1930,10 @@
eval $mGed sync $args
}
+::itcl::body cadwidgets::Ged::tire {args} {
+eval $mGed tire $args
+}
+
::itcl::body cadwidgets::Ged::title {args} {
eval $mGed title $args
}
@@ -2868,6 +2873,7 @@
$help add solids {{file object(s)} {returns an ascii summary of
solids}}
$help add summary {{[s r g]} {count/list solid/reg/groups}}
$help add sync {{} {sync the in memory database to disk}}
+$help add tire {{[options] tire_top} {create a tire}}
$help add title{{?string?} {print or change the title}}
$help add tol {{[abs #] [rel #] [norm #] [dist #] [perp #]}
{show/set tessellation and calculation tolerances}}
$help add tops {{} {find all top level objects}}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
[brlcad-commits] SF.net SVN: brlcad:[33347] brlcad/trunk/src/libged/put_comb.c
Revision: 33347
http://brlcad.svn.sourceforge.net/brlcad/?rev=33347view=rev
Author: erikgreenwald
Date: 2008-12-10 21:47:02 + (Wed, 10 Dec 2008)
Log Message:
---
verify the immutable string, not the unallocated string. Verify the duplication
succeeded.
Modified Paths:
--
brlcad/trunk/src/libged/put_comb.c
Modified: brlcad/trunk/src/libged/put_comb.c
===
--- brlcad/trunk/src/libged/put_comb.c 2008-12-10 21:44:36 UTC (rev 33346)
+++ brlcad/trunk/src/libged/put_comb.c 2008-12-10 21:47:02 UTC (rev 33347)
@@ -198,13 +198,17 @@
struct bu_vls vls;
char *str;
-if (str == (char *)NULL)
+if (imstr == (char *)NULL)
return BRLCAD_ERROR;
BU_LIST_INIT(HeadLines.l);
/* duplicate the immutable str (from argv) for strtok style mutation */
str = strdup(imstr);
+if(str == NULL) {
+ bu_log(Failed to allocate memory. Aborting);
+ return BRLCAD_ERROR;
+}
/* break str into lines */
line = str;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33344] brlcad/trunk/src/libdm/scale.c
Revision: 33344 http://brlcad.svn.sourceforge.net/brlcad/?rev=33344view=rev Author: erikgreenwald Date: 2008-12-10 21:33:24 + (Wed, 10 Dec 2008) Log Message: --- add missing header Modified Paths: -- brlcad/trunk/src/libdm/scale.c Modified: brlcad/trunk/src/libdm/scale.c === --- brlcad/trunk/src/libdm/scale.c 2008-12-10 21:28:32 UTC (rev 33343) +++ brlcad/trunk/src/libdm/scale.c 2008-12-10 21:33:24 UTC (rev 33344) @@ -28,7 +28,9 @@ #include bio.h #include stdio.h +#include string.h #include math.h + #include bu.h #include vmath.h #include bn.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33349] brlcad/trunk/autogen.sh
Revision: 33349
http://brlcad.svn.sourceforge.net/brlcad/?rev=33349view=rev
Author: brlcad
Date: 2008-12-10 23:17:48 + (Wed, 10 Dec 2008)
Log Message:
---
merge in changes from Sebastian Pipping's git tree, commit
7fd089f2a40099db7c30a6a340b330f29ec4d8cd (Resolve code duplication on equal
treatment of COPYING and INSTALL). refactors the backup handling into one loop
for both.
Modified Paths:
--
brlcad/trunk/autogen.sh
Modified: brlcad/trunk/autogen.sh
===
--- brlcad/trunk/autogen.sh 2008-12-10 21:58:12 UTC (rev 33348)
+++ brlcad/trunk/autogen.sh 2008-12-10 23:17:48 UTC (rev 33349)
@@ -756,24 +756,17 @@
# prevalent behavior, so we protect against it by keeping a backup
# of the file that can later be restored.
-if test -f COPYING ; then
- if test -f COPYING.$$.protect_from_automake.backup ; then
- $VERBOSE_ECHO Already backed up COPYING in `pwd`
- else
- $VERBOSE_ECHO Backing up COPYING in `pwd`
- $VERBOSE_ECHO cp -p COPYING
COPYING.$$.protect_from_automake.backup
- cp -p COPYING COPYING.$$.protect_from_automake.backup
+for file in COPYING INSTALL ; do
+ if test -f ${file} ; then
+ if test -f ${file}.$$.protect_from_automake.backup ; then
+ $VERBOSE_ECHO Already backed up ${file} in `pwd`
+ else
+ $VERBOSE_ECHO Backing up ${file} in `pwd`
+ $VERBOSE_ECHO cp -p ${file}
${file}.$$.protect_from_automake.backup
+ cp -p ${file} ${file}.$$.protect_from_automake.backup
+ fi
fi
-fi
-if test -f INSTALL ; then
- if test -f INSTALL.$$.protect_from_automake.backup ; then
- $VERBOSE_ECHO Already backed up INSTALL in `pwd`
- else
- $VERBOSE_ECHO Backing up INSTALL in `pwd`
- $VERBOSE_ECHO cp -p INSTALL
INSTALL.$$.protect_from_automake.backup
- cp -p INSTALL INSTALL.$$.protect_from_automake.backup
- fi
-fi
+done
}
@@ -840,58 +833,33 @@
spacer=no
-# COPYING
-if test -f COPYING.$$.protect_from_automake.backup ; then
- if test -f COPYING ; then
+for file in COPYING INSTALL ; do
+ if test -f ${file}.$$.protect_from_automake.backup ; then
+ if test -f ${file} ; then
# compare entire content, restore if needed
- if test x`cat COPYING` != x`cat
COPYING.$$.protect_from_automake.backup` ; then
+ if test x`cat ${file}` != x`cat
${file}.$$.protect_from_automake.backup` ; then
if test x$spacer = xno ; then
$VERBOSE_ECHO
spacer=yes
fi
# restore the backup
- $VERBOSE_ECHO Restoring COPYING from backup (automake -f
likely clobbered it)
- $VERBOSE_ECHO rm -f COPYING
- rm -f COPYING
- $VERBOSE_ECHO mv COPYING.$$.protect_from_automake.backup
COPYING
- mv COPYING.$$.protect_from_automake.backup COPYING
+ $VERBOSE_ECHO Restoring ${file} from backup (automake -f
likely clobbered it)
+ $VERBOSE_ECHO rm -f ${file}
+ rm -f ${file}
+ $VERBOSE_ECHO mv ${file}.$$.protect_from_automake.backup
${file}
+ mv ${file}.$$.protect_from_automake.backup ${file}
fi # check contents
- elif test -f COPYING.$$.protect_from_automake.backup ; then
- $VERBOSE_ECHO mv COPYING.$$.protect_from_automake.backup COPYING
- mv COPYING.$$.protect_from_automake.backup COPYING
- fi # -f COPYING
+ elif test -f ${file}.$$.protect_from_automake.backup ; then
+ $VERBOSE_ECHO mv ${file}.$$.protect_from_automake.backup
${file}
+ mv ${file}.$$.protect_from_automake.backup ${file}
+ fi # -f ${file}
+
+ # just in case
+ $VERBOSE_ECHO rm -f ${file}.$$.protect_from_automake.backup
+ rm -f ${file}.$$.protect_from_automake.backup
+ fi # -f ${file}.$$.protect_from_automake.backup
+done
- # just in case
- $VERBOSE_ECHO rm -f COPYING.$$.protect_from_automake.backup
- rm -f COPYING.$$.protect_from_automake.backup
-fi # -f COPYING.$$.protect_from_automake.backup
-
-# INSTALL
-if test -f INSTALL.$$.protect_from_automake.backup ; then
- if test -f INSTALL ; then
- # compare entire content, restore if needed
- if test x`cat INSTALL` != x`cat
INSTALL.$$.protect_from_automake.backup` ; then
- if test x$spacer = xno ; then
- $VERBOSE_ECHO
- spacer=yes
- fi
- # restore the backup
- $VERBOSE_ECHO Restoring INSTALL from backup (automake -f
likely clobbered it)
- $VERBOSE_ECHO rm -f INSTALL
- rm -f INSTALL
-
[brlcad-commits] SF.net SVN: brlcad:[33351] brlcad/trunk/src/libged/put_comb.c
Revision: 33351
http://brlcad.svn.sourceforge.net/brlcad/?rev=33351view=rev
Author: brlcad
Date: 2008-12-10 23:42:30 + (Wed, 10 Dec 2008)
Log Message:
---
oop, use bu_free on all of the callers. get rid of the dead code too.
Modified Paths:
--
brlcad/trunk/src/libged/put_comb.c
Modified: brlcad/trunk/src/libged/put_comb.c
===
--- brlcad/trunk/src/libged/put_comb.c 2008-12-10 23:40:52 UTC (rev 33350)
+++ brlcad/trunk/src/libged/put_comb.c 2008-12-10 23:42:30 UTC (rev 33351)
@@ -135,13 +135,6 @@
comb-GIFTmater = atoi(argv[5]);
comb-los = atoi(argv[6]);
-#if 0
- /* use the new values for defaults */
- item_default = comb-region_id + 1;
- air_default = comb-aircode;
- mat_default = comb-GIFTmater;
- los_default = comb-los;
-#endif
offset = 6;
} else {
if (argc != 7) {
@@ -220,7 +213,7 @@
if ((n = ged_count_nodes(gedp, bu_vls_addr(vls))) 0) {
bu_vls_free(vls);
bu_list_free(HeadLines.l);
- free(str);
+ bu_free(str, dealloc bu_strdup str);
return BRLCAD_ERROR;
} else if (n 0) {
BU_GETSTRUCT(llp, line_list);
@@ -268,7 +261,7 @@
if (rt_tree_array)
bu_free((char *)rt_tree_array, red: tree list);
bu_log(no name specified\n);
- free(str);
+ bu_free(str, dealloc bu_strdup str);
return BRLCAD_ERROR;
}
name = ptr;
@@ -305,7 +298,7 @@
if (rt_tree_array)
bu_free((char *)rt_tree_array, red: tree list);
bu_list_free(HeadLines.l);
- free(str);
+ bu_free(str, dealloc bu_strdup str);
return BRLCAD_ERROR;
}
matrix[k] = atof(ptr);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33352] brlcad/trunk/src/libged/put_comb.c
Revision: 33352
http://brlcad.svn.sourceforge.net/brlcad/?rev=33352view=rev
Author: brlcad
Date: 2008-12-10 23:45:06 + (Wed, 10 Dec 2008)
Log Message:
---
ws
Modified Paths:
--
brlcad/trunk/src/libged/put_comb.c
Modified: brlcad/trunk/src/libged/put_comb.c
===
--- brlcad/trunk/src/libged/put_comb.c 2008-12-10 23:42:30 UTC (rev 33351)
+++ brlcad/trunk/src/libged/put_comb.c 2008-12-10 23:45:06 UTC (rev 33352)
@@ -47,7 +47,7 @@
ged_put_comb(struct ged *gedp, int argc, const char *argv[])
{
struct directory *dp;
-struct rt_db_internal intern;
+struct rt_db_internal intern;
struct rt_comb_internal *comb;
char new_name_v4[NAMESIZE+1];
char *new_name;
@@ -81,7 +81,7 @@
return BRLCAD_ERROR;
}
- if (rt_db_get_internal( intern, dp, gedp-ged_wdbp-dbip, (fastf_t
*)NULL, rt_uniresource) 0) {
+ if (rt_db_get_internal(intern, dp, gedp-ged_wdbp-dbip, (fastf_t
*)NULL, rt_uniresource) 0) {
bu_vls_printf(gedp-ged_result_str, %s: Database read error,
aborting\n, argv[0]);
return BRLCAD_ERROR;
}
@@ -106,7 +106,7 @@
bu_vls_init(comb-material);
}
-if (gedp-ged_wdbp-dbip-dbi_version 5) {
+if (gedp-ged_wdbp-dbip-dbi_version 5) {
new_name = new_name_v4;
if (dp == DIR_NULL)
NAMEMOVE(argv[1], new_name_v4);
@@ -176,20 +176,20 @@
static int
ged_put_tree_into_comb(struct ged *gedp, struct rt_comb_internal *comb, struct
directory *dp, const char *old_name, const char *new_name, const char *imstr)
{
-inti;
-intdone;
-char *line;
-char *ptr;
-char relation;
-char *name;
-struct rt_tree_array *rt_tree_array;
-struct line_list *llp;
-intnode_count = 0;
-inttree_index = 0;
-union tree *tp;
-matp_t matrix;
-struct bu_vls vls;
-char *str;
+int i;
+int done;
+char *line;
+char *ptr;
+char relation;
+char *name;
+struct rt_tree_array *rt_tree_array;
+struct line_list *llp;
+int node_count = 0;
+int tree_index = 0;
+union tree *tp;
+matp_t matrix;
+struct bu_vls vls;
+char *str;
if (imstr == (char *)NULL)
return BRLCAD_ERROR;
@@ -242,7 +242,7 @@
else
rt_tree_array = (struct rt_tree_array *)NULL;
-for (BU_LIST_FOR(llp, line_list, HeadLines.l)) {
+for (BU_LIST_FOR (llp, line_list, HeadLines.l)) {
done = 0;
ptr = strtok(llp-line, delims);
while (!done) {
@@ -267,7 +267,7 @@
name = ptr;
/* Eliminate trailing white space from name */
- i = strlen( ptr );
+ i = strlen(ptr);
while (isspace(name[--i]))
name[i] = '\0';
@@ -365,7 +365,7 @@
relation = (*ptr);
if (relation != '+' relation != 'u' relation != '-') {
- bu_vls_printf(gedp-ged_result_str, %c is not a legal
operator\n, relation );
+ bu_vls_printf(gedp-ged_result_str, %c is not a legal
operator\n, relation);
return -1;
}
@@ -377,7 +377,7 @@
return -1;
}
- ptr = strtok( (char *)NULL, delims );
+ ptr = strtok((char *)NULL, delims);
/*
* If this token is not a boolean operator, then it must be the start
* of a matrix which we will skip.
@@ -388,7 +388,7 @@
/* skip past matrix, k=1 because we already have the first value */
for (k=1; k16; k++) {
- ptr = strtok( (char *)NULL, delims );
+ ptr = strtok((char *)NULL, delims);
if (!ptr) {
bu_vls_printf(gedp-ged_result_str, expecting a
matrix\n);
return -1;
@@ -438,7 +438,6 @@
}
-
/*
* Local Variables:
* tab-width: 8
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33353] brlcad/trunk/src/libged/search.h
Revision: 33353
http://brlcad.svn.sourceforge.net/brlcad/?rev=33353view=rev
Author: erikgreenwald
Date: 2008-12-11 00:50:31 + (Thu, 11 Dec 2008)
Log Message:
---
fix for osX.5
Modified Paths:
--
brlcad/trunk/src/libged/search.h
Modified: brlcad/trunk/src/libged/search.h
===
--- brlcad/trunk/src/libged/search.h2008-12-10 23:45:06 UTC (rev 33352)
+++ brlcad/trunk/src/libged/search.h2008-12-11 00:50:31 UTC (rev 33353)
@@ -85,8 +85,8 @@
union {
gid_t _g_data; /* gid */
struct {
- u_int _f_flags;
- u_int _f_mask;
+ unsigned int _f_flags;
+ unsigned int _f_mask;
} fl;
struct _plandata *_p_data[2]; /* PLAN trees */
struct _ex {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33354] brlcad/trunk/autogen.sh
Revision: 33354
http://brlcad.svn.sourceforge.net/brlcad/?rev=33354view=rev
Author: brlcad
Date: 2008-12-11 02:23:56 + (Thu, 11 Dec 2008)
Log Message:
---
merge in more changes from Sebastian Pipping's git tree, commit
fe2e3ecadce19faa426595da2572b090bd3769b9 (Add download code using wget or curl,
as available). made a few mods to make the download of config.guess optional
(and default to off for now) and toggleable based on a DOWNLOAD var.
Modified Paths:
--
brlcad/trunk/autogen.sh
Modified: brlcad/trunk/autogen.sh
===
--- brlcad/trunk/autogen.sh 2008-12-11 00:50:31 UTC (rev 33353)
+++ brlcad/trunk/autogen.sh 2008-12-11 02:23:56 UTC (rev 33354)
@@ -268,6 +268,9 @@
if [ x$VERSION_ONLY = x ] ; then
VERSION_ONLY=no
fi
+if [ x$DOWNLOAD = x ] ; then
+DOWNLOAD=no
+fi
if [ x$AUTORECONF_OPTIONS = x ] ; then
AUTORECONF_OPTIONS=-i -f
fi
@@ -288,6 +291,9 @@
if [ x$AUTOHEADER_OPTIONS = x ] ; then
AUTOHEADER_OPTIONS=
fi
+if [ x$CONFIG_GUESS_URL = x ] ; then
+
CONFIG_GUESS_URL=http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD;
+fi
for arg in $ARGS ; do
case x$arg in
x--help) HELP=yes ;;
@@ -1040,6 +1046,42 @@
initialize
+#
+# DOWNLOAD_GNULIB_CONFIG_GUESS FUNCTION #
+#
+
+# TODO - should make sure wget/curl exist and/or work before trying to
+# use them.
+
+download_gnulib_config_guess () {
+# abuse gitweb to download gnulib's latest config.guess via HTTP
+config_guess_temp=config.guess.$$.download
+ret=1
+for __cmd in wget curl ; do
+ case ${__cmd} in
+ wget)
+ wget ${CONFIG_GUESS_URL} -O ${config_guess_temp}
/dev/null 21
+ ret=$?
+ ;;
+ curl)
+ curl ${CONFIG_GUESS_URL} -o ${config_guess_temp}
/dev/null 21
+ ret=$?
+ ;;
+ esac
+
+ if [ $ret = 0 ] ; then
+ mv -f ${config_guess_temp} ${_aux_dir}/config.guess
+ break
+ fi
+done
+
+if [ ! $ret = 0 ] ; then
+ $ECHO Warning: config.guess download failed from: $CONFIG_GUESS_URL
+ rm -f ${config_guess_temp}
+fi
+}
+
+
# prepare build via autoreconf or manually #
@@ -1083,6 +1125,11 @@
$ECHO Attempting to run the preparation steps individually
reconfigure_manually=yes
+else
+ if [ x$DOWNLOAD = xyes ] ; then
+ # TODO only if libtool needed
+ download_gnulib_config_guess
+ fi
fi
else
reconfigure_manually=yes
@@ -1212,6 +1259,11 @@
$ECHO $ECHO_N Continuing build preparation ... $ECHO_C
fi
fi # ltmain.sh
+
+ if [ x$DOWNLOAD = xyes ] ; then
+ # TODO only if libtool needed
+ download_gnulib_config_guess
+ fi
fi # need_libtoolize
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[33357] brlcad/trunk/autogen.sh
Revision: 33357
http://brlcad.svn.sourceforge.net/brlcad/?rev=33357view=rev
Author: brlcad
Date: 2008-12-11 02:50:27 + (Thu, 11 Dec 2008)
Log Message:
---
and the last change by sebastian pipping, from git commit
320ee0c022636152b173ecd9b57a373fce02b1a4 (Separate availability check and
actual download, report versions, add support for fetch). includes a few
(untested) minor mods to push the actual download line to a one-liner.
Modified Paths:
--
brlcad/trunk/autogen.sh
Modified: brlcad/trunk/autogen.sh
===
--- brlcad/trunk/autogen.sh 2008-12-11 02:41:07 UTC (rev 33356)
+++ brlcad/trunk/autogen.sh 2008-12-11 02:50:27 UTC (rev 33357)
@@ -69,8 +69,10 @@
# To verbosely try running with an older (unsupported) autoconf:
# AUTOCONF_VERSION=2.50 ./autogen.sh --verbose
#
-# Authors:
+# Author:
# Christopher Sean Morrison [EMAIL PROTECTED]
+#
+# Patches:
# Sebastian Pipping [EMAIL PROTECTED]
#
##
@@ -107,6 +109,7 @@
fi
echo autogen.sh build preparation script by Christopher Sean Morrison
+echo + config.guess download patch by Sebastian Pipping (2008-12-03)
echo revised 3-clause BSD-style license, copyright (c) $__copyright
echo script version $__version, ISO/IEC 9945 POSIX shell script
}
@@ -1062,20 +1065,35 @@
# abuse gitweb to download gnulib's latest config.guess via HTTP
config_guess_temp=config.guess.$$.download
ret=1
-for __cmd in wget curl ; do
+for __cmd in wget curl fetch ; do
+ $VERBOSE_ECHO Checking for command ${__cmd}
+ ${__cmd} --version /dev/null
+ ret=$?
+ if [ ! $ret = 0 ] ; then
+ continue
+fi
+
+ __cmd_version=`${__cmd} --version | head -n 1 | sed -e 's/^[^0-9]\+//'
-e 's/ .*//'`
+ $VERBOSE_ECHO Found ${__cmd} ${__cmd_version}
+
+ opts=
case ${__cmd} in
wget)
- wget ${CONFIG_GUESS_URL} -O ${config_guess_temp}
/dev/null 21
- ret=$?
+ opts=-O
;;
curl)
- curl ${CONFIG_GUESS_URL} -o ${config_guess_temp}
/dev/null 21
- ret=$?
+ opts=-o
;;
+ fetch)
+ opts=-t 5 -f
+ ;;
esac
- if [ $ret = 0 ] ; then
+ $VERBOSE_ECHO Running $__cmd \${CONFIG_GUESS_URL}\ $opts
\${config_guess_temp}\
+ eval $__cmd \${CONFIG_GUESS_URL}\ $opts \${config_guess_temp}\
/dev/null 21
+ if [ $? = 0 ] ; then
mv -f ${config_guess_temp} ${_aux_dir}/config.guess
+ ret=0
break
fi
done
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
