[brlcad-commits] SF.net SVN: brlcad:[42258] brlcad/trunk/src/libbu/timetester.c
Revision: 42258 http://brlcad.svn.sourceforge.net/brlcad/?rev=42258view=rev Author: d_rossberg Date: 2011-01-14 10:13:14 + (Fri, 14 Jan 2011) Log Message: --- there is no inttypes.h in MSVC however it should not be necessary anyway, int64_t has to be declared via bu.h Modified Paths: -- brlcad/trunk/src/libbu/timetester.c Modified: brlcad/trunk/src/libbu/timetester.c === --- brlcad/trunk/src/libbu/timetester.c 2011-01-14 06:06:45 UTC (rev 42257) +++ brlcad/trunk/src/libbu/timetester.c 2011-01-14 10:13:14 UTC (rev 42258) @@ -23,7 +23,6 @@ #include stdlib.h #include stdio.h #include string.h -#include inttypes.h #include bu.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ 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:[42259] brlcad/branches/cmake
Revision: 42259
http://brlcad.svn.sourceforge.net/brlcad/?rev=42259view=rev
Author: starseeker
Date: 2011-01-14 13:43:50 + (Fri, 14 Jan 2011)
Log Message:
---
Start updating the CMake logic to re-create the installed file layout, insofar
as practical. First step - header placement (cause there are fewer of these).
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/include/CMakeLists.txt
brlcad/branches/cmake/src/adrt/CMakeLists.txt
brlcad/branches/cmake/src/other/CMakeLists.txt
brlcad/branches/cmake/src/other/libregex/CMakeLists.txt
brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt
brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt
brlcad/branches/cmake/src/other/tcl/generic/CMakeLists.txt
brlcad/branches/cmake/src/other/tk/CMakeLists.txt
brlcad/branches/cmake/src/other/tnt/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2011-01-14 10:13:14 UTC (rev
42258)
+++ brlcad/branches/cmake/CMakeLists.txt2011-01-14 13:43:50 UTC (rev
42259)
@@ -398,7 +398,7 @@
# run this macro, the config.h.in file must first be present, which
# we take care of here:
-SET(CONFIG_H_FILE ${BRLCAD_BINARY_DIR}/include/brlcad_config.h.in)
+SET(CONFIG_H_FILE ${BRLCAD_BINARY_DIR}/include/brlcad/brlcad_config.h.in)
FILE(WRITE ${CONFIG_H_FILE} / Define statements for CMake /\n)
FILE(APPEND ${CONFIG_H_FILE} #ifndef __CONFIG_H__\n)
FILE(APPEND ${CONFIG_H_FILE} #define __CONFIG_H__\n)
@@ -964,7 +964,7 @@
# idea being that if any other system-wide defines or include are needed
# they can just be added here.
SET(BRLCAD_STD_DEFS -DHAVE_CONFIG_H;-DBRLCADBUILD=1)
-SET(BRLCAD_STD_INCLUDES
${BRLCAD_BINARY_DIR}/include;${BRLCAD_SOURCE_DIR}/include)
+SET(BRLCAD_STD_INCLUDES
${BRLCAD_BINARY_DIR}/include/brlcad;${BRLCAD_BINARY_DIR}/include)
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(db)
@@ -983,7 +983,7 @@
# Now that all the tests are done, configure the brlcad_config.h file:
FILE(APPEND ${CONFIG_H_FILE} #endif /* __CONFIG_H__ */\n)
-configure_file(${CONFIG_H_FILE} ${BRLCAD_BINARY_DIR}/include/brlcad_config.h)
+configure_file(${CONFIG_H_FILE}
${BRLCAD_BINARY_DIR}/include/brlcad/brlcad_config.h)
# Before we finalize, set some specific global compiler flags
IF(MSVC)
Modified: brlcad/branches/cmake/include/CMakeLists.txt
===
--- brlcad/branches/cmake/include/CMakeLists.txt2011-01-14 10:13:14 UTC
(rev 42258)
+++ brlcad/branches/cmake/include/CMakeLists.txt2011-01-14 13:43:50 UTC
(rev 42259)
@@ -1,7 +1,6 @@
SET(brlcadinclude_required
RtServerImpl.h
bn.h
- ${CMAKE_CURRENT_BINARY_DIR}/brlcad_config.h
bu.h
common.h
config_win.h
@@ -81,8 +80,11 @@
sysv.h
)
+FILE(COPY ${brlcadinclude_required} DESTINATION
${CMAKE_BINARY_DIR}/include/brlcad)
INSTALL(FILES ${brlcadinclude_required} DESTINATION include/brlcad)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/brlcad_config.h DESTINATION
include/brlcad)
IF(NOT BRLCAD-BUILD_BENCHMARK_ONLY AND NOT BRLCAD-BUILD_RTSERVER_ONLY)
+ FILE(COPY ${brlcadinclude_wanted} DESTINATION
${CMAKE_BINARY_DIR}/include/brlcad)
INSTALL(FILES ${brlcadinclude_wanted} DESTINATION include/brlcad)
ENDIF(NOT BRLCAD-BUILD_BENCHMARK_ONLY AND NOT BRLCAD-BUILD_RTSERVER_ONLY)
Modified: brlcad/branches/cmake/src/adrt/CMakeLists.txt
===
--- brlcad/branches/cmake/src/adrt/CMakeLists.txt 2011-01-14 10:13:14 UTC
(rev 42258)
+++ brlcad/branches/cmake/src/adrt/CMakeLists.txt 2011-01-14 13:43:50 UTC
(rev 42259)
@@ -99,4 +99,5 @@
librender/texture_internal.h
libtie/tie.h
)
+FILE(COPY ${tie_HDRS} DESTINATION ${CMAKE_BINARY_DIR}/include/tie)
INSTALL(FILES ${tie_HDRS} DESTINATION include/tie)
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2011-01-14 10:13:14 UTC
(rev 42258)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2011-01-14 13:43:50 UTC
(rev 42259)
@@ -22,6 +22,16 @@
FILE(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/libz/zconf.h)
THIRD_PARTY_OPTION(ZLIB zlib)
THIRD_PARTY_SUBDIR(ZLIB libz)
+IF(BRLCAD_BUILD_LOCAL_ZLIB)
+ get_directory_property(ZLIB_PUBLIC_HDRS DIRECTORY libz DEFINITION
ZLIB_PUBLIC_HDRS)
+ FOREACH(zlib_hdr ${ZLIB_PUBLIC_HDRS})
+ IF(EXISTS ${zlib_hdr})
+ FILE(COPY ${zlib_hdr} DESTINATION
${CMAKE_BINARY_DIR}/include)
+ ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/libz/${zlib_hdr})
+ FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}/libz/${zlib_hdr}
DESTINATION
[brlcad-commits] SF.net SVN: brlcad:[42260] brlcad/branches/cmake/misc/CMakeLists.txt
Revision: 42260
http://brlcad.svn.sourceforge.net/brlcad/?rev=42260view=rev
Author: starseeker
Date: 2011-01-14 14:56:47 + (Fri, 14 Jan 2011)
Log Message:
---
local copy logic for db and misc - just have db build straight into the share
dir target instead of the local binary dir, since they're built targets.
Modified Paths:
--
brlcad/branches/cmake/misc/CMakeLists.txt
Modified: brlcad/branches/cmake/misc/CMakeLists.txt
===
--- brlcad/branches/cmake/misc/CMakeLists.txt 2011-01-14 13:43:50 UTC (rev
42259)
+++ brlcad/branches/cmake/misc/CMakeLists.txt 2011-01-14 14:56:47 UTC (rev
42260)
@@ -23,4 +23,5 @@
GQA_SAMPLE_DENSITIES
NIST_DENSITIES
)
+FILE(COPY ${density_DATAFILES} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/data)
INSTALL(FILES ${density_DATAFILES} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/data)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
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:[42261] brlcad/branches/cmake/doc/html/CMakeLists.txt
Revision: 42261
http://brlcad.svn.sourceforge.net/brlcad/?rev=42261view=rev
Author: starseeker
Date: 2011-01-14 14:57:21 + (Fri, 14 Jan 2011)
Log Message:
---
Make local copies of the html docs.
Modified Paths:
--
brlcad/branches/cmake/doc/html/CMakeLists.txt
Modified: brlcad/branches/cmake/doc/html/CMakeLists.txt
===
--- brlcad/branches/cmake/doc/html/CMakeLists.txt 2011-01-14 14:56:47 UTC
(rev 42260)
+++ brlcad/branches/cmake/doc/html/CMakeLists.txt 2011-01-14 14:57:21 UTC
(rev 42261)
@@ -2,6 +2,7 @@
bookmarks.html
toc.html
)
+FILE(COPY ${toplevel_HTML} DESTINATION ${CMAKE_BINARY_DIR}/${DATA_DIR}/html)
install(FILES ${toplevel_HTML} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html)
SET(anim_tutorial_HTML
@@ -47,9 +48,9 @@
manuals/Anim_Tutorial/v_eqn1.gif
manuals/Anim_Tutorial/v_eqn2.gif
)
+FILE(COPY ${anim_tutorial_HTML} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/manuals/Anim_Tutorial)
install(FILES ${anim_tutorial_HTML} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/manuals/Anim_Tutorial)
-
SET(cadwidgets_HTML
manuals/cadwidgets/Command.html
manuals/cadwidgets/Database.html
@@ -65,6 +66,7 @@
manuals/cadwidgets/index.html
manuals/cadwidgets/skeleton.html
)
+FILE(COPY ${cadwidgets_HTML} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/manuals/cadwidgets)
install(FILES ${cadwidgets_HTML} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/manuals/cadwidgets)
@@ -73,6 +75,7 @@
manuals/libbu/contents.html
manuals/libbu/index.html
)
+FILE(COPY ${libbu_HTML} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/manuals/libbu)
install(FILES ${libbu_HTML} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/manuals/libbu)
SET(libdm_HTML
@@ -83,6 +86,7 @@
manuals/libdm/preface.html
manuals/libdm/tcl.html
)
+FILE(COPY ${libdm_HTML} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/manuals/libdm)
install(FILES ${libdm_HTML} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/manuals/libdm)
@@ -93,6 +97,7 @@
manuals/librt/view_obj.html
manuals/librt/wdb_obj.html
)
+FILE(COPY ${librt_HTML} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/manuals/librt)
install(FILES ${librt_HTML} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/manuals/librt)
SET(manuals_HTML
@@ -104,6 +109,7 @@
manuals/index.html
manuals/small-eagleCAD.gif
)
+FILE(COPY ${manuals_HTML} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/manuals)
install(FILES ${manuals_HTML} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/manuals)
SET(manuals_mged_animmate_HTML
@@ -172,6 +178,7 @@
manuals/mged/animmate/viewget.html
manuals/mged/animmate/vscript_doc.html
)
+FILE(COPY ${manuals_mged_animate_HTML} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/manuals/mged/animate)
install(FILES ${manuals_mged_animmate_HTML} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/manuals/mged/animmate)
SET(manuals_mged_HTML
@@ -237,9 +244,10 @@
manuals/mged/skipped
manuals/mged/tex-html.tcl
)
+FILE(COPY ${manuals_mged_HTML} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/manuals/mged/)
install(FILES ${manuals_mged_HTML} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/manuals/mged)
-
+FILE(COPY manuals/shaders/camo.html DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/manuals/shaders)
install(FILES manuals/shaders/camo.html DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/manuals/shaders)
SET(relnotes_HTML
@@ -251,6 +259,7 @@
ReleaseNotes/email5.0.html
ReleaseNotes/index.html
)
+FILE(COPY ${relnotes_HTML} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/ReleaseNotes)
install(FILES ${relnotes_HTML} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/ReleaseNotes)
SET(relnotes_5_HTML
@@ -259,6 +268,7 @@
ReleaseNotes/Rel5.0/new_cmds.html
ReleaseNotes/Rel5.0/new_libs.html
)
+FILE(COPY ${relnotes_5_HTML} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/ReleaseNotes/Rel5.0)
install(FILES ${relnotes_5_HTML} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/ReleaseNotes/Rel5.0)
@@ -336,9 +346,11 @@
ReleaseNotes/Rel5.0/Summary/tsld018.htm
ReleaseNotes/Rel5.0/Summary/tsld019.htm
)
+FILE(COPY ${relnotes_5_summary_HTML} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/ReleaseNotes/Rel5.0/Summary)
install(FILES ${relnotes_5_summary_HTML} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/ReleaseNotes/Rel5.0/Summary)
SET(relnotes_6_HTML
ReleaseNotes/Rel6.0/index.html
)
+FILE(COPY ${relnotes_6_HTML} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/ReleaseNotes/Rel6.0)
install(FILES ${relnotes_6_HTML} DESTINATION
[brlcad-commits] SF.net SVN: brlcad:[42262] brlcad/branches/cmake/doc/docbook
Revision: 42262
http://brlcad.svn.sourceforge.net/brlcad/?rev=42262view=rev
Author: starseeker
Date: 2011-01-14 15:02:32 + (Fri, 14 Jan 2011)
Log Message:
---
Get docbook generation working in such a way that it puts files in the proper
places for build-dir hierarchy.
Modified Paths:
--
brlcad/branches/cmake/doc/docbook/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/articles/en/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/books/en/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/lessons/en/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/lessons/es/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/specifications/en/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/system/man1/en/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/system/man3/en/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/system/man5/en/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/system/mann/en/CMakeLists.txt
Modified: brlcad/branches/cmake/doc/docbook/CMakeLists.txt
===
--- brlcad/branches/cmake/doc/docbook/CMakeLists.txt2011-01-14 14:57:21 UTC
(rev 42261)
+++ brlcad/branches/cmake/doc/docbook/CMakeLists.txt2011-01-14 15:02:32 UTC
(rev 42262)
@@ -13,21 +13,21 @@
MACRO(DOCBOOK_TO_HTML targetname_suffix xml_files targetdir)
FOREACH(filename ${${xml_files}})
STRING(REGEX REPLACE ([0-9a-z_-]*).xml \\1 filename_root
${filename})
- SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${filename_root}.html)
+ SET(outfile
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/${filename_root}.html)
SET(targetname ${filename_root}_${targetname_suffix}_html)
ADD_CUSTOM_COMMAND(
OUTPUT ${outfile}
COMMAND XML_CATALOG_FILES=${XML_CATALOG_FILES}
${XSLTPROC_EXEC} ${XSLTPROC_FLAGS} -o ${outfile} ${XSL_XHTML_STYLESHEET}
${CMAKE_CURRENT_SOURCE_DIR}/${filename}
)
ADD_CUSTOM_TARGET(${targetname} ALL DEPENDS ${outfile})
- INSTALL(FILES ${outfile} DESTINATION ${targetdir})
+ INSTALL(FILES ${outfile} DESTINATION
${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
ENDFOREACH(filename ${${xml_files}})
ENDMACRO(DOCBOOK_TO_HTML targetname_suffix srcfile outfile targetdir)
-MACRO(DOCBOOK_TO_MAN targetname_suffix xml_files mannum manext)
+MACRO(DOCBOOK_TO_MAN targetname_suffix xml_files mannum manext targetdir)
FOREACH(filename ${${xml_files}})
STRING(REGEX REPLACE ([0-9a-z_-]*).xml \\1 filename_root
${filename})
- SET(outfile
${CMAKE_CURRENT_BINARY_DIR}/${filename_root}.${manext})
+ SET(outfile
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/${filename_root}.${manext})
SET(targetname
${filename_root}_${targetname_suffix}_man${mannum})
ADD_CUSTOM_COMMAND(
OUTPUT ${outfile}
@@ -42,8 +42,9 @@
FOREACH(filename ${${xml_files}})
STRING(REGEX REPLACE ([0-9a-z_-]*).xml \\1 filename_root
${filename})
SET(tmp_fo_file ${CMAKE_CURRENT_BINARY_DIR}/${filename_root}.fo)
- SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${filename_root}.pdf)
+ SET(outfile
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/${filename_root}.pdf)
SET(targetname ${filename_root}_${targetname_suffix}_pdf)
+ FILE(MAKE_DIRECTORY
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir})
ADD_CUSTOM_COMMAND(
OUTPUT ${tmp_fo_file}
COMMAND XML_CATALOG_FILES=${XML_CATALOG_FILES}
${XSLTPROC_EXEC} ${XSLTPROC_FLAGS} -o ${tmp_fo_file} ${XSL_FO_STYLESHEET}
${CMAKE_CURRENT_SOURCE_DIR}/${filename}
@@ -54,7 +55,7 @@
DEPENDS ${tmp_fo_file}
)
ADD_CUSTOM_TARGET(${targetname} ALL DEPENDS ${outfile})
- INSTALL(FILES ${outfile} DESTINATION ${targetdir})
+ INSTALL(FILES ${outfile} DESTINATION
${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
ENDFOREACH(filename ${${xml_files}})
ENDMACRO(DOCBOOK_TO_PDF targetname_suffix srcfile outfile targetdir)
Modified: brlcad/branches/cmake/doc/docbook/articles/en/CMakeLists.txt
===
--- brlcad/branches/cmake/doc/docbook/articles/en/CMakeLists.txt
2011-01-14 14:57:21 UTC (rev 42261)
+++ brlcad/branches/cmake/doc/docbook/articles/en/CMakeLists.txt
2011-01-14 15:02:32 UTC (rev 42262)
@@ -101,9 +101,10 @@
images/tire_fig14.png
)
-DOCBOOK_TO_HTML(article docbook_articles_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/articles/en)
+DOCBOOK_TO_HTML(article docbook_articles_EN html/articles/en)
+FILE(COPY ${docbook_articles_EN_IMAGES} DESTINATION
[brlcad-commits] SF.net SVN: brlcad:[42263] brlcad/trunk/src/tclscripts/archer/Archer.tcl
Revision: 42263
http://brlcad.svn.sourceforge.net/brlcad/?rev=42263view=rev
Author: bob1961
Date: 2011-01-14 15:28:54 + (Fri, 14 Jan 2011)
Log Message:
---
Move raytracePlus to the public section.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-01-14 15:02:32 UTC
(rev 42262)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-01-14 15:28:54 UTC
(rev 42263)
@@ -151,10 +151,10 @@
method pluginUpdateStatusBar {msg}
method importFg4Sections {_slist _wlist _delta}
- method setDefaultBindingMode {_mode}
# General
method askToRevert {}
+ method raytracePlus {}
# ArcherCore Override Section
method 3ptarb {args}
@@ -227,6 +227,7 @@
method vmake {args}
method initImages {}
method initFbImages{}
+ method setDefaultBindingMode {_mode}
# Object Edit Management
method checkpoint {_obj _type}
@@ -314,7 +315,6 @@
method fbModeToggle {}
method fbToggle {}
method rtEndCallback {_aborted}
- method raytracePlus {}
#XXX Need to split up menuStatusCB into one method per menu
method menuStatusCB {_w}
@@ -938,6 +938,30 @@
}
+::itcl::body Archer::raytracePlus {} {
+$itk_component(primaryToolbar) itemconfigure raytrace \
+ -image $mImage_rtAbort \
+ -command $itk_component(rtcntrl) abort
+$itk_component(rtcntrl) raytracePlus
+}
+
+
+::itcl::body Archer::askToRevert {} {
+if {!$mNeedSave} {
+ return 0
+}
+
+$itk_component(revertDialog) center [namespace tail $this]
+::update
+if {[$itk_component(revertDialog) activate]} {
+ revert
+ return 1
+}
+
+return 0
+}
+
+
::itcl::body Archer::3ptarb {args} {
eval ArcherCore::gedWrapper 3ptarb 0 0 1 1 $args
}
@@ -1966,22 +1990,6 @@
### Protected Section
###
-::itcl::body Archer::askToRevert {} {
-if {!$mNeedSave} {
- return 0
-}
-
-$itk_component(revertDialog) center [namespace tail $this]
-::update
-if {[$itk_component(revertDialog) activate]} {
- revert
- return 1
-}
-
-return 0
-}
-
-
### ArcherCore Override Section
###
::itcl::body Archer::buildCommandView {} {
@@ -4673,14 +4681,6 @@
}
-::itcl::body Archer::raytracePlus {} {
-$itk_component(primaryToolbar) itemconfigure raytrace \
- -image $mImage_rtAbort \
- -command $itk_component(rtcntrl) abort
-$itk_component(rtcntrl) raytracePlus
-}
-
-
::itcl::body Archer::menuStatusCB {_w} {
if {$mDoStatus} {
# entry might not support -label (i.e. tearoffs)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
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:[42264] brlcad/trunk/src/mged/mged.c
Revision: 42264 http://brlcad.svn.sourceforge.net/brlcad/?rev=42264view=rev Author: erikgreenwald Date: 2011-01-14 15:31:19 + (Fri, 14 Jan 2011) Log Message: --- avoid redefine on windows Modified Paths: -- brlcad/trunk/src/mged/mged.c Modified: brlcad/trunk/src/mged/mged.c === --- brlcad/trunk/src/mged/mged.c2011-01-14 15:28:54 UTC (rev 42263) +++ brlcad/trunk/src/mged/mged.c2011-01-14 15:31:19 UTC (rev 42264) @@ -589,6 +589,9 @@ #define CTRL_W '\027' #define ESC 27 #define BACKSPACE '\b' +#ifdef WIN32 +# undef DELETE +#endif #define DELETE 127 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ 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:[42265] brlcad/branches/cmake/db/CMakeLists.txt
Revision: 42265
http://brlcad.svn.sourceforge.net/brlcad/?rev=42265view=rev
Author: starseeker
Date: 2011-01-14 16:23:12 + (Fri, 14 Jan 2011)
Log Message:
---
Hmm, missed db dir in that commit.
Modified Paths:
--
brlcad/branches/cmake/db/CMakeLists.txt
Modified: brlcad/branches/cmake/db/CMakeLists.txt
===
--- brlcad/branches/cmake/db/CMakeLists.txt 2011-01-14 15:31:19 UTC (rev
42264)
+++ brlcad/branches/cmake/db/CMakeLists.txt 2011-01-14 16:23:12 UTC (rev
42265)
@@ -39,13 +39,13 @@
FOREACH(g_model ${G_SAMPLE_MODELS})
STRING(REGEX REPLACE ([0-9a-z]*).asc \\1 g_model_root ${g_model})
ADD_CUSTOM_COMMAND(
-OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${g_model_root}.g
-COMMAND asc2g ${CMAKE_CURRENT_SOURCE_DIR}/${g_model}
${CMAKE_CURRENT_BINARY_DIR}/${g_model_root}.g
+OUTPUT ${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g
+COMMAND asc2g ${CMAKE_CURRENT_SOURCE_DIR}/${g_model}
${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g
DEPENDS asc2g
)
- ADD_CUSTOM_TARGET(${g_model_root}.g ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/${g_model_root}.g)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${g_model_root}.g DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/db)
- SET(BUILT_MODELS
${BUILT_MODELS};${CMAKE_CURRENT_BINARY_DIR}/${g_model_root}.g)
+ ADD_CUSTOM_TARGET(${g_model_root}.g ALL DEPENDS
${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g)
+ INSTALL(FILES ${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g
DESTINATION ${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/db)
+ SET(BUILT_MODELS
${BUILT_MODELS};${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g)
ENDFOREACH(g_model ${G_SAMPLE_MODELS})
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
${BUILT_MODELS})
INSTALL(FILES terra.dsp DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/db)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
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:[42266] brlcad/trunk
Revision: 42266
http://brlcad.svn.sourceforge.net/brlcad/?rev=42266view=rev
Author: bob1961
Date: 2011-01-14 16:40:56 + (Fri, 14 Jan 2011)
Log Message:
---
Mods for overriding the display manager's auto font selection mechanism.
Implemented for ogl and wgl.
Modified Paths:
--
brlcad/trunk/include/dm.h
brlcad/trunk/src/libdm/dm-Null.c
brlcad/trunk/src/libdm/dm-X.c
brlcad/trunk/src/libdm/dm-ogl.c
brlcad/trunk/src/libdm/dm-plot.c
brlcad/trunk/src/libdm/dm-ps.c
brlcad/trunk/src/libdm/dm-rtgl.c
brlcad/trunk/src/libdm/dm-tk.c
brlcad/trunk/src/libdm/dm-wgl.c
brlcad/trunk/src/libdm/dm_obj.c
brlcad/trunk/src/libtclcad/ged_obj.c
brlcad/trunk/src/mged/dm-X.c
brlcad/trunk/src/mged/dm-ogl.c
brlcad/trunk/src/mged/dm-rtgl.c
brlcad/trunk/src/mged/dm-tk.c
brlcad/trunk/src/mged/dm-wgl.c
brlcad/trunk/src/mged/doevent.c
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/include/dm.h
===
--- brlcad/trunk/include/dm.h 2011-01-14 16:23:12 UTC (rev 42265)
+++ brlcad/trunk/include/dm.h 2011-01-14 16:40:56 UTC (rev 42266)
@@ -89,8 +89,15 @@
#define FONT8 8x13
#define FONT9 9x15
#define FONT10 10x20
-#define FONT11 12x24
+#define FONT12 12x24
+#if defined(_WIN32) !defined(__CYGWIN__)
+# define DM_VALID_FONT_SIZE(_size) (14 = (_size) (_size) = 29)
+#else
+# define DM_VALID_FONT_SIZE(_size) (5 = (_size) (_size) = 12 (_size)
!= 11)
+# define DM_FONT_SIZE_TO_NAME(_size) (((_size) == 5) ? FONT5 : (((_size) ==
6) ? FONT6 : (((_size) == 7) ? FONT7 : (((_size) == 8) ? FONT8 : (((_size) ==
9) ? FONT9 : (((_size) == 10) ? FONT10 : FONT12))
+#endif
+
/* Display Manager Types */
#define DM_TYPE_BAD -1
#define DM_TYPE_NULL 0
@@ -273,6 +280,7 @@
int dm_zbuffer;/** @brief !0 means zbuffer on */
int dm_zclip; /** @brief !0 means zclipping */
int dm_clearBufferAfter; /** @brief 1 means clear back buffer after
drawing and swap */
+int dm_fontsize; /** @brief !0 override's the auto font size */
Tcl_Interp *dm_interp; /** @brief Tcl interpreter */
};
@@ -313,7 +321,7 @@
#define DM_SET_FGCOLOR(_dmp, _r, _g, _b, _strict, _transparency)
_dmp-dm_setFGColor(_dmp, _r, _g, _b, _strict, _transparency)
#define DM_SET_BGCOLOR(_dmp, _r, _g, _b) _dmp-dm_setBGColor(_dmp, _r, _g, _b)
#define DM_SET_LINE_ATTR(_dmp, _width, _dashed) _dmp-dm_setLineAttr(_dmp,
_width, _dashed)
-#define DM_CONFIGURE_WIN(_dmp) _dmp-dm_configureWin(_dmp)
+#define DM_CONFIGURE_WIN(_dmp,_force) _dmp-dm_configureWin((_dmp),(_force))
#define DM_SET_WIN_BOUNDS(_dmp, _w) _dmp-dm_setWinBounds(_dmp, _w)
#define DM_SET_LIGHT(_dmp, _on) _dmp-dm_setLight(_dmp, _on)
#define DM_SET_TRANSPARENCY(_dmp, _on) _dmp-dm_setTransparency(_dmp, _on)
@@ -456,7 +464,7 @@
HIDDEN int _dmtype##_setBGColor(struct dm *dmp, unsigned char r, unsigned
char g, unsigned char b); \
HIDDEN int _dmtype##_setLineAttr(struct dm *dmp, int width, int style); \
HIDDEN int _dmtype##_configureWin_guts(struct dm *dmp, int force); \
- HIDDEN int _dmtype##_configureWin(struct dm *dmp); \
+ HIDDEN int _dmtype##_configureWin(struct dm *dmp, int force);
\
HIDDEN int _dmtype##_setLight(struct dm *dmp, int lighting_on); \
HIDDEN int _dmtype##_setTransparency(struct dm *dmp, int transparency_on); \
HIDDEN int _dmtype##_setDepthMask(struct dm *dmp, int depthMask_on); \
Modified: brlcad/trunk/src/libdm/dm-Null.c
===
--- brlcad/trunk/src/libdm/dm-Null.c2011-01-14 16:23:12 UTC (rev 42265)
+++ brlcad/trunk/src/libdm/dm-Null.c2011-01-14 16:40:56 UTC (rev 42266)
@@ -161,7 +161,8 @@
0, /* depth buffer is not writable */
0, /* no zbuffer */
0, /* no zclipping */
-1,/* clear back buffer after drawing and swap
*/
+1, /* clear back buffer after drawing and swap */
+0, /* not overriding the auto font size */
0 /* Tcl interpreter */
};
Modified: brlcad/trunk/src/libdm/dm-X.c
===
--- brlcad/trunk/src/libdm/dm-X.c 2011-01-14 16:23:12 UTC (rev 42265)
+++ brlcad/trunk/src/libdm/dm-X.c 2011-01-14 16:40:56 UTC (rev 42266)
@@ -1367,10 +1367,10 @@
HIDDEN int
-X_configureWin(struct dm *dmp)
+X_configureWin(struct dm *dmp, int force)
{
/* don't force */
-return X_configureWin_guts(dmp, 0);
+return X_configureWin_guts(dmp, force);
}
@@ -1673,7 +1673,8 @@
0, /* depth buffer is not writable */
0, /* no zbuffer */
0, /* no zclipping */
-1,
[brlcad-commits] SF.net SVN: brlcad:[42267] brlcad/branches/cmake
Revision: 42267
http://brlcad.svn.sourceforge.net/brlcad/?rev=42267view=rev
Author: starseeker
Date: 2011-01-14 18:38:27 + (Fri, 14 Jan 2011)
Log Message:
---
More logic for building up the share dir in the build tree.
Modified Paths:
--
brlcad/branches/cmake/misc/CMakeLists.txt
brlcad/branches/cmake/pix/CMakeLists.txt
brlcad/branches/cmake/src/archer/CMakeLists.txt
brlcad/branches/cmake/src/conv/CMakeLists.txt
brlcad/branches/cmake/src/gtools/CMakeLists.txt
brlcad/branches/cmake/src/libpkg/CMakeLists.txt
brlcad/branches/cmake/src/librt/CMakeLists.txt
brlcad/branches/cmake/src/nirt/CMakeLists.txt
brlcad/branches/cmake/src/other/tcl/doc/CMakeLists.txt
brlcad/branches/cmake/src/other/tk/doc/CMakeLists.txt
brlcad/branches/cmake/src/rt/CMakeLists.txt
brlcad/branches/cmake/src/util/CMakeLists.txt
Modified: brlcad/branches/cmake/misc/CMakeLists.txt
===
--- brlcad/branches/cmake/misc/CMakeLists.txt 2011-01-14 16:40:56 UTC (rev
42266)
+++ brlcad/branches/cmake/misc/CMakeLists.txt 2011-01-14 18:38:27 UTC (rev
42267)
@@ -13,10 +13,12 @@
ADD_SUBDIRECTORY(enigma)
ENDIF(NOT WIN32)
-CONFIGURE_FILE(brlcad-config.in ${CMAKE_CURRENT_BINARY_DIR}/brlcad-config
@ONLY)
+CONFIGURE_FILE(brlcad-config.in ${CMAKE_BINARY_DIR}/bin/brlcad-config @ONLY)
+FILE(COPY fortran_example.f DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/sample_applications)
INSTALL(FILES fortran_example.f DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/sample_applications)
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/brlcad-config DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_BIN_DIR})
+INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/bin/brlcad-config DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_BIN_DIR})
+FILE(COPY brlcad-config.1 DESTINATION ${CMAKE_BINARY_DIR}/${MAN_DIR}/man1)
INSTALL(FILES brlcad-config.1 DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man1)
SET(density_DATAFILES
Modified: brlcad/branches/cmake/pix/CMakeLists.txt
===
--- brlcad/branches/cmake/pix/CMakeLists.txt2011-01-14 16:40:56 UTC (rev
42266)
+++ brlcad/branches/cmake/pix/CMakeLists.txt2011-01-14 18:38:27 UTC (rev
42267)
@@ -38,5 +38,7 @@
configure_file(${pixlog} ${CMAKE_BINARY_DIR}/pix/${pixlog} COPYONLY)
ENDFOREACH(pixlog ${PIX_LOG})
+FILE(COPY ${BENCHMARK_PIX} DESTINATION ${CMAKE_BINARY_DIR}/${DATA_DIR}/pix)
+FILE(COPY ${PIX_LOG} DESTINATION ${CMAKE_BINARY_DIR}/${DATA_DIR}/pix)
INSTALL(FILES ${BENCHMARK_PIX} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/pix)
INSTALL(FILES ${PIX_LOG} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/pix)
Modified: brlcad/branches/cmake/src/archer/CMakeLists.txt
===
--- brlcad/branches/cmake/src/archer/CMakeLists.txt 2011-01-14 16:40:56 UTC
(rev 42266)
+++ brlcad/branches/cmake/src/archer/CMakeLists.txt 2011-01-14 18:38:27 UTC
(rev 42267)
@@ -3,19 +3,21 @@
INSTALL(PROGRAMS archer.bat DESTINATION bin)
ENDIF(WIN32)
configure_file(archer ${CMAKE_BINARY_DIR}/bin/archer COPYONLY)
-configure_file(itk_redefines.tcl ${CMAKE_CURRENT_BINARY_DIR}/itk_redefines.tcl
COPYONLY)
INSTALL(PROGRAMS archer DESTINATION bin)
+configure_file(itk_redefines.tcl
${CMAKE_BINARY_DIR}/${DATA_DIR}/tclscripts/itk_redefines.tcl COPYONLY)
INSTALL(FILES itk_redefines.tcl DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts)
set(archer_plugins
plugins/utility.tcl
plugins/wizards.tcl
)
-
+FILE(COPY ${archer_plugins} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/plugins/archer)
INSTALL(FILES ${archer_plugins} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/plugins/archer)
+FILE(COPY plugins/Core/README DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/plugins/archer/Core)
INSTALL(FILES plugins/Core/README DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/plugins/archer/Core)
+FILE(COPY plugins/Commands/README DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/plugins/archer/Command)
INSTALL(FILES plugins/Commands/README DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/plugins/archer/Command)
@@ -24,10 +26,13 @@
plugins/Utility/attrGroupsDisplayUtilityP.tcl
plugins/Utility/README
)
+FILE(COPY ${archer_utility_FILES} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/plugins/archer/Utility)
INSTALL(FILES ${archer_utility_FILES} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/plugins/archer/Utility)
+FILE(COPY plugins/Utility/botUtilityP/BotUtilityP.tcl DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/plugins/archer/Utility/botUtilityP)
INSTALL(FILES plugins/Utility/botUtilityP/BotUtilityP.tcl DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/plugins/archer/Utility/botUtilityP)
+FILE(COPY
plugins/Utility/attrGroupsDisplayUtilityP/AttrGroupsDisplayUtilityP.tcl
[brlcad-commits] SF.net SVN: brlcad:[42268] brlcad/branches/cmake
Revision: 42268
http://brlcad.svn.sourceforge.net/brlcad/?rev=42268view=rev
Author: starseeker
Date: 2011-01-14 19:12:52 + (Fri, 14 Jan 2011)
Log Message:
---
Tweaks to accomidate changes resulting from the new logic - get us building
again.
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/bench/CMakeLists.txt
brlcad/branches/cmake/db/CMakeLists.txt
brlcad/branches/cmake/misc/enigma/CMakeLists.txt
brlcad/branches/cmake/src/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2011-01-14 18:38:27 UTC (rev
42267)
+++ brlcad/branches/cmake/CMakeLists.txt2011-01-14 19:12:52 UTC (rev
42268)
@@ -957,15 +957,7 @@
set_property(CACHE BRLCAD-BUILD_SRC_OTHER PROPERTY STRINGS
Yes No Auto)
-
-
-# Virtually all of the BRL-CAD code needs the BRL-CAD include directories
-# and a couple of standard defines - set those up in variables now - the
-# idea being that if any other system-wide defines or include are needed
-# they can just be added here.
-SET(BRLCAD_STD_DEFS -DHAVE_CONFIG_H;-DBRLCADBUILD=1)
-SET(BRLCAD_STD_INCLUDES
${BRLCAD_BINARY_DIR}/include/brlcad;${BRLCAD_BINARY_DIR}/include)
-
+# We've done the toplevel configure steps, now add the subdirectories
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(db)
ADD_SUBDIRECTORY(include)
Modified: brlcad/branches/cmake/bench/CMakeLists.txt
===
--- brlcad/branches/cmake/bench/CMakeLists.txt 2011-01-14 18:38:27 UTC (rev
42267)
+++ brlcad/branches/cmake/bench/CMakeLists.txt 2011-01-14 19:12:52 UTC (rev
42268)
@@ -1,4 +1,5 @@
include_directories(
+ ${BRLCAD_BINARY_DIR}/include/brlcad
${BRLCAD_BINARY_DIR}/include
${BRLCAD_SOURCE_DIR}/include
${TCL_INCLUDE_DIRS}
Modified: brlcad/branches/cmake/db/CMakeLists.txt
===
--- brlcad/branches/cmake/db/CMakeLists.txt 2011-01-14 18:38:27 UTC (rev
42267)
+++ brlcad/branches/cmake/db/CMakeLists.txt 2011-01-14 19:12:52 UTC (rev
42268)
@@ -36,6 +36,7 @@
xmp.asc
)
+FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DATA_DIR}/db)
FOREACH(g_model ${G_SAMPLE_MODELS})
STRING(REGEX REPLACE ([0-9a-z]*).asc \\1 g_model_root ${g_model})
ADD_CUSTOM_COMMAND(
Modified: brlcad/branches/cmake/misc/enigma/CMakeLists.txt
===
--- brlcad/branches/cmake/misc/enigma/CMakeLists.txt2011-01-14 18:38:27 UTC
(rev 42267)
+++ brlcad/branches/cmake/misc/enigma/CMakeLists.txt2011-01-14 19:12:52 UTC
(rev 42268)
@@ -1,4 +1,5 @@
include_directories(
+ ${BRLCAD_BINARY_DIR}/include/brlcad
${BRLCAD_BINARY_DIR}/include
${BRLCAD_SOURCE_DIR}/include
)
Modified: brlcad/branches/cmake/src/CMakeLists.txt
===
--- brlcad/branches/cmake/src/CMakeLists.txt2011-01-14 18:38:27 UTC (rev
42267)
+++ brlcad/branches/cmake/src/CMakeLists.txt2011-01-14 19:12:52 UTC (rev
42268)
@@ -41,6 +41,7 @@
# in all BRL-CAD builds
include_directories(
+ ${BRLCAD_BINARY_DIR}/include/brlcad
${BRLCAD_BINARY_DIR}/include
${BRLCAD_SOURCE_DIR}/include
)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
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:[42269] brlcad/trunk
Revision: 42269
http://brlcad.svn.sourceforge.net/brlcad/?rev=42269view=rev
Author: brlcad
Date: 2011-01-14 19:26:24 + (Fri, 14 Jan 2011)
Log Message:
---
separate out the v4 database conversion routines that were oddly in tree.c out
into their own db_float.c (since they mostly deal with converting to/from the
dbfloat_t type).
Modified Paths:
--
brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj
brlcad/trunk/src/librt/CMakeLists.txt
brlcad/trunk/src/librt/Makefile.am
brlcad/trunk/src/librt/tree.c
Added Paths:
---
brlcad/trunk/src/librt/db_float.c
Modified: brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj
===
--- brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj2011-01-14 19:12:52 UTC
(rev 42268)
+++ brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj2011-01-14 19:26:24 UTC
(rev 42269)
@@ -372,6 +372,10 @@
/File
File
+ RelativePath=..\..\..\src\librt\db_float.c
+
+ /File
+ File
RelativePath=..\..\..\src\librt\db_inmem.c
/File
Modified: brlcad/trunk/src/librt/CMakeLists.txt
===
--- brlcad/trunk/src/librt/CMakeLists.txt 2011-01-14 19:12:52 UTC (rev
42268)
+++ brlcad/trunk/src/librt/CMakeLists.txt 2011-01-14 19:26:24 UTC (rev
42269)
@@ -18,6 +18,7 @@
db_alloc.c
db_anim.c
db_flags.c
+db_float.c
db_inmem.c
db_io.c
db_lookup.c
Modified: brlcad/trunk/src/librt/Makefile.am
===
--- brlcad/trunk/src/librt/Makefile.am 2011-01-14 19:12:52 UTC (rev 42268)
+++ brlcad/trunk/src/librt/Makefile.am 2011-01-14 19:26:24 UTC (rev 42269)
@@ -53,6 +53,7 @@
db_alloc.c \
db_anim.c \
db_flags.c \
+ db_float.c \
db_inmem.c \
db_io.c \
db_lookup.c \
Added: brlcad/trunk/src/librt/db_float.c
===
--- brlcad/trunk/src/librt/db_float.c (rev 0)
+++ brlcad/trunk/src/librt/db_float.c 2011-01-14 19:26:24 UTC (rev 42269)
@@ -0,0 +1,122 @@
+/* D B _ F L O A T . C
+ * BRL-CAD
+ *
+ * Copyright (c) 1995-2011 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @addtogroup librt */
+/** @{ */
+/** @file db_float.c
+ *
+ * v4 geometry database serialization routines.
+ *
+ */
+/** @} */
+
+#include common.h
+
+#include vmath.h
+#include db.h
+
+
+/**
+ * R T _ F A S T F _ F L O A T
+ *
+ * Convert TO fastf_t FROM 3xfloats (for database)
+ */
+void
+rt_fastf_float(fastf_t *ff, const dbfloat_t *fp, int n)
+{
+while (n--) {
+ *ff++ = *fp++;
+ *ff++ = *fp++;
+ *ff++ = *fp++;
+ ff += ELEMENTS_PER_VECT-3;
+}
+}
+
+
+/**
+ * R T _ M A T _ D B M A T
+ *
+ * Convert TO fastf_t matrix FROM dbfloats (for database)
+ */
+void
+rt_mat_dbmat(fastf_t *ff, const dbfloat_t *dbp)
+{
+
+*ff++ = *dbp++;
+*ff++ = *dbp++;
+*ff++ = *dbp++;
+*ff++ = *dbp++;
+
+*ff++ = *dbp++;
+*ff++ = *dbp++;
+*ff++ = *dbp++;
+*ff++ = *dbp++;
+
+*ff++ = *dbp++;
+*ff++ = *dbp++;
+*ff++ = *dbp++;
+*ff++ = *dbp++;
+
+*ff++ = *dbp++;
+*ff++ = *dbp++;
+*ff++ = *dbp++;
+*ff++ = *dbp++;
+}
+
+
+/**
+ * R T _ D B M A T _ M A T
+ *
+ * Convert FROM fastf_t matrix TO dbfloats (for updating database)
+ */
+void
+rt_dbmat_mat(dbfloat_t *dbp, const fastf_t *ff)
+{
+
+*dbp++ = (dbfloat_t) *ff++;
+*dbp++ = (dbfloat_t) *ff++;
+*dbp++ = (dbfloat_t) *ff++;
+*dbp++ = (dbfloat_t) *ff++;
+
+*dbp++ = (dbfloat_t) *ff++;
+*dbp++ = (dbfloat_t) *ff++;
+*dbp++ = (dbfloat_t) *ff++;
+*dbp++ = (dbfloat_t) *ff++;
+
+*dbp++ = (dbfloat_t) *ff++;
+*dbp++ = (dbfloat_t) *ff++;
+*dbp++ = (dbfloat_t) *ff++;
+*dbp++ = (dbfloat_t) *ff++;
+
+*dbp++ = (dbfloat_t) *ff++;
+*dbp++ = (dbfloat_t) *ff++;
+*dbp++ = (dbfloat_t) *ff++;
+*dbp++ = (dbfloat_t) *ff++;
+}
+
+
+/*
+ * Local
[brlcad-commits] SF.net SVN: brlcad:[42271]
Revision: 42271 http://brlcad.svn.sourceforge.net/brlcad/?rev=42271view=rev Author: erikgreenwald Date: 2011-01-14 19:48:37 + (Fri, 14 Jan 2011) Log Message: --- start stubbing in stuff for a client side lib jar Modified Paths: -- rt^3/trunk/src/CMakeLists.txt Added Paths: --- rt^3/trunk/src/client/ rt^3/trunk/src/client/CMakeLists.txt rt^3/trunk/src/client/java/ rt^3/trunk/src/client/java/CMakeLists.txt rt^3/trunk/src/client/java/GSClient.java Modified: rt^3/trunk/src/CMakeLists.txt === --- rt^3/trunk/src/CMakeLists.txt 2011-01-14 19:47:40 UTC (rev 42270) +++ rt^3/trunk/src/CMakeLists.txt 2011-01-14 19:48:37 UTC (rev 42271) @@ -41,4 +41,7 @@ #Apps Last ADD_SUBDIRECTORY(./GS) -#ADD_SUBDIRECTORY(./adminpanel) \ No newline at end of file +#ADD_SUBDIRECTORY(./adminpanel) + +# Client Library set +ADD_SUBDIRECTORY(client) Added: rt^3/trunk/src/client/CMakeLists.txt === --- rt^3/trunk/src/client/CMakeLists.txt(rev 0) +++ rt^3/trunk/src/client/CMakeLists.txt2011-01-14 19:48:37 UTC (rev 42271) @@ -0,0 +1,31 @@ +# +# +# BRL-CAD +# +# Copyright (c) 1997-2010 United States Government as represented by +# the U.S. Army Research Laboratory. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License +# version 2.1 as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this file; see the file named COPYING for more +# information. +# +# +# @file rt^3/src/client/CMakeLists.txt +# +# $Revision: $ +# $Author: $ +# +# Client libraries/implementations for the Geometry Service +# +## + +ADD_SUBDIRECTORY(java) Property changes on: rt^3/trunk/src/client/CMakeLists.txt ___ Added: svn:executable + * Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: rt^3/trunk/src/client/java/CMakeLists.txt === --- rt^3/trunk/src/client/java/CMakeLists.txt (rev 0) +++ rt^3/trunk/src/client/java/CMakeLists.txt 2011-01-14 19:48:37 UTC (rev 42271) @@ -0,0 +1,30 @@ +# +# +# BRL-CAD +# +# Copyright (c) 1997-2010 United States Government as represented by +# the U.S. Army Research Laboratory. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License +# version 2.1 as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this file; see the file named COPYING for more +# information. +# +# +# @file rt^3/src/client/java/CMakeLists.txt +# +# $Revision: $ +# $Author: $ +# +# Java class to provide the GS network protocol (IBME) +# +## + Property changes on: rt^3/trunk/src/client/java/CMakeLists.txt ___ Added: svn:executable + * Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: rt^3/trunk/src/client/java/GSClient.java === --- rt^3/trunk/src/client/java/GSClient.java(rev 0) +++ rt^3/trunk/src/client/java/GSClient.java2011-01-14 19:48:37 UTC (rev 42271) @@ -0,0 +1,139 @@ +/* G S C L I E N T . J A V A + * BRL-CAD + * + * Copyright (c) 2011 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This
[brlcad-commits] SF.net SVN: brlcad:[42273] brlcad/trunk
Revision: 42273 http://brlcad.svn.sourceforge.net/brlcad/?rev=42273view=rev Author: brlcad Date: 2011-01-14 20:07:25 + (Fri, 14 Jan 2011) Log Message: --- ted command needs fixing. Modified Paths: -- brlcad/trunk/BUGS brlcad/trunk/TODO Modified: brlcad/trunk/BUGS === --- brlcad/trunk/BUGS 2011-01-14 20:01:54 UTC (rev 42272) +++ brlcad/trunk/BUGS 2011-01-14 20:07:25 UTC (rev 42273) @@ -15,6 +15,8 @@ Recent Bugs --- +* ted command ends up not applying changes. + * asc2g of a .asc file containing the first line as a # comment results in a bu_malloc(0) bomb. comment lines should be valid in .asc files. Modified: brlcad/trunk/TODO === --- brlcad/trunk/TODO 2011-01-14 20:01:54 UTC (rev 42272) +++ brlcad/trunk/TODO 2011-01-14 20:07:25 UTC (rev 42273) @@ -17,7 +17,7 @@ THESE TASKS SHOULD HAPPEN BEFORE THE NEXT RELEASE - -* TBD. +* fix ted THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ 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:[42274] brlcad/trunk/TODO
Revision: 42274 http://brlcad.svn.sourceforge.net/brlcad/?rev=42274view=rev Author: brlcad Date: 2011-01-14 20:08:06 + (Fri, 14 Jan 2011) Log Message: --- ability to open binary-incompatible v4 databases Modified Paths: -- brlcad/trunk/TODO Modified: brlcad/trunk/TODO === --- brlcad/trunk/TODO 2011-01-14 20:07:25 UTC (rev 42273) +++ brlcad/trunk/TODO 2011-01-14 20:08:06 UTC (rev 42274) @@ -17,6 +17,8 @@ THESE TASKS SHOULD HAPPEN BEFORE THE NEXT RELEASE - +* open binary-incompatible v4 database + * fix ted This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ 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:[42275] brlcad/trunk/src/librt
Revision: 42275
http://brlcad.svn.sourceforge.net/brlcad/?rev=42275view=rev
Author: brlcad
Date: 2011-01-14 20:08:45 + (Fri, 14 Jan 2011)
Log Message:
---
move rt_in_rpp() into bbox.c given the related functionality, remove the
rt_DB_rpp() debugging function.
Modified Paths:
--
brlcad/trunk/src/librt/bbox.c
brlcad/trunk/src/librt/shoot.c
Modified: brlcad/trunk/src/librt/bbox.c
===
--- brlcad/trunk/src/librt/bbox.c 2011-01-14 20:08:06 UTC (rev 42274)
+++ brlcad/trunk/src/librt/bbox.c 2011-01-14 20:08:45 UTC (rev 42275)
@@ -167,6 +167,113 @@
}
+/**
+ * R T _ I N _ R P P
+ *
+ * Compute the intersections of a ray with a rectangular parallelpiped
+ * (RPP) that has faces parallel to the coordinate planes
+ *
+ * The algorithm here was developed by Gary Kuehl for GIFT. A good
+ * description of the approach used can be found in ?? by XYZZY and
+ * Barsky, ACM Transactions on Graphics, Vol 3 No 1, January 1984.
+ *
+ * Note: The computation of entry and exit distance is mandatory, as
+ * the final test catches the majority of misses.
+ *
+ * Note: A hit is returned if the intersect is behind the start point.
+ *
+ * Returns -
+ * 0 if ray does not hit RPP,
+ * !0 if ray hits RPP.
+ *
+ * Implicit return -
+ * rp-r_min = dist from start of ray to point at which ray ENTERS solid
+ * rp-r_max = dist from start of ray to point at which ray LEAVES solid
+ */
+int
+rt_in_rpp(struct xray *rp,
+ register const fastf_t *invdir, /* inverses of rp-r_dir[] */
+ register const fastf_t *min,
+ register const fastf_t *max)
+{
+register const fastf_t *pt = rp-r_pt[0];
+register fastf_t sv;
+#define st sv /* reuse the register */
+register fastf_t rmin = -INFINITY;
+register fastf_t rmax = INFINITY;
+
+/* Start with infinite ray, and trim it down */
+
+/* X axis */
+if (*invdir 0.0) {
+ /* Heading towards smaller numbers */
+ /* if (*min *pt) miss */
+ if (rmax (sv = (*min - *pt) * *invdir))
+ rmax = sv;
+ if (rmin (st = (*max - *pt) * *invdir))
+ rmin = st;
+} else if (*invdir 0.0) {
+ /* Heading towards larger numbers */
+ /* if (*max *pt) miss */
+ if (rmax (st = (*max - *pt) * *invdir))
+ rmax = st;
+ if (rmin ((sv = (*min - *pt) * *invdir)))
+ rmin = sv;
+} else {
+ /*
+* Direction cosines along this axis is NEAR 0,
+* which implies that the ray is perpendicular to the axis,
+* so merely check position against the boundaries.
+*/
+ if ((*min *pt) || (*max *pt))
+ return 0; /* MISS */
+}
+
+/* Y axis */
+pt++; invdir++; max++; min++;
+if (*invdir 0.0) {
+ if (rmax (sv = (*min - *pt) * *invdir))
+ rmax = sv;
+ if (rmin (st = (*max - *pt) * *invdir))
+ rmin = st;
+} else if (*invdir 0.0) {
+ if (rmax (st = (*max - *pt) * *invdir))
+ rmax = st;
+ if (rmin ((sv = (*min - *pt) * *invdir)))
+ rmin = sv;
+} else {
+ if ((*min *pt) || (*max *pt))
+ return 0; /* MISS */
+}
+
+/* Z axis */
+pt++; invdir++; max++; min++;
+if (*invdir 0.0) {
+ if (rmax (sv = (*min - *pt) * *invdir))
+ rmax = sv;
+ if (rmin (st = (*max - *pt) * *invdir))
+ rmin = st;
+} else if (*invdir 0.0) {
+ if (rmax (st = (*max - *pt) * *invdir))
+ rmax = st;
+ if (rmin ((sv = (*min - *pt) * *invdir)))
+ rmin = sv;
+} else {
+ if ((*min *pt) || (*max *pt))
+ return 0; /* MISS */
+}
+
+/* If equal, RPP is actually a plane */
+if (rmin rmax)
+ return 0; /* MISS */
+
+/* HIT. Only now do rp-r_min and rp-r_max have to be written */
+rp-r_min = rmin;
+rp-r_max = rmax;
+return 1; /* HIT */
+}
+
+
/*
* Local Variables:
* mode: C
Modified: brlcad/trunk/src/librt/shoot.c
===
--- brlcad/trunk/src/librt/shoot.c 2011-01-14 20:08:06 UTC (rev 42274)
+++ brlcad/trunk/src/librt/shoot.c 2011-01-14 20:08:45 UTC (rev 42275)
@@ -1821,240 +1821,6 @@
}
-/**
- * R T _ I N _ R P P
- *
- * Compute the intersections of a ray with a rectangular parallelpiped
- * (RPP) that has faces parallel to the coordinate planes
- *
- * The algorithm here was developed by Gary Kuehl for GIFT. A good
- * description of the approach used can be found in ?? by XYZZY and
- * Barsky, ACM Transactions on Graphics, Vol 3 No 1, January 1984.
- *
- * Note: The computation of entry and exit distance is mandatory, as
- * the final test catches the majority of misses.
- *
- * Note: A hit is returned if the intersect is behind the start point.
- *
- * Returns -
- * 0 if ray does not hit RPP,
[brlcad-commits] SF.net SVN: brlcad:[42276] brlcad/trunk
Revision: 42276
http://brlcad.svn.sourceforge.net/brlcad/?rev=42276view=rev
Author: starseeker
Date: 2011-01-14 20:10:30 + (Fri, 14 Jan 2011)
Log Message:
---
editit in mged is returning TCL_OK, so check for that when using it in ted;
without that check, if statement was failing and readsolid was never being
called - this fixes issue reported by ogloth on the sourceforge forums.
Modified Paths:
--
brlcad/trunk/NEWS
brlcad/trunk/src/mged/tedit.c
Modified: brlcad/trunk/NEWS
===
--- brlcad/trunk/NEWS 2011-01-14 20:08:45 UTC (rev 42275)
+++ brlcad/trunk/NEWS 2011-01-14 20:10:30 UTC (rev 42276)
@@ -13,6 +13,7 @@
--- 2010-12-XX Release 7.18.2 ---
--
+* fixed ted command to work using new editor support - Cliff Yapp
* fixed mged text editor invocation bug when editor wasn't installed
- Sean Morrison, Daniel Roßberg, Cliff Yapp
* support for comment lines at beginning of .asc files - John Anderson
Modified: brlcad/trunk/src/mged/tedit.c
===
--- brlcad/trunk/src/mged/tedit.c 2011-01-14 20:08:45 UTC (rev 42275)
+++ brlcad/trunk/src/mged/tedit.c 2011-01-14 20:10:30 UTC (rev 42276)
@@ -114,7 +114,7 @@
(void)fclose(fp);
-if (editit(argv[0], tmpfil)) {
+if (editit(argv[0], tmpfil) == TCL_OK) {
if (readsolid()) {
(void)unlink(tmpfil);
return TCL_ERROR;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
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:[42277] brlcad/trunk
Revision: 42277 http://brlcad.svn.sourceforge.net/brlcad/?rev=42277view=rev Author: brlcad Date: 2011-01-14 20:15:11 + (Fri, 14 Jan 2011) Log Message: --- ted was fixed quick by starseeker Modified Paths: -- brlcad/trunk/BUGS brlcad/trunk/TODO Modified: brlcad/trunk/BUGS === --- brlcad/trunk/BUGS 2011-01-14 20:10:30 UTC (rev 42276) +++ brlcad/trunk/BUGS 2011-01-14 20:15:11 UTC (rev 42277) @@ -15,8 +15,6 @@ Recent Bugs --- -* ted command ends up not applying changes. - * asc2g of a .asc file containing the first line as a # comment results in a bu_malloc(0) bomb. comment lines should be valid in .asc files. Modified: brlcad/trunk/TODO === --- brlcad/trunk/TODO 2011-01-14 20:10:30 UTC (rev 42276) +++ brlcad/trunk/TODO 2011-01-14 20:15:11 UTC (rev 42277) @@ -19,9 +19,7 @@ * open binary-incompatible v4 database -* fix ted - THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS --- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ 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:[42279] jbrlcad/trunk/src/test
Revision: 42279
http://brlcad.svn.sourceforge.net/brlcad/?rev=42279view=rev
Author: johnranderson
Date: 2011-01-14 20:19:36 + (Fri, 14 Jan 2011)
Log Message:
---
Added test/resources.
Added Paths:
---
jbrlcad/trunk/src/test/resources/
jbrlcad/trunk/src/test/resources/ktank.g
jbrlcad/trunk/src/test/resources/logging.config
jbrlcad/trunk/src/test/resources/test.asc
jbrlcad/trunk/src/test/resources/test.g
Added: jbrlcad/trunk/src/test/resources/ktank.g
===
(Binary files differ)
Property changes on: jbrlcad/trunk/src/test/resources/ktank.g
___
Added: svn:mime-type
+ application/octet-stream
Added: jbrlcad/trunk/src/test/resources/logging.config
===
--- jbrlcad/trunk/src/test/resources/logging.config
(rev 0)
+++ jbrlcad/trunk/src/test/resources/logging.config 2011-01-14 20:19:36 UTC
(rev 42279)
@@ -0,0 +1,20 @@
+# Specify the handlers to create in the root logger
+# (all loggers are children of the root logger)
+# The following creates two handlers
+handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
+
+# Set the default logging level for the root logger
+.level = ALL
+
+# Set the default logging level for new ConsoleHandler instances
+java.util.logging.ConsoleHandler.level = ALL
+
+# Set the default logging level for new FileHandler instances
+java.util.logging.FileHandler.level = ALL
+
+# Set the default formatter for new ConsoleHandler instances
+java.util.logging.ConsoleHandler.formatter =
java.util.logging.SimpleFormatter
+
+# Set the default logging level for specific loggers
+org.brlcad.geometry.level = INFO
+org.brlcad.spacePartition.level = INFO
Property changes on: jbrlcad/trunk/src/test/resources/logging.config
___
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: jbrlcad/trunk/src/test/resources/test.asc
===
--- jbrlcad/trunk/src/test/resources/test.asc (rev 0)
+++ jbrlcad/trunk/src/test/resources/test.asc 2011-01-14 20:19:36 UTC (rev
42279)
@@ -0,0 +1,9 @@
+title {Untitled BRL-CAD Database}
+units mm
+attr set {_GLOBAL}
+put {arb8} arb8 V1 {4000 -4000 -4000} V2 {4000 4000 -4000} V3 {4000 4000 4000}
V4 {4000 -4000 4000} V5 {-4000 -4000 -4000} V6 {-4000 4000 -4000} V7 {-4000
4000 4000} V8 {-4000 -4000 4000}
+put {bot} bot mode volume orient rh flags {} V { { 1800.708440289068221318303
981.4062102050420435261913 6179.71015508853676263 } {
1800.708440289068221318303 -909.1040534120261327188928
6179.71015508853676263 } { 2682.643484795234599005198
745.0924272529084646521369 -1124.660598969114744249964 } {
2682.643484795234599005198 -672.7902704598927812185138
-1124.660598969114744249964 } { 1328.080874384800608822843
-2546.333967819624376716092 6179.71015508853676263 } {
1973.702135938833180262009 -1900.712706265590895782225
-1124.660598969114744249964 } { 509.4659171810017141979188
-3491.589099628157782717608 6179.71015508853676263 } {
745.7797001331348383246223 -2609.654055121991405030712
-1124.660598969114744249964 } { -435.789214627531237056246
-3491.589099628157782717608 6179.71015508853676263 } {
-672.1029975796645885566249 -2609.654055121991405030712
-1124.660598969114744249964 } { -1254.40417183133013168117
-2546.33396781962346722139 6179.71015508853676263 } {
-1900.025433385363157867687 -1900.712706265590895782225
-1124.660598969114744249964 } { -1727.031737735597289429279
-909.1040534120265874662437 6179.71015508853676263 } {
-2608.966782241763212368824 -672.7902704598927812185138
-1124.660598969114744249964 } { -1727.031737735596834681928
981.4062102050430667077308 6179.71015508853676263 } {
-2608.966782241763212368824 745.0924272529091467731632
-1124.660598969114744249964 } { -1254.40417183133013168117
2618.636124612638923281338 6179.71015508853676263 } {
-1900.025433385362703120336 1973.014863058606351842172
-1124.660598969114744249964 } { -435.789214627531237056246
3563.891256421172329282854 6179.71015508853676263 } {
-672.1029975796645885566249 2681.956211915005951595958
-1124.660598969114744249964 } { 509.4659171810025668492017
3563.891256421172329282854 6179.71015508853676263 } {
745.7797001331360888798372 2681.956211915005951595958
-1124.660598969114744249964 } { 1328.080874384801063570194
2618.636124612638013786636 6179.71015508853676263 } {
1973.70213593883408975671 1973.014863058605897094822
-1124.660598969114744249964 } { 3564.578529301400521944743
508.7786443007750563083391 -8429.031352938240161165595 } {
3564.578529301400521944743
[brlcad-commits] SF.net SVN: brlcad:[42280] jbrlcad/trunk
Revision: 42280
http://brlcad.svn.sourceforge.net/brlcad/?rev=42280view=rev
Author: johnranderson
Date: 2011-01-14 20:25:34 + (Fri, 14 Jan 2011)
Log Message:
---
Eliminated test and lib directories.
Modified Paths:
--
jbrlcad/trunk/src/test/java/org/brlcad/ShootTest.java
jbrlcad/trunk/src/test/java/org/brlcad/geometry/BrlcadDbTest.java
jbrlcad/trunk/src/test/java/org/brlcad/info/RegionInfoTest.java
Removed Paths:
-
jbrlcad/trunk/lib/
jbrlcad/trunk/test/
Modified: jbrlcad/trunk/src/test/java/org/brlcad/ShootTest.java
===
--- jbrlcad/trunk/src/test/java/org/brlcad/ShootTest.java 2011-01-14
20:19:36 UTC (rev 42279)
+++ jbrlcad/trunk/src/test/java/org/brlcad/ShootTest.java 2011-01-14
20:25:34 UTC (rev 42280)
@@ -26,7 +26,7 @@
@Test
public void testShoot() {
try {
-BrlcadDb brlcadDb = new BrlcadDb(test/test.g);
+BrlcadDb brlcadDb = new BrlcadDb(src/test/resources/test.g);
PreppedDb prepped = new PreppedDb( brlcadDb, r1 );
Point start = new Point(12795.692849, 8897.447508, 8166.793304);
Vector3 dir = new Vector3(-0.7424, -0.5198, -0.4226);
Modified: jbrlcad/trunk/src/test/java/org/brlcad/geometry/BrlcadDbTest.java
===
--- jbrlcad/trunk/src/test/java/org/brlcad/geometry/BrlcadDbTest.java
2011-01-14 20:19:36 UTC (rev 42279)
+++ jbrlcad/trunk/src/test/java/org/brlcad/geometry/BrlcadDbTest.java
2011-01-14 20:25:34 UTC (rev 42280)
@@ -20,7 +20,7 @@
@Test
public void testGetTopLevelObjects() {
try {
-BrlcadDb db = new BrlcadDb(test/ktank.g);
+BrlcadDb db = new BrlcadDb(src/test/resources/ktank.g);
ListString tlos = db.getTopLevelObjects();
assertTrue( expected 5 top level objects, but found +
tlos.size(), 5 == tlos.size());
} catch (Exception ex) {
Modified: jbrlcad/trunk/src/test/java/org/brlcad/info/RegionInfoTest.java
===
--- jbrlcad/trunk/src/test/java/org/brlcad/info/RegionInfoTest.java
2011-01-14 20:19:36 UTC (rev 42279)
+++ jbrlcad/trunk/src/test/java/org/brlcad/info/RegionInfoTest.java
2011-01-14 20:25:34 UTC (rev 42280)
@@ -21,7 +21,7 @@
@Test
public void ktankTest() {
String[] rootObjects = {tank};
-RegionInfo ri = new RegionInfo(test/ktank.g, rootObjects);
+RegionInfo ri = new RegionInfo(src/test/resources/ktank.g,
rootObjects);
assertNotNull(RegionInfo Object should not be null, ri);
MapInteger,ListString idMap = ri.getIdentMap();
assertNotNull(ident map should not be null, idMap);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
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:[42281] brlcad/branches/cmake/src/libtclcad/ tclcadAutoPath.c
Revision: 42281
http://brlcad.svn.sourceforge.net/brlcad/?rev=42281view=rev
Author: starseeker
Date: 2011-01-14 21:15:50 + (Fri, 14 Jan 2011)
Log Message:
---
May be a few stray files remaining (need a systematic diff) but this is the
last major piece to create a duplicate of the installed share directory in the
build dir. tclcadAutoPath simpilfies down to a question of where the root and
data dirs are, if I'm understanding their usage correctly - I don't think I've
got it right yet but clearly this should simplify things dramatically.
Modified Paths:
--
brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c
Modified: brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c
===
--- brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c2011-01-14
20:25:34 UTC (rev 42280)
+++ brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c2011-01-14
21:15:50 UTC (rev 42281)
@@ -185,8 +185,7 @@
/* get name of installation binary */
snprintf(buffer, MAX_BUF, %s%cbin%c%s, root, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR, bu_getprogname());
-/* are we running from an installed binary? if so add to path */
-if (from_installed) {
+/* add paths based on bu_brlcad_root and bu_brlcad_data */
bu_vls_printf(auto_path, %c%s%clib,
BU_PATH_SEPARATOR, root, BU_DIR_SEPARATOR);
bu_vls_printf(auto_path, %c%s%clib%ctcl%s,
@@ -203,136 +202,23 @@
#endif
bu_vls_printf(auto_path, %c%s%clib%ciwidgets%s,
BU_PATH_SEPARATOR, root, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR, IWIDGETS_VERSION);
- bu_vls_printf(auto_path, %c%s%ctclscripts,
- BU_PATH_SEPARATOR, data, BU_DIR_SEPARATOR);
- bu_vls_printf(auto_path, %c%s%ctclscripts%clib,
- BU_PATH_SEPARATOR, data, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR);
- bu_vls_printf(auto_path, %c%s%ctclscripts%cutil,
- BU_PATH_SEPARATOR, data, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR);
- bu_vls_printf(auto_path, %c%s%ctclscripts%cmged,
- BU_PATH_SEPARATOR, data, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR);
- bu_vls_printf(auto_path, %c%s%ctclscripts%cgeometree,
- BU_PATH_SEPARATOR, data, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR);
- bu_vls_printf(auto_path, %c%s%ctclscripts%crtwizard,
- BU_PATH_SEPARATOR, data, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR);
- bu_vls_printf(auto_path, %c%s%ctclscripts%carcher,
- BU_PATH_SEPARATOR, data, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR);
-}
+ bu_vls_printf(auto_path, %c%s%c%s%ctclscripts,
+ BU_PATH_SEPARATOR, root, BU_DIR_SEPARATOR, data,
BU_DIR_SEPARATOR);
+ bu_vls_printf(auto_path, %c%s%c%s%ctclscripts%clib,
+ BU_PATH_SEPARATOR, root, BU_DIR_SEPARATOR, data,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
+ bu_vls_printf(auto_path, %c%s%c%s%ctclscripts%cutil,
+ BU_PATH_SEPARATOR, root, BU_DIR_SEPARATOR, data,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
+ bu_vls_printf(auto_path, %c%s%c%s%ctclscripts%cmged,
+ BU_PATH_SEPARATOR, root, BU_DIR_SEPARATOR, data,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
+ bu_vls_printf(auto_path, %c%s%c%s%ctclscripts%cgeometree,
+ BU_PATH_SEPARATOR, root, BU_DIR_SEPARATOR, data,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
+ bu_vls_printf(auto_path, %c%s%c%s%ctclscripts%crtwizard,
+ BU_PATH_SEPARATOR, root, BU_DIR_SEPARATOR, data,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
+ bu_vls_printf(auto_path, %c%s%c%s%ctclscripts%carcher,
+ BU_PATH_SEPARATOR, root, BU_DIR_SEPARATOR, data,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
-/* are we running uninstalled? */
-if(from_built)
- srcpath = BUILD_SOURCE_DIR;
+/*printf(AUTO_PATH IS %s\n, bu_vls_addr(auto_path)); */
-/* if uninstalled, add search paths for source invocation */
-if (from_built) {
-bu_vls_printf(auto_path, %c%s%clib%ctcl8.5,BU_PATH_SEPARATOR,
BUILD_BINARY_DIR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
-bu_vls_printf(auto_path, %c%s%clib,BU_PATH_SEPARATOR,
BUILD_BINARY_DIR, BU_DIR_SEPARATOR);
- bu_vls_printf(auto_path, %c%s%csrc%cother%ctcl%cunix,
- BU_PATH_SEPARATOR, srcpath, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
- bu_vls_printf(auto_path, %c%s%csrc%cother%ctcl%clibrary,
- BU_PATH_SEPARATOR, srcpath, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
- bu_vls_printf(auto_path, %c%s%csrc%cother%ctk%cunix,
- BU_PATH_SEPARATOR, srcpath, BU_DIR_SEPARATOR,
BU_DIR_SEPARATOR, BU_DIR_SEPARATOR, BU_DIR_SEPARATOR);
- bu_vls_printf(auto_path, %c%s%csrc%cother%ctk%clibrary,
- BU_PATH_SEPARATOR, srcpath,
[brlcad-commits] SF.net SVN: brlcad:[42282] brlcad/trunk/misc/win32-msvc8/libbu/libbu.vcproj
Revision: 42282 http://brlcad.svn.sourceforge.net/brlcad/?rev=42282view=rev Author: erikgreenwald Date: 2011-01-14 22:10:35 + (Fri, 14 Jan 2011) Log Message: --- add booleanize Modified Paths: -- brlcad/trunk/misc/win32-msvc8/libbu/libbu.vcproj Modified: brlcad/trunk/misc/win32-msvc8/libbu/libbu.vcproj === --- brlcad/trunk/misc/win32-msvc8/libbu/libbu.vcproj2011-01-14 21:15:50 UTC (rev 42281) +++ brlcad/trunk/misc/win32-msvc8/libbu/libbu.vcproj2011-01-14 22:10:35 UTC (rev 42282) @@ -334,6 +334,10 @@ /FileConfiguration /File File + RelativePath=..\..\..\src\libbu\booleanize.c + + /File + File RelativePath=..\..\..\src\libbu\brlcad_path.c FileConfiguration This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ 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:[42283] brlcad/trunk/src/libged/attr.c
Revision: 42283
http://brlcad.svn.sourceforge.net/brlcad/?rev=42283view=rev
Author: tbrowder2
Date: 2011-01-14 23:46:26 + (Fri, 14 Jan 2011)
Log Message:
---
sort attribute-value set array by attribute name
Modified Paths:
--
brlcad/trunk/src/libged/attr.c
Modified: brlcad/trunk/src/libged/attr.c
===
--- brlcad/trunk/src/libged/attr.c 2011-01-14 22:10:35 UTC (rev 42282)
+++ brlcad/trunk/src/libged/attr.c 2011-01-14 23:46:26 UTC (rev 42283)
@@ -27,6 +27,14 @@
#include ged.h
+/* comparison function for the avs-name qsort below -- based on example in
libc: man qsort */
+static int
+cmpstringp(const void *p1, const void *p2)
+{
+return strcmp((char * const)((struct bu_attribute_value_pair *)p1)-name,
+ (char * const)((struct bu_attribute_value_pair *)p2)-name);
+}
+
int
ged_attr(struct ged *gedp, int argc, const char *argv[])
{
@@ -72,6 +80,9 @@
return GED_ERROR;
}
+/* sort attribute-value set array by attribute name */
+qsort(avs.avp[0], avs.count, sizeof(struct bu_attribute_value_pair),
cmpstringp);
+
if (BU_STR_EQUAL(argv[1], get)) {
if (argc == 3) {
/* just list all the attributes */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
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:[42284] brlcad/trunk/NEWS
Revision: 42284 http://brlcad.svn.sourceforge.net/brlcad/?rev=42284view=rev Author: tbrowder2 Date: 2011-01-14 23:50:42 + (Fri, 14 Jan 2011) Log Message: --- updated NEWS for adding sort to mged attr show command Modified Paths: -- brlcad/trunk/NEWS Modified: brlcad/trunk/NEWS === --- brlcad/trunk/NEWS 2011-01-14 23:46:26 UTC (rev 42283) +++ brlcad/trunk/NEWS 2011-01-14 23:50:42 UTC (rev 42284) @@ -22,6 +22,8 @@ * upgraded libpng to version 1.4.5 - Cliff Yapp * upgraded zlib to version 1.2.5 - Cliff Yapp * removed shell execution ! command from vdeck - Cliff Yapp +* fixed mged 'attr show' command so that attributes are sorted by name +- Tom Browder -- --- 2010-12-07 Release 7.18.0 --- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ 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:[42285] brlcad/trunk/AUTHORS
Revision: 42285 http://brlcad.svn.sourceforge.net/brlcad/?rev=42285view=rev Author: tbrowder2 Date: 2011-01-15 00:04:40 + (Sat, 15 Jan 2011) Log Message: --- added my name and details to developer list Modified Paths: -- brlcad/trunk/AUTHORS Modified: brlcad/trunk/AUTHORS === --- brlcad/trunk/AUTHORS2011-01-14 23:50:42 UTC (rev 42284) +++ brlcad/trunk/AUTHORS2011-01-15 00:04:40 UTC (rev 42285) @@ -198,6 +198,11 @@ Open Source Quantum Research International, Inc. +Browder, Thomas M. Jr. ** +nicknames tbrowder2 +2011 January +Open Source +ManTech International Corporation MATHEMATICAL, ALGORITHMIC, AND GEOMETRIC SUPPORT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ 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:[42286] brlcad/trunk/NEWS
Revision: 42286 http://brlcad.svn.sourceforge.net/brlcad/?rev=42286view=rev Author: brlcad Date: 2011-01-15 00:06:16 + (Sat, 15 Jan 2011) Log Message: --- tom added sorting to the mged attr show command so that attributes are now displayed in alphabetical order instead of unsorted creation order. should improve readability. rewording NEWS line to fit on one line (two line comments are the exception when there are multiple authors) and moving to top of stack so it's in proper chronological order. Modified Paths: -- brlcad/trunk/NEWS Modified: brlcad/trunk/NEWS === --- brlcad/trunk/NEWS 2011-01-15 00:04:40 UTC (rev 42285) +++ brlcad/trunk/NEWS 2011-01-15 00:06:16 UTC (rev 42286) @@ -13,6 +13,7 @@ --- 2010-12-XX Release 7.18.2 --- -- +* 'attr show' command displays attributes sorted by name - Tom Browder * fixed ted command to work using new editor support - Cliff Yapp * fixed mged text editor invocation bug when editor wasn't installed - Sean Morrison, Daniel Roßberg, Cliff Yapp @@ -22,8 +23,6 @@ * upgraded libpng to version 1.4.5 - Cliff Yapp * upgraded zlib to version 1.2.5 - Cliff Yapp * removed shell execution ! command from vdeck - Cliff Yapp -* fixed mged 'attr show' command so that attributes are sorted by name -- Tom Browder -- --- 2010-12-07 Release 7.18.0 --- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ 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:[42287] brlcad/trunk/src
Revision: 42287 http://brlcad.svn.sourceforge.net/brlcad/?rev=42287view=rev Author: starseeker Date: 2011-01-15 01:03:15 + (Sat, 15 Jan 2011) Log Message: --- Fixes to ifdef in cursor.c, expand the logic for Sc.c in burst. Modified Paths: -- brlcad/trunk/src/burst/Sc.c brlcad/trunk/src/libcursor/cursor.c Modified: brlcad/trunk/src/burst/Sc.c === --- brlcad/trunk/src/burst/Sc.c 2011-01-15 00:06:16 UTC (rev 42286) +++ brlcad/trunk/src/burst/Sc.c 2011-01-15 01:03:15 UTC (rev 42287) @@ -38,16 +38,32 @@ #endif /* Externals from termlib(3). */ -#ifdef HAVE_NCURSES_H -# include ncurses.h +#ifdef HAVE_TERMLIB_H +# include termlib.h #else -# ifdef HAVE_CURSES_H -#include curses.h +# ifdef HAVE_NCURSES_H +#include ncurses.h +# else +#ifdef HAVE_CURSES_H +# include curses.h +#else +# ifdef HAVE_TERMCAP_H +#include termcap.h +# else +#ifdef HAVE_TERMINFO_H +# include terminfo.h +#else +# ifdef HAVE_TINFO_H +#include tinfo.h +# endif +#endif +# endif +#endif # endif +# ifdef HAVE_TERM_H +#include term.h +# endif #endif -#ifdef HAVE_TERM_H -# include term.h -#endif #include bu.h Modified: brlcad/trunk/src/libcursor/cursor.c === --- brlcad/trunk/src/libcursor/cursor.c 2011-01-15 00:06:16 UTC (rev 42286) +++ brlcad/trunk/src/libcursor/cursor.c 2011-01-15 01:03:15 UTC (rev 42287) @@ -27,7 +27,7 @@ #ifdef HAVE_TERMLIB_H # include termlib.h #else -# if HAVE_NCURSES_H +# ifdef HAVE_NCURSES_H #include ncurses.h # else #ifdef HAVE_CURSES_H @@ -46,7 +46,7 @@ # endif #endif # endif -# if HAVE_TERM_H +# ifdef HAVE_TERM_H #include term.h # endif #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ 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:[42288] brlcad/trunk/configure.ac
Revision: 42288 http://brlcad.svn.sourceforge.net/brlcad/?rev=42288view=rev Author: starseeker Date: 2011-01-15 01:04:44 + (Sat, 15 Jan 2011) Log Message: --- fix if-ifdef in configure.ac too... Modified Paths: -- brlcad/trunk/configure.ac Modified: brlcad/trunk/configure.ac === --- brlcad/trunk/configure.ac 2011-01-15 01:03:15 UTC (rev 42287) +++ brlcad/trunk/configure.ac 2011-01-15 01:04:44 UTC (rev 42288) @@ -3320,7 +3320,7 @@ #ifdef HAVE_TERMLIB_H # include termlib.h #else -# if HAVE_NCURSES_H +# ifdef HAVE_NCURSES_H #include ncurses.h # else #ifdef HAVE_CURSES_H @@ -3339,7 +3339,7 @@ # endif #endif # endif -# if HAVE_TERM_H +# ifdef HAVE_TERM_H #include term.h # endif #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ 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:[42289] brlcad/trunk/doc/docbook/system/mann/en/oed.xml
Revision: 42289 http://brlcad.svn.sourceforge.net/brlcad/?rev=42289view=rev Author: tbrowder2 Date: 2011-01-15 03:09:28 + (Sat, 15 Jan 2011) Log Message: --- add note about using in a script Modified Paths: -- brlcad/trunk/doc/docbook/system/mann/en/oed.xml Modified: brlcad/trunk/doc/docbook/system/mann/en/oed.xml === --- brlcad/trunk/doc/docbook/system/mann/en/oed.xml 2011-01-15 01:04:44 UTC (rev 42288) +++ brlcad/trunk/doc/docbook/system/mann/en/oed.xml 2011-01-15 03:09:28 UTC (rev 42289) @@ -65,6 +65,9 @@ paraPlaces MGED directly into the matrix edit mode. The emphasispath_rhs/emphasis must be a path to a primitive shape, and emphasispath_lhs/emphasis must be a path to a combination that includes the first component of emphasispath_rhs/emphasis as one of its members. The editedmatrix will be the matrix in the final component of emphasispath_lhs/emphasis that corresponds to the first component of emphasispath_rhs/emphasis. The last component in emphasispath_rhs /emphasis is used as the reference shape during object editing. /para + paraNote that for scripting the object to be edited must be in view so a commandB/command +or commande/command must be used on the object before using the commandoed/command command. + /para /refsect1 refsect1 id='examples' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ 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:[42290] brlcad/trunk/AUTHORS
Revision: 42290 http://brlcad.svn.sourceforge.net/brlcad/?rev=42290view=rev Author: brlcad Date: 2011-01-15 03:31:11 + (Sat, 15 Jan 2011) Log Message: --- rewrite the introduction with more details on the purpose and content of the authorship file. Modified Paths: -- brlcad/trunk/AUTHORS Modified: brlcad/trunk/AUTHORS === --- brlcad/trunk/AUTHORS2011-01-15 03:09:28 UTC (rev 42289) +++ brlcad/trunk/AUTHORS2011-01-15 03:31:11 UTC (rev 42290) @@ -4,38 +4,47 @@ The BRL-CAD development team would like to take this opportunity to thank the many people and organizations who have contributed to make -BRL-CAD the package that it is today. +BRL-CAD the package it is today. -BRL-CAD was originally conceived and written for the most part by the -late Michael John Muuss. He is the original primary architect and -author. The package has since been improved upon over the years by -Mike and the Advanced Computer Systems Team at the U.S. Army Research -Laboratory (* see note), as well as by many others around the world. -His work lives on in testament to his intellect and indomitable spirit -through the contributions and improvements by others. We strive to -recognize those groups and individuals that have helped make BRL-CAD -the package that it is today here. +BRL-CAD was originally conceived and written, for the most part, by +the late Michael John Muuss. He is our original primary architect and +author. His work lives on in testament to his intellect and +indomitable spirit through the contributions and improvements by +others. -Contributions of this collective work are separated into major -sections depending on the level and type of involvement that the -individual maintained. Contributors are roughly ordered -chronologically for each section, depending upon when involvement with -BRL-CAD began. The earliest contributors are named first; likewise, -the most recent contributors are listed at the bottom. +Over the years, Mike and the Advanced Computer Systems Team at the +U.S. Army Research Laboratory (* see note) as well as many others +around the world worked on developing BRL-CAD. In December 2004, +BRL-CAD development was opened and expanded with the conversion to +Open Source. -Names are optionally followed by the organizations that may have -supported their involvement to some degree, also listed in -chronological order. Developers are only categorized as such and are -only listed once as they tend to fit most categories, whereas the -contributions of others are categorized and repeated as appropriate. -Many individuals including many with affiliated organizations have -also supported the package of their own accord and on their own time. -Participation and contributions are graciously appreciated. +We strive to accurately and completely recognize the groups and +individuals that have helped make BRL-CAD the package it is today. +Contributors are grouped together and ordered chronologically with the +earliest named first; likewise, the more recent contributors are +listed at the bottom. -Active developers are denoted with an **, meaning that they have -been actively involved within the past 12 months. +Names are optionally followed by the date of their first contribution +and a list of affiliations. Individuals supporting and contributing +to the project on their own time and of their own accord have an +affiliation listed as Open Source. +BRL-CAD is the collective effort of many contributors (** see note). +Developers are characterized as individuals that have made substantial +contributions (hundreds or even thousands of features) to the project +over an extended period of time (years or even decades). Other +contributor credits are organized into the following general +categories depending on the level and type of involvement: + * Mathematical, Algorithmic, and Geometric Support + * Documentation Writers + * Code Contributors + * Special Thanks + +Participation and contributions are graciously appreciated and +credited in following. + + ORIGINAL ARCHITECT AND AUTHOR - @@ -806,8 +815,8 @@ whereas persons who continued or began contributions after the name change reflect the new name. -** The contributor is an active developer, meaning that they have been -actively involved with the BRL-CAD development within the past 12 months. +** The individual is an active contributor, participating in BRL-CAD +development within the past 12 months with numerous contributions. If any corrections or additions need to be made, please contact one of the active core developers. Additionally, you may send inquiries, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your
[brlcad-commits] SF.net SVN: brlcad:[42291] brlcad/trunk/AUTHORS
Revision: 42291 http://brlcad.svn.sourceforge.net/brlcad/?rev=42291view=rev Author: brlcad Date: 2011-01-15 03:38:58 + (Sat, 15 Jan 2011) Log Message: --- not quite so fast... :) getting listed as a developer is reflective not prospective. generally takes several hundred commits over sustained effort. you can track progress at http://www.ohloh.net/p/brlcad/contributors in the meantime (and you're already credited under code contributors). Modified Paths: -- brlcad/trunk/AUTHORS Modified: brlcad/trunk/AUTHORS === --- brlcad/trunk/AUTHORS2011-01-15 03:31:11 UTC (rev 42290) +++ brlcad/trunk/AUTHORS2011-01-15 03:38:58 UTC (rev 42291) @@ -207,11 +207,6 @@ Open Source Quantum Research International, Inc. -Browder, Thomas M. Jr. ** -nicknames tbrowder2 -2011 January -Open Source -ManTech International Corporation MATHEMATICAL, ALGORITHMIC, AND GEOMETRIC SUPPORT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ 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:[42292] brlcad/trunk/doc/docbook/system/mann/en/oed.xml
Revision: 42292 http://brlcad.svn.sourceforge.net/brlcad/?rev=42292view=rev Author: brlcad Date: 2011-01-15 03:45:43 + (Sat, 15 Jan 2011) Log Message: --- the 'e' command is discouraged in documentation, instead referring to its synonym, 'draw' Modified Paths: -- brlcad/trunk/doc/docbook/system/mann/en/oed.xml Modified: brlcad/trunk/doc/docbook/system/mann/en/oed.xml === --- brlcad/trunk/doc/docbook/system/mann/en/oed.xml 2011-01-15 03:38:58 UTC (rev 42291) +++ brlcad/trunk/doc/docbook/system/mann/en/oed.xml 2011-01-15 03:45:43 UTC (rev 42292) @@ -66,7 +66,7 @@ must be a path to a primitive shape, and emphasispath_lhs/emphasis must be a path to a combination that includes the first component of emphasispath_rhs/emphasis as one of its members. The editedmatrix will be the matrix in the final component of emphasispath_lhs/emphasis that corresponds to the first component of emphasispath_rhs/emphasis. The last component in emphasispath_rhs /emphasis is used as the reference shape during object editing. /para paraNote that for scripting the object to be edited must be in view so a commandB/command -or commande/command must be used on the object before using the commandoed/command command. +or commanddraw/command must be used on the object before using the commandoed/command command. /para /refsect1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ 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:[42293] brlcad/branches/cmake
Revision: 42293
http://brlcad.svn.sourceforge.net/brlcad/?rev=42293view=rev
Author: starseeker
Date: 2011-01-15 03:53:08 + (Sat, 15 Jan 2011)
Log Message:
---
Few left over updates that didn't get committed from the home machine.
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/db/CMakeLists.txt
brlcad/branches/cmake/doc/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2011-01-15 03:45:43 UTC (rev
42292)
+++ brlcad/branches/cmake/CMakeLists.txt2011-01-15 03:53:08 UTC (rev
42293)
@@ -1296,6 +1296,7 @@
NEWS
README
)
+FILE(COPY ${toplevel_DOCFILES} DESTINATION ${CMAKE_BINARY_DIR}/${DATA_DIR})
INSTALL(FILES ${toplevel_DOCFILES} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR})
Modified: brlcad/branches/cmake/db/CMakeLists.txt
===
--- brlcad/branches/cmake/db/CMakeLists.txt 2011-01-15 03:45:43 UTC (rev
42292)
+++ brlcad/branches/cmake/db/CMakeLists.txt 2011-01-15 03:53:08 UTC (rev
42293)
@@ -49,4 +49,5 @@
SET(BUILT_MODELS
${BUILT_MODELS};${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g)
ENDFOREACH(g_model ${G_SAMPLE_MODELS})
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
${BUILT_MODELS})
+FILE(COPY terra.dsp DESTINATION ${CMAKE_BINARY_DIR}/${DATA_DIR}/db)
INSTALL(FILES terra.dsp DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/db)
Modified: brlcad/branches/cmake/doc/CMakeLists.txt
===
--- brlcad/branches/cmake/doc/CMakeLists.txt2011-01-15 03:45:43 UTC (rev
42292)
+++ brlcad/branches/cmake/doc/CMakeLists.txt2011-01-15 03:53:08 UTC (rev
42293)
@@ -206,6 +206,7 @@
tube.txt
tool_categories.txt
)
+FILE(COPY ${documentation_DATA} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/doc)
install(FILES ${documentation_DATA} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/doc)
SET(doc_MANS
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
