[brlcad-commits] SF.net SVN: brlcad:[40229] brlcad/trunk/misc/win32-msvc8/brlcad/brlcad.sln

2010-08-19 Thread erikgreenwald 
Revision: 40229
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40229view=rev
Author:   erikgreenwald
Date: 2010-08-19 13:51:33 + (Thu, 19 Aug 2010)

Log Message:
---
Add dependencies for libadrt

Modified Paths:
--
brlcad/trunk/misc/win32-msvc8/brlcad/brlcad.sln

Modified: brlcad/trunk/misc/win32-msvc8/brlcad/brlcad.sln
===
--- brlcad/trunk/misc/win32-msvc8/brlcad/brlcad.sln 2010-08-19 13:51:01 UTC 
(rev 40228)
+++ brlcad/trunk/misc/win32-msvc8/brlcad/brlcad.sln 2010-08-19 13:51:33 UTC 
(rev 40229)
@@ -1856,6 +1856,15 @@
Debug.AspNetCompiler.Debug = True
Release.AspNetCompiler.Debug = False
EndProjectSection
+   ProjectSection(ProjectDependencies) = postProject
+   {EA0BB405-25E2-4B31-92D7-97316770F32B} = 
{EA0BB405-25E2-4B31-92D7-97316770F32B}
+   {2794FD11-F9A6-4145-92DE-A05F5A2E6361} = 
{2794FD11-F9A6-4145-92DE-A05F5A2E6361}
+   {1D505749-0F4C-4A47-8B06-8EBAA502451D} = 
{1D505749-0F4C-4A47-8B06-8EBAA502451D}
+   {6C09EE6B-A1A2-4F0D-B7B0-32647987B49A} = 
{6C09EE6B-A1A2-4F0D-B7B0-32647987B49A}
+   {02BD806D-906C-4B4A-98CA-165337BCD533} = 
{02BD806D-906C-4B4A-98CA-165337BCD533}
+   {5118991D-8BCF-4FE4-981C-F33C9D500E95} = 
{5118991D-8BCF-4FE4-981C-F33C9D500E95}
+   {D2A218BF-FAB3-4BEA-B288-E357FE003E29} = 
{D2A218BF-FAB3-4BEA-B288-E357FE003E29}
+   EndProjectSection
 EndProject
 Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40230] brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj

2010-08-19 Thread brlcad 
Revision: 40230
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40230view=rev
Author:   brlcad
Date: 2010-08-19 14:08:47 + (Thu, 19 Aug 2010)

Log Message:
---
remove bomb.c

Modified Paths:
--
brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj

Modified: brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj
===
--- brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj2010-08-19 13:51:33 UTC 
(rev 40229)
+++ brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj2010-08-19 14:08:47 UTC 
(rev 40230)
@@ -276,10 +276,6 @@

/File
File
-   RelativePath=..\..\..\src\librt\bomb.c
-   
-   /File
-   File
RelativePath=..\..\..\src\librt\bool.c

/File


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40231] rt^3/trunk/include/PkgServer.h

2010-08-19 Thread davidloman 
Revision: 40231
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40231view=rev
Author:   davidloman
Date: 2010-08-19 14:13:01 + (Thu, 19 Aug 2010)

Log Message:
---
Moved the libPkgCpp #defines to pkgcppcommon.h, so add appropriate #include 
statements.

Modified Paths:
--
rt^3/trunk/include/PkgServer.h

Modified: rt^3/trunk/include/PkgServer.h
===
--- rt^3/trunk/include/PkgServer.h  2010-08-19 14:08:47 UTC (rev 40230)
+++ rt^3/trunk/include/PkgServer.h  2010-08-19 14:13:01 UTC (rev 40231)
@@ -37,11 +37,12 @@
 
 bool listen(unsigned short port);
 
-/**
+/*
  * This function blocks until a new connection
  */
 PkgClient* waitForClient();
 
+
 private:
 int listenFD;
 pkg_switch* callBackTable;


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40232] rt^3/trunk/src/libPkgCpp/PkgServer.cxx

2010-08-19 Thread davidloman 
Revision: 40232
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40232view=rev
Author:   davidloman
Date: 2010-08-19 14:14:43 + (Thu, 19 Aug 2010)

Log Message:
---
Add appropriate #includes to make compiler happy.  Change char array init 
length to appropriate hold the 'string' version of a 5 digit number.

Modified Paths:
--
rt^3/trunk/src/libPkgCpp/PkgServer.cxx

Modified: rt^3/trunk/src/libPkgCpp/PkgServer.cxx
===
--- rt^3/trunk/src/libPkgCpp/PkgServer.cxx  2010-08-19 14:13:01 UTC (rev 
40231)
+++ rt^3/trunk/src/libPkgCpp/PkgServer.cxx  2010-08-19 14:14:43 UTC (rev 
40232)
@@ -78,6 +78,7 @@
   return pkgClientObj;
 }
 
+
 /*
  * Local Variables:
  * mode: C


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40233]

2010-08-19 Thread davidloman 
Revision: 40233
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40233view=rev
Author:   davidloman
Date: 2010-08-19 14:16:56 + (Thu, 19 Aug 2010)

Log Message:
---
Add method comments, trying to be a good documenter!  Implement wrapper fn's 
for pkg_process() and pkg_suckin() into PkgClient.

Modified Paths:
--
rt^3/trunk/include/PkgClient.h
rt^3/trunk/src/libPkgCpp/PkgClient.cxx

Modified: rt^3/trunk/include/PkgClient.h
===
--- rt^3/trunk/include/PkgClient.h  2010-08-19 14:14:43 UTC (rev 40232)
+++ rt^3/trunk/include/PkgClient.h  2010-08-19 14:16:56 UTC (rev 40233)
@@ -35,8 +35,30 @@
 PkgClient(pkg_conn* conn);
 virtual ~PkgClient();
 
+/*
+ * Blocks until a specific opcode has been received on the connection
+ */
 char* waitForMsg(int opcode);
 
+/*
+ * Attempts to route data in buffer to the appropriate call back.
+ * Returns:
+ *  0 on error
+ *  0 on EOF
+ *  0 on success
+ */
+int processData();
+
+/*
+ * Attempts to pull data off of the associated
+ * socket and place it in the internal buffer
+ * Returns:
+ *  0 on error
+ *  0 on EOF
+ *  0 on success
+ */
+int pullDataFromSocket();
+
 protected:
 int send(int opcode, const char* buffer, size_t bufferLen);
 

Modified: rt^3/trunk/src/libPkgCpp/PkgClient.cxx
===
--- rt^3/trunk/src/libPkgCpp/PkgClient.cxx  2010-08-19 14:14:43 UTC (rev 
40232)
+++ rt^3/trunk/src/libPkgCpp/PkgClient.cxx  2010-08-19 14:16:56 UTC (rev 
40233)
@@ -83,6 +83,18 @@
 
 }
 
+int
+PkgClient::processData()
+{
+  return pkg_process(this-conn);
+}
+
+int
+PkgClient::pullDataFromSocket()
+{
+  return pkg_suckin(this-conn);
+}
+
 /*
  * Local Variables:
  * mode: C


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40234] brlcad/trunk/src/tclscripts/archer/Archer.tcl

2010-08-19 Thread bob1961 
Revision: 40234
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40234view=rev
Author:   bob1961
Date: 2010-08-19 14:25:34 + (Thu, 19 Aug 2010)

Log Message:
---
Follow-on mods for updating the tree view after creating new combinations and 
changing membership of existing combinations.

Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl

Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl   2010-08-19 14:16:56 UTC 
(rev 40233)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl   2010-08-19 14:25:34 UTC 
(rev 40234)
@@ -265,7 +265,8 @@
# ArcherCore Override Section
method buildCommandView {}
method dblClick {_tags}
-   method addCombMemberWrapper {_cmd args}
+   method addCombMemberWrapper {_cmd _cflag args}
+   method createCombWrapper {_cmd args}
method removeCombMemberWrapper {_cmd args}
method combWrapper {_cmd _minArgs args}
method createWrapper {_cmd args}
@@ -1020,7 +1021,8 @@
 # Create a combination.
 #
 ::itcl::body Archer::c {args} {
-eval combWrapper c 2 $args
+#eval combWrapper c 2 $args
+putString Momentarily disabled. Fix me!
 }
 
 ::itcl::body Archer::clone {args} {
@@ -1986,9 +1988,7 @@
 }
 }
 
-::itcl::body Archer::addCombMemberWrapper {_cmd args} {
-SetWaitCursor $this
-
+::itcl::body Archer::addCombMemberWrapper {_cmd _cflag args} {
 # Returns a help message.
 set alen [llength $args]
 if {$alen == 0} {
@@ -2018,7 +2018,7 @@
}
 }
 
-
+SetWaitCursor $this
 checkpoint $cname $LEDGER_MODIFY
 
 if {[catch {eval gedCmd $_cmd $args} ret]} {
@@ -2029,44 +2029,31 @@
 # Delete any toplevel nodes of newly added members
 foreach member $mlist {
if {[info exists mText2Node($member)]} {
-   set leftovers {}
-   set leftovers2 {}
foreach sublist $mText2Node($member) {
set pnode [lindex $sublist 1]
 
if {$pnode == {}} {
set cnode [lindex $sublist 0]
+
+   # Before deleting cnode we need to delete any
+   # use of cnode and its descendents in the data
+   # variables that are used to interact with the
+   # tree viewer.
+   purgeNodeData $cnode
+
$itk_component(newtree) delete $cnode
-   unset mNode2Text($cnode)
-   unset mCNode2PList($cnode)
-
-   if {[info exists mPNode2CList()]} {
-   foreach csublist $mPNode2CList() {
-   if {$cnode != [lindex $csublist 1]} {
-   lappend leftovers2 $csublist
-   }
-   }
-   }   
-   } else {
-   lappend leftovers $sublist
}
}
-
-   if {$leftovers == {}} {
-   unset mText2Node($member)
-   } else {
-   set mText2Node($member) $leftovers
-   }
-
-   if {$leftovers2 == {}} {
-   unset mPNode2CList()
-   } else {
-   set mPNode2CList() $leftovers2
-   }
}
 }
 
+if {$_cflag} {
+   SetNormalCursor $this
+   return
+}
+
 # Add new members to parent node(s) if the parent nodes have been 
previously opened.
+set cnode 
 if {[info exists mText2Node($cname)]} {
foreach sublist $mText2Node($cname) {
set cnode [lindex $sublist 0]
@@ -2080,14 +2067,41 @@
 }
 
 object_update $cname
-#selectTreePath $cname
 
+if {$cnode != } {
+   set path 
+   foreach pnode [lreverse [findTreeParentNodes $cnode]] {
+   append path / $mNode2Text($pnode)
+   }
+
+   if {$path != } {
+   append path /
+   }
+
+   append path $cname
+   selectTreePath $path
+}
+
 SetNormalCursor $this
 }
 
-::itcl::body Archer::removeCombMemberWrapper {_cmd args} {
+::itcl::body Archer::createCombWrapper {_cmd args} {
+eval addCombMemberWrapper $_cmd 1 $args
+
 SetWaitCursor $this
+set cname [lindex $args 0]
+fillTree {} $cname $mEnableListView
+$itk_component(ged) draw $cname
+selectTreePath $cname
 
+checkpoint $cname $LEDGER_CREATE
+set mNeedSave 1
+updateSaveMode
+
+SetNormalCursor $this
+}
+
+::itcl::body Archer::removeCombMemberWrapper {_cmd args} {
 # Returns a help message.
 set alen [llength $args]
 if {$alen == 0} {
@@ -2109,6 +2123,7 @@
}
 }
 
+SetWaitCursor $this
 checkpoint $cname $LEDGER_MODIFY
 
 if {[catch {eval gedCmd $_cmd $args} ret]} {
@@ -2117,12 +2132,13 @@
 }
 
 # Delete members from parent nodes
+set cnode 
 if {[info exists mText2Node($cname)]} {

[brlcad-commits] SF.net SVN: brlcad:[40235]

2010-08-19 Thread davidloman 
Revision: 40235
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40235view=rev
Author:   davidloman
Date: 2010-08-19 14:32:47 + (Thu, 19 Aug 2010)

Log Message:
---
 close() needs to be public so we can actually use the method.

Modified Paths:
--
rt^3/trunk/include/PkgClient.h
rt^3/trunk/src/libPkgCpp/PkgClient.cxx

Modified: rt^3/trunk/include/PkgClient.h
===
--- rt^3/trunk/include/PkgClient.h  2010-08-19 14:25:34 UTC (rev 40234)
+++ rt^3/trunk/include/PkgClient.h  2010-08-19 14:32:47 UTC (rev 40235)
@@ -59,13 +59,14 @@
  */
 int pullDataFromSocket();
 
+void close();
 protected:
 int send(int opcode, const char* buffer, size_t bufferLen);
 
 private:
 pkg_conn* conn;
 
-void _close();
+
 };
 
 #endif /* __PKGCLIENT_H__ */

Modified: rt^3/trunk/src/libPkgCpp/PkgClient.cxx
===
--- rt^3/trunk/src/libPkgCpp/PkgClient.cxx  2010-08-19 14:25:34 UTC (rev 
40234)
+++ rt^3/trunk/src/libPkgCpp/PkgClient.cxx  2010-08-19 14:32:47 UTC (rev 
40235)
@@ -53,7 +53,7 @@
 }
 
 void
-PkgClient::_close()
+PkgClient::close()
 {
   //call the c function
   pkg_close(this-conn);
@@ -80,7 +80,6 @@
   this-conn = PKC_NULL;
 }
 }
-
 }
 
 int


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40236] rt^3/trunk/src/libPkgCpp/PkgServer.cxx

2010-08-19 Thread davidloman 
Revision: 40236
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40236view=rev
Author:   davidloman
Date: 2010-08-19 14:38:36 + (Thu, 19 Aug 2010)

Log Message:
---
Verbage changes.  Variable names didn't reflect their type or purpose well.

Modified Paths:
--
rt^3/trunk/src/libPkgCpp/PkgServer.cxx

Modified: rt^3/trunk/src/libPkgCpp/PkgServer.cxx
===
--- rt^3/trunk/src/libPkgCpp/PkgServer.cxx  2010-08-19 14:32:47 UTC (rev 
40235)
+++ rt^3/trunk/src/libPkgCpp/PkgServer.cxx  2010-08-19 14:38:36 UTC (rev 
40236)
@@ -41,11 +41,11 @@
 PkgServer::listen(unsigned short port)
 {
   //Convert port - char* to make libpkg happy.
-  char portname[7] = { 0 };
+  char portCString[7] = { 0 };
   int fd;
+  snprintf(portCString, 6, %d, port);
 
-  snprintf(portname, 6, %d, port);
-  fd = pkg_permserver(portname, tcp, 0, 0);
+  fd = pkg_permserver(portCString, tcp, 0, 0);
   //TODO Make this more robust.  TCP being hardcoded is bad.
 
   if (fd  0)


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40237] brlcad/branches/cmake/misc/CMake/FindTCL.cmake

2010-08-19 Thread starseeker 
Revision: 40237
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40237view=rev
Author:   starseeker
Date: 2010-08-19 14:53:08 + (Thu, 19 Aug 2010)

Log Message:
---
Start outlining the behavior I'm trying to achieve here, so I can keep it 
straight when writing code.

Modified Paths:
--
brlcad/branches/cmake/misc/CMake/FindTCL.cmake

Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 14:38:36 UTC 
(rev 40236)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 14:53:08 UTC 
(rev 40237)
@@ -4,16 +4,102 @@
 # Tcl/Tk, particularly in cases where multiple versions of Tcl/Tk are
 # present on a system and the case of OSX, which my have Tk built for
 # either X11 or Aqua.  On Windows there may be Cygwin installs of
-# Tcl/Tk as well.  The approach of this cmake file, as opposed to
-# the standard one in CMake, is to provide controlling variables which
-# will allow a parent CMakeLists.txt file to specify what they are
-# looking for.  For the moment, this file is intended to handle everything -
-# stub libraries, tclsh, and the libraries themselves.
-
+# Tcl/Tk as well. 
+#
+# Several design philosophy decisions have to be made - what to report
+# when multiple instances of Tcl/Tk are available, how much control to
+# allow users, how to expose those controls, etc.  Here are the rules
+# this particular implementation of FindTCLTK will strive to express:
+#
+# 1. If a parent CMakeLists.txt defines a specific Tcl_Prefix
+#directory, don't look for or return any settings using
+#other Tcl/Tk installations, even if nothing is found
+#below Tcl_Prefix and other installations are present.
+#Report NOTFOUND instead.
+#
+# 2. There will be three possible variables for controlling
+#which versions to report:
+#
+#TCLTK_MIN_VERSION
+#TCLTK_MAX_VERSION
+#TCLTK_EXACT_VERSION
+#
+#All of these will be expected to have the form:
+#
+#TCLTK_MAJOR_VERSION.TCLTK_MINOR_VERSION.TCLTK_PATCH_VERSION
+#
+#although the PATCH_VERSION will be optional.  If
+#no PATCH_VERSION is specified, any patch version will
+#be regarded as satisfying the criteria of any version
+#number test applied.
+#
+# 3. Tk provides the option to compile either for
+#the native graphics system (aqua, win32, etc.) or for
+#X11 (which is also the native graphics system on Unix-type
+#platforms other than Mac OSX.)  There are situations were
+#a program or developer may want to require a particular
+#windowing system.  If that is the case they can make use
+#of the following two options:
+#
+#TCLTK_NATIVE_GRAPHICS
+#TCLTK_X11_GRAPHICS
+#
+#If NATIVE_GRAPHICS is set to ON, a Tcl/Tk system is 
+#reported found only if the reported graphics system
+#matches that of the current platform.  If X11_GRAPHICS
+#is on, a match is reported only if the windowing system
+#reports X11.  If neither option is ON, the windowing
+#system is not a factor is deciding to report
+#FOUND or NOTFOUND.  If BOTH are ON (why??) NATIVE_GRAPHICS
+#will override the TCLTK_X11_GRAPHICS setting and set it
+#to OFF.
+#
+# 4. By default, if no prefix is specified, FindTCLTK will search
+#a list of directories and the system path for tcl libraries.
+#This list can be expanded by a parent CMakeLists.txt file
+#by specifying additional paths in this variable:
+#
+#TCLTK_SEARCH_ADDITIONAL_PATHS
+#
+# 5. On Apple platforms, there may be a Framework install of
+#Tcl/Tk. By default, FindTCLTK will start with this version
+#on OSX platforms if no TCL_PREFIX is specified, but will
+#move on to another installation if the Framework Tcl/Tk doesn't
+#satisfy other criteria.  If a developer wishes to REQUIRE a 
+#Framework build of Tcl/Tk and reject other installs even though
+#they may satisfy other criteria, they can enable the following 
+#option:
+#
+#TCKTK_USE_FRAMEWORK_ONLY
+#
+# 6. If a developer needs ONLY Tcl, without the Tk graphics library,
+#they can disable the following option (on by default)
+#  
+#TCLTK_REQUIRE_TK
+#
+# 7. Normally, FindTCLTK will assume that the intent is to compile
+#C code and will require headers.  If a developer needs Tcl/Tk
+#ONLY for the purposes of running tclsh or wish scripts and is
+#not planning to do any compiling, they can disable the following
+#option and FindTCLTK will report a Tcl/Tk installation without
+#headers as FOUND.
+#
+# The following results variables will be set (Tk variables only
+# set when TCKTK_REQUIRE_TK is ON):
+#
+#   TCLTK_FOUND  = Tcl (and Tk) found (see TCKTK_REQUIRE_TK)
+#   TCLTK_FOUND_VERSION  = Version of selected Tcl/TK
+#   TCL_LIBRARY  = path to Tcl library
+#   TCL_INCLUDE_PATH = path to directory containing tcl.h
+#

[brlcad-commits] SF.net SVN: brlcad:[40238]

2010-08-19 Thread davidloman 
Revision: 40238
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40238view=rev
Author:   davidloman
Date: 2010-08-19 15:04:20 + (Thu, 19 Aug 2010)

Log Message:
---
Refactor _close() to close() now that its public.  Convert std cstr to take 
connection args (Ip/Host + port)

Modified Paths:
--
rt^3/trunk/include/PkgClient.h
rt^3/trunk/src/libPkgCpp/PkgClient.cxx

Modified: rt^3/trunk/include/PkgClient.h
===
--- rt^3/trunk/include/PkgClient.h  2010-08-19 14:53:08 UTC (rev 40237)
+++ rt^3/trunk/include/PkgClient.h  2010-08-19 15:04:20 UTC (rev 40238)
@@ -27,11 +27,13 @@
 
 #include brlcad/pkg.h
 #include pkgcppcommon.h
+#include stdio.h
+#include iostream
 
 class PkgClient
 {
 public:
-PkgClient();
+PkgClient(std::string ipOrHostname, int port);
 PkgClient(pkg_conn* conn);
 virtual ~PkgClient();
 

Modified: rt^3/trunk/src/libPkgCpp/PkgClient.cxx
===
--- rt^3/trunk/src/libPkgCpp/PkgClient.cxx  2010-08-19 14:53:08 UTC (rev 
40237)
+++ rt^3/trunk/src/libPkgCpp/PkgClient.cxx  2010-08-19 15:04:20 UTC (rev 
40238)
@@ -26,9 +26,13 @@
 #include string.h
 
 
-PkgClient::PkgClient()
+PkgClient::PkgClient(std::string ipOrHostname, int port)
 {
-  this-conn = PKC_NULL;
+  char portCString[7] = { 0 };
+  snprintf(portCString, 6, %d, port);
+
+  //TODO Make this more robust.  TCP being hardcoded is bad.
+  this-conn = pkg_open(ipOrHostname.c_str(), portCString, tcp, NULL, NULL, 
NULL, NULL);
 }
 
 PkgClient::PkgClient(pkg_conn* conn)
@@ -40,7 +44,7 @@
 {
   if (this-conn != NULL)
 {
-  this-_close();
+  this-close();
   delete this-conn;
 }
 }


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40240] brlcad/trunk/src/other/tkhtml3/Makefile.am

2010-08-19 Thread brlcad 
Revision: 40240
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40240view=rev
Author:   brlcad
Date: 2010-08-19 15:19:18 + (Thu, 19 Aug 2010)

Log Message:
---
just build the libtool library instead of the tea library.  get rid of the 
version.

Modified Paths:
--
brlcad/trunk/src/other/tkhtml3/Makefile.am

Modified: brlcad/trunk/src/other/tkhtml3/Makefile.am
===
--- brlcad/trunk/src/other/tkhtml3/Makefile.am  2010-08-19 15:10:48 UTC (rev 
40239)
+++ brlcad/trunk/src/other/tkhtml3/Makefile.am  2010-08-19 15:19:18 UTC (rev 
40240)
@@ -32,8 +32,8 @@
 PKG_LIB_FILE   = @PKG_LIB_FILE@
 PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
 
-lib_BINARIES   = $(PKG_LIB_FILE)
-BINARIES   = $(lib_BINARIES)
+# lib_BINARIES = $(PKG_LIB_FILE)
+# BINARIES = $(lib_BINARIES)
 
 SHELL  = @SHELL@
 
@@ -250,7 +250,7 @@
 
 HDR = $(GENHDR) $(SRCHDR)
 
-EXTRA_LTLIBRARIES = libTkhtml_nil.la
+lib_LTLIBRARIES = libTkhtml.la
 
 noinst_HEADERS = \
src/css.h \
@@ -262,7 +262,7 @@
src/restrack.h \
src/swproc.h
 
-libTkhtml_nil_la_SOURCES = \
+libTkhtml_la_SOURCES = \
$(compiled_srcs) \
src/css.c \
src/cssdynamic.c \


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40243] brlcad/trunk

2010-08-19 Thread brlcad 
Revision: 40243
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40243view=rev
Author:   brlcad
Date: 2010-08-19 15:31:35 + (Thu, 19 Aug 2010)

Log Message:
---
rename tkhtml3 to just tkhtml.  including the version number on directories is 
just a recipe for long-term maintenance burden.

Modified Paths:
--
brlcad/trunk/configure.ac
brlcad/trunk/src/other/Makefile.am

Added Paths:
---
brlcad/trunk/src/other/tkhtml/

Removed Paths:
-
brlcad/trunk/src/other/tkhtml3/

Modified: brlcad/trunk/configure.ac
===
--- brlcad/trunk/configure.ac   2010-08-19 15:23:33 UTC (rev 40242)
+++ brlcad/trunk/configure.ac   2010-08-19 15:31:35 UTC (rev 40243)
@@ -308,8 +308,8 @@
 # force enable/disable building of iwidgets
 BC_ARG_ENABLE([build_iwidgets], [iwidgets-install], [Install the included 
iwidgets], [auto])
 
-# tkhtml3
-BC_ARG_ENABLE([build_tkhtml3], [tkhtml3-build], [Build the included tkhtml3], 
[yes])
+# tkhtml
+BC_ARG_ENABLE([build_tkhtml], [tkhtml-build], [Build the included tkhtml], 
[yes])
 
 # togl
 #BC_ARG_ENABLE([build_togl], [togl-build], [Build the included togl], [no])
@@ -514,8 +514,10 @@
 BC_ARG_ALIAS([build_iwidgets], [iwidgets])
 BC_ARG_ALIAS([build_iwidgets], [iwidgets-build])
 
-# aliases to force building tkhtml3 (help uses tkhtml3-build)
-BC_ARG_ALIAS([build_tkhtml3], [tkhtml3])
+# aliases to force building tkhtml (help uses tkhtml-build)
+BC_ARG_ALIAS([build_tkhtml], [tkhtml])
+BC_ARG_ALIAS([build_tkhtml], [tkhtml3])
+BC_ARG_ALIAS([build_tkhtml], [tkhtml3-build])
 
 # aliases to force building tktable (help uses tktable-build)
 BC_ARG_ALIAS([build_tktable], [tktable])
@@ -689,8 +691,8 @@
if test x$bc_build_iwidgets_set = xno ; then
bc_build_iwidgets=$set_everything
fi
-   if test x$bc_build_tkhtml3 = xno ; then
-   bc_build_tkhtml3=$set_everything
+   if test x$bc_build_tkhtml = xno ; then
+   bc_build_tkhtml=$set_everything
fi
if test x$bc_build_tkpng_set = xno ; then
bc_build_tkpng=$set_everything
@@ -825,8 +827,8 @@
 AC_MSG_CHECKING(whether to install the iwidgets library)
 AC_MSG_RESULT($bc_build_iwidgets)
 
-AC_MSG_CHECKING(whether to build the tkhtml3 library)
-AC_MSG_RESULT($bc_build_tkhtml3)
+AC_MSG_CHECKING(whether to build the tkhtml library)
+AC_MSG_RESULT($bc_build_tkhtml)
 
 AC_MSG_CHECKING(whether to build the tktable library)
 AC_MSG_RESULT($bc_build_tktable)
@@ -3157,20 +3159,16 @@
 AC_SUBST(IWIDGETS_VERSION)
 
 
-dnl *** tkhtml3 ***
-dnl figure out whether we need to build tkhtml3
-TKHTML3_VERSION=alpha16
-AC_SUBST(TKHTML3_VERSION)
-AC_MSG_CHECKING(whether to build tkhtml3)
-if test ! x$bc_build_tkhtml3 = xno ; then
-build_brlcad_tkhtml3=yes
+dnl *** tkhtml ***
+dnl figure out whether we need to build tkhtml
+AC_MSG_CHECKING(whether to build tkhtml)
+if test ! x$bc_build_tkhtml = xno ; then
+build_brlcad_tkhtml=yes
 AC_MSG_RESULT(yes)
 else
-build_brlcad_tkhtml3=no
-TKHTML3=
+build_brlcad_tkhtml=no
 AC_MSG_RESULT(no)
 fi
-AC_SUBST(TKHTML3)
 
 dnl *** togl ***
 dnl figure out whether we need to build togl
@@ -3862,7 +3860,7 @@
 AM_CONDITIONAL(BUILD_ITCL, [test x$build_brlcad_itcl = xyes])
 AM_CONDITIONAL(BUILD_ITK, [test x$build_brlcad_itk = xyes])
 AM_CONDITIONAL(BUILD_IWIDGETS, [test x$build_brlcad_iwidgets = xyes])
-AM_CONDITIONAL(BUILD_TKHTML3, [test x$build_brlcad_tkhtml3 = xyes])
+AM_CONDITIONAL(BUILD_TKHTML, [test x$build_brlcad_tkhtml = xyes])
 AM_CONDITIONAL(BUILD_TKTABLE, [test x$build_brlcad_tktable = xyes])
 #AM_CONDITIONAL(BUILD_TOGL, [test x$build_brlcad_togl = xyes__disabled__])
 AM_CONDITIONAL(BUILD_TKPNG, [test x$build_brlcad_tkpng = xyes])
@@ -4151,15 +4149,15 @@
 AC_CONFIG_SUBDIRS([src/other/step])
 fi
 
-dnl configure tkhtml3
-if test x$build_brlcad_tkhtml3 = xyes ; then
+dnl configure tkhtml
+if test x$build_brlcad_tkhtml = xyes ; then
 ac_configure_args=$ac_configure_args --exec-prefix=\$bc_prefix\
-# this is a hack to all tkhtml3 to see when the tk headers are in odd 
+# this is a hack to all tkhtml to see when the tk headers are in odd 
 # places. it seems to ignore the CPPFLAGS in it's configure phase.
 if test ! x$TKINCDIR = x ; then
ac_configure_args=$ac_configure_args --with-tkinclude=$TKINCDIR
 fi
-AC_CONFIG_SUBDIRS([src/other/tkhtml3])
+AC_CONFIG_SUBDIRS([src/other/tkhtml])
 fi
 
 #dnl configure togl
@@ -4479,7 +4477,7 @@
 AC_MSG_RESULT([Build Tk .: $build_brlcad_tk])
 AC_MSG_RESULT([Build Itcl/Itk ...: $build_brlcad_itcl])
 AC_MSG_RESULT([Build IWidgets ...: $build_brlcad_iwidgets])
-AC_MSG_RESULT([Build tkhtml3 : $build_brlcad_tkhtml3])
+AC_MSG_RESULT([Build tkhtml .: $build_brlcad_tkhtml])
 AC_MSG_RESULT([Build tkpng

[brlcad-commits] SF.net SVN: brlcad:[40244] brlcad/branches/cmake/misc/CMake/FindTCL.cmake

2010-08-19 Thread starseeker 
Revision: 40244
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40244view=rev
Author:   starseeker
Date: 2010-08-19 16:00:07 + (Thu, 19 Aug 2010)

Log Message:
---
start working on a macro for the looping search through versions

Modified Paths:
--
brlcad/branches/cmake/misc/CMake/FindTCL.cmake

Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 15:31:35 UTC 
(rev 40243)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 16:00:07 UTC 
(rev 40244)
@@ -134,80 +134,66 @@
MESSAGE(TK graphics: ${${resultvar}})
 ENDMACRO()
 
-TKGRAPHICSSYSTEM(wish TK_GRAPHICSTYPE)
+#TKGRAPHICSSYSTEM(wish TK_GRAPHICSTYPE)
 
-# There are four variables that will be used as feeders
-# for locating Tcl/Tk installations - TCL_PREFIX, TCL_INCLUDE_DIR,
-# TCL_LIBRARY_DIR, and TCL_BIN_DIR.  In search paths, TCL_PREFIX
-# generated paths should come after the more specific variables.
-
-IF(TCL_PREFIX)
-   SET(TCL_PREFIX_BIN ${TCL_PREFIX}/bin)
-   SET(TCL_PREFIX_LIB ${TCL_PREFIX}/lib)
-   SET(TCL_PREFIX_INC ${TCL_PREFIX}/include)
-ENDIF(TCL_PREFIX)
-
+# For ActiveState's Tcl/Tk install on Windows, there are some specific
+# paths that may be needed.  This is a macro-ized version of the paths
+# found in CMake's FindTCL.cmake
 MACRO(WIN32TCLTKPATHS vararray extension)
   IF(WIN32)
 GET_FILENAME_COMPONENT(
   ActiveTcl_CurrentVersion 
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion] 
   NAME)
-SET(${vararray} ${${vararray}}
-  
[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/${extension})
+  SET(${vararray} ${${vararray}}
+
[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/${extension})
   FOREACH(MAJORNUM ${TCLTK_POSSIBLE_MAJOR_VERSIONS})
 FOREACH(MINORNUM ${TCLTK_POSSIBLE_MINOR_VERSIONS})
  SET(${vararray} ${${vararray}} 
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\${MAJORNUM}.${MINORNUM};Root]/${extension})
 ENDFOREACH()
   ENDFOREACH()
-ENDIF(WIN32)
+   ENDIF(WIN32)
 ENDMACRO(WIN32TCLTKPATHS)
 
-IF(WIN32)
-   WIN32TCLTKPATHS(SYSTEM_LOCALS bin)
-endif(WIN32)
-
-SET(SEARCHPATHS ${TCL_BIN_DIR} ${TCL_PREFIX_BIN} ${SYSTEM_LOCALS})
-
-FOREACH(MAJORNUM ${TCLTK_POSSIBLE_MAJOR_VERSIONS})
-   FOREACH(MINORNUM ${TCLTK_POSSIBLE_MINOR_VERSIONS})
-  SET(TCL_TCLSH${MAJORNUM}${MINORNUM} 
TCL_TCLSH${MAJORNUM}${MINORNUM}-NOTFOUND)
-  FOREACH(SPATH ${SEARCHPATHS})
- FIND_PROGRAM(TCL_TCLSH${MAJORNUM}${MINORNUM} NAMES 
tclsh${MAJORNUM}.${MINORNUM} tclsh${MAJORNUM}${MINORNUM} PATHS ${SPATH} 
NO_SYSTEM_PATH)
- IF(NOT TCL_TCLSH${MAJORNUM}${MINORNUM} MATCHES NOTFOUND$)
-SET(TCL_TCLSH${MAJORNUM}${MINORNUM}_LIST 
${TCL_TCLSH${MAJORNUM}${MINORNUM}_LIST} ${TCL_TCLSH${MAJORNUM}${MINORNUM}})
- endif()
- SET(TCL_TCLSH${MAJORNUM}${MINORNUM} 
TCL_TCLSH${MAJORNUM}${MINORNUM}-NOTFOUND)
-  ENDFOREACH()
-  # Tried all the specific paths - now see what the system PATH has
-  FIND_PROGRAM(TCL_TCLSH${MAJORNUM}${MINORNUM} NAMES 
tclsh${MAJORNUM}.${MINORNUM} tclsh${MAJORNUM}${MINORNUM})
-  IF(NOT TCL_TCLSH${MAJORNUM}${MINORNUM} MATCHES NOTFOUND$)
- # Make sure we don't have it already
- IF (NOT TCL_TCLSH${MAJORNUM}${MINORNUM}_LIST MATCHES 
${TCL_TCLSH${MAJORNUM}${MINORNUM}})
-# On repeat configures, CMAKE_INSTALL_PREFIX apparently gets added 
to the FIND_PROGRAM search path.  This is a problem
-# if re-installing over a previous compile that includes a tclsh 
of its own, so strip these out - never want
-# to use a tclsh from a previous build to do the current build!
-IF(NOT TCL_TCLSH${MAJORNUM}${MINORNUM} MATCHES 
^${CMAKE_INSTALL_PREFIX})
-   SET(TCL_TCLSH${MAJORNUM}${MINORNUM}_LIST 
${TCL_TCLSH${MAJORNUM}${MINORNUM}_LIST} ${TCL_TCLSH${MAJORNUM}${MINORNUM}})
+MACRO(FINDLIBRARYVERSIONS targetname pathnames options)
+   FOREACH(MAJORNUM ${TCLTK_POSSIBLE_MAJOR_VERSIONS})
+  FOREACH(MINORNUM ${TCLTK_POSSIBLE_MINOR_VERSIONS})
+ SET(TCLTK_${targetname}${MAJORNUM}${MINORNUM} 
TCLTK_${targetname}${MAJORNUM}${MINORNUM}-NOTFOUND)
+ FOREACH(SPATH ${pathnames})
+FIND_LIBRARY(TCLTK_${targetname}${MAJORNUM}${MINORNUM} NAMES 
${targetname}${MAJORNUM}.${MINORNUM} ${targetname}${MAJORNUM}${MINORNUM} PATHS 
${SPATH} ${options})
+IF(NOT TCLTK_${targetname}${MAJORNUM}${MINORNUM} MATCHES 
NOTFOUND$)
+   # On repeat configures, CMAKE_INSTALL_PREFIX apparently gets 
added to the FIND_* paths.  This is a problem
+   # if re-installing over a previous install so strip these out - 
don't use output from the previous build to 
+  # do the current build!
+   IF(NOT TCLTK_${targetname}${MAJORNUM}${MINORNUM}

[brlcad-commits] SF.net SVN: brlcad:[40245] brlcad/branches/cmake/misc/CMake/FindTCL.cmake

2010-08-19 Thread starseeker 
Revision: 40245
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40245view=rev
Author:   starseeker
Date: 2010-08-19 16:14:50 + (Thu, 19 Aug 2010)

Log Message:
---
Split out version numbers for testing.

Modified Paths:
--
brlcad/branches/cmake/misc/CMake/FindTCL.cmake

Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 16:00:07 UTC 
(rev 40244)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 16:14:50 UTC 
(rev 40245)
@@ -155,6 +155,17 @@
ENDIF(WIN32)
 ENDMACRO(WIN32TCLTKPATHS)
 
+# Need some routines to chop version numbers up
+MACRO(SPLITTCLVERSIONNUM versionnum)
+ STRING(REGEX REPLACE ([0-9]*).[0-9]*.?[0-9]* \\1 ${versionnum}_MAJOR 
${${versionnum}})
+ STRING(REGEX REPLACE [0-9]*.([0-9]*).?[0-9]* \\1 ${versionnum}_MINOR 
${${versionnum}})
+ STRING(REGEX REPLACE [0-9]*.[0-9]*.?([0-9]*) \\1 ${versionnum}_PATCH 
${${versionnum}})
+ MESSAGE(nums: ${${versionnum}_MAJOR} ${${versionnum}_MINOR} 
${${versionnum}_PATCH})
+ENDMACRO()
+
+SET(TESTVERSION 3.1.2)
+SPLITTCLVERSIONNUM(TESTVERSION)
+
 MACRO(FINDLIBRARYVERSIONS targetname pathnames options)
FOREACH(MAJORNUM ${TCLTK_POSSIBLE_MAJOR_VERSIONS})
   FOREACH(MINORNUM ${TCLTK_POSSIBLE_MINOR_VERSIONS})


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40246] brlcad/branches/cmake/misc/CMake/FindTCL.cmake

2010-08-19 Thread starseeker 
Revision: 40246
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40246view=rev
Author:   starseeker
Date: 2010-08-19 16:28:32 + (Thu, 19 Aug 2010)

Log Message:
---
Constrain the loop using version number limits.

Modified Paths:
--
brlcad/branches/cmake/misc/CMake/FindTCL.cmake

Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 16:14:50 UTC 
(rev 40245)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 16:28:32 UTC 
(rev 40246)
@@ -160,15 +160,20 @@
  STRING(REGEX REPLACE ([0-9]*).[0-9]*.?[0-9]* \\1 ${versionnum}_MAJOR 
${${versionnum}})
  STRING(REGEX REPLACE [0-9]*.([0-9]*).?[0-9]* \\1 ${versionnum}_MINOR 
${${versionnum}})
  STRING(REGEX REPLACE [0-9]*.[0-9]*.?([0-9]*) \\1 ${versionnum}_PATCH 
${${versionnum}})
- MESSAGE(nums: ${${versionnum}_MAJOR} ${${versionnum}_MINOR} 
${${versionnum}_PATCH})
 ENDMACRO()
 
-SET(TESTVERSION 3.1.2)
-SPLITTCLVERSIONNUM(TESTVERSION)
+SET(TCL_MIN_VERSION 8.3.6)
+SET(TCL_MAX_VERSION 8.5.8)
 
 MACRO(FINDLIBRARYVERSIONS targetname pathnames options)
+   SPLITTCLVERSIONNUM(TCL_MIN_VERSION)
+   SPLITTCLVERSIONNUM(TCL_MAX_VERSION)
FOREACH(MAJORNUM ${TCLTK_POSSIBLE_MAJOR_VERSIONS})
+  if(NOT MAJORNUM LESS TCL_MIN_VERSION_MAJOR)
+  if(NOT MAJORNUM GREATER TCL_MAX_VERSION_MAJOR)
   FOREACH(MINORNUM ${TCLTK_POSSIBLE_MINOR_VERSIONS})
+ if(NOT MINORNUM LESS TCL_MIN_VERSION_MINOR)
+ if(NOT MINORNUM GREATER TCL_MAX_VERSION_MINOR)
  SET(TCLTK_${targetname}${MAJORNUM}${MINORNUM} 
TCLTK_${targetname}${MAJORNUM}${MINORNUM}-NOTFOUND)
  FOREACH(SPATH ${pathnames})
 FIND_LIBRARY(TCLTK_${targetname}${MAJORNUM}${MINORNUM} NAMES 
${targetname}${MAJORNUM}.${MINORNUM} ${targetname}${MAJORNUM}${MINORNUM} PATHS 
${SPATH} ${options})
@@ -184,7 +189,11 @@
  ENDFOREACH()
 MESSAGE(TCLTK_${targetname}${MAJORNUM}${MINORNUM}_LIST: 
${TCLTK_${targetname}${MAJORNUM}${MINORNUM}_LIST})
 SET(TCLTK_${targetname}${MAJORNUM}${MINORNUM}_LIST )
+ endif()
+ endif()
   ENDFOREACH()
+  endif()
+  endif()
ENDFOREACH()
 ENDMACRO()
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40247] brlcad/branches/cmake/misc/CMake/FindTCL.cmake

2010-08-19 Thread starseeker 
Revision: 40247
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40247view=rev
Author:   starseeker
Date: 2010-08-19 16:40:12 + (Thu, 19 Aug 2010)

Log Message:
---
Peg min and max to exact if it's set.

Modified Paths:
--
brlcad/branches/cmake/misc/CMake/FindTCL.cmake

Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 16:28:32 UTC 
(rev 40246)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 16:40:12 UTC 
(rev 40247)
@@ -156,24 +156,28 @@
 ENDMACRO(WIN32TCLTKPATHS)
 
 # Need some routines to chop version numbers up
-MACRO(SPLITTCLVERSIONNUM versionnum)
+MACRO(SPLIT_TCL_VERSION_NUM versionnum)
  STRING(REGEX REPLACE ([0-9]*).[0-9]*.?[0-9]* \\1 ${versionnum}_MAJOR 
${${versionnum}})
  STRING(REGEX REPLACE [0-9]*.([0-9]*).?[0-9]* \\1 ${versionnum}_MINOR 
${${versionnum}})
  STRING(REGEX REPLACE [0-9]*.[0-9]*.?([0-9]*) \\1 ${versionnum}_PATCH 
${${versionnum}})
 ENDMACRO()
 
-SET(TCL_MIN_VERSION 8.3.6)
-SET(TCL_MAX_VERSION 8.5.8)
+# If an exact version is set, peg min and max at it too so the comparisons 
will work
+IF(TCLTK_EXACT_VERSION)
+   SET(TCLTK_MIN_VERSION ${TCLTK_EXACT_VERSION})
+   SET(TCLTK_MAX_VERSION ${TCLTK_EXACT_VERSION})
+ENDIF(TCLTK_EXACT_VERSION)
 
-MACRO(FINDLIBRARYVERSIONS targetname pathnames options)
-   SPLITTCLVERSIONNUM(TCL_MIN_VERSION)
-   SPLITTCLVERSIONNUM(TCL_MAX_VERSION)
+
+MACRO(FIND_LIBRARY_VERSIONS targetname pathnames options)
+   SPLIT_TCL_VERSION_NUM(TCLTK_MIN_VERSION)
+   SPLIT_TCL_VERSION_NUM(TCLTK_MAX_VERSION)
FOREACH(MAJORNUM ${TCLTK_POSSIBLE_MAJOR_VERSIONS})
-  if(NOT MAJORNUM LESS TCL_MIN_VERSION_MAJOR)
-  if(NOT MAJORNUM GREATER TCL_MAX_VERSION_MAJOR)
+  if(NOT MAJORNUM LESS TCLTK_MIN_VERSION_MAJOR)
+  if(NOT MAJORNUM GREATER TCLTK_MAX_VERSION_MAJOR)
   FOREACH(MINORNUM ${TCLTK_POSSIBLE_MINOR_VERSIONS})
- if(NOT MINORNUM LESS TCL_MIN_VERSION_MINOR)
- if(NOT MINORNUM GREATER TCL_MAX_VERSION_MINOR)
+ if(NOT MINORNUM LESS TCLTK_MIN_VERSION_MINOR)
+ if(NOT MINORNUM GREATER TCLTK_MAX_VERSION_MINOR)
  SET(TCLTK_${targetname}${MAJORNUM}${MINORNUM} 
TCLTK_${targetname}${MAJORNUM}${MINORNUM}-NOTFOUND)
  FOREACH(SPATH ${pathnames})
 FIND_LIBRARY(TCLTK_${targetname}${MAJORNUM}${MINORNUM} NAMES 
${targetname}${MAJORNUM}.${MINORNUM} ${targetname}${MAJORNUM}${MINORNUM} PATHS 
${SPATH} ${options})
@@ -208,8 +212,8 @@
SET(TCL_PREFIX_INC ${TCL_PREFIX}/include)
 ENDIF(TCL_PREFIX)
 
-FINDLIBRARYVERSIONS(tcl ${TCL_PREFIX_LIB} NO_SYSTEM_PATH)
-FINDLIBRARYVERSIONS(tcl /usr )
+FIND_LIBRARY_VERSIONS(tcl ${TCL_PREFIX_LIB} NO_SYSTEM_PATH)
+FIND_LIBRARY_VERSIONS(tcl /usr )
 
 #LIST(REMOVE_DUPLICATES TCL_FOUND_MAJOR_VERSIONS)
 #LIST(REMOVE_DUPLICATES TCL_FOUND_MINOR_VERSIONS)


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40248] brlcad/trunk/include/bu.h

2010-08-19 Thread brlcad 
Revision: 40248
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40248view=rev
Author:   brlcad
Date: 2010-08-19 17:23:15 + (Thu, 19 Aug 2010)

Log Message:
---
oops, unintentional commenting of bu_ptbl

Modified Paths:
--
brlcad/trunk/include/bu.h

Modified: brlcad/trunk/include/bu.h
===
--- brlcad/trunk/include/bu.h   2010-08-19 16:40:12 UTC (rev 40247)
+++ brlcad/trunk/include/bu.h   2010-08-19 17:23:15 UTC (rev 40248)
@@ -4034,10 +4034,9 @@
  * This version maintained for source compatibility with existing NMG
  * code.
  */
-/*BU_EXPORT BU_EXTERN(int bu_ptbl,
+BU_EXPORT BU_EXTERN(int bu_ptbl,
(struct bu_ptbl *b,
 int func, long *p));
-*/
 
 /**
  * B U _ P R _ P T B L


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40250] brlcad/trunk/src/other/tkhtml/Makefile.am

2010-08-19 Thread brlcad 
Revision: 40250
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40250view=rev
Author:   brlcad
Date: 2010-08-19 17:43:34 + (Thu, 19 Aug 2010)

Log Message:
---
create a pkgIndex.tcl that refers to libTkhtml.so instead of the versioned one 
from tea

Modified Paths:
--
brlcad/trunk/src/other/tkhtml/Makefile.am

Modified: brlcad/trunk/src/other/tkhtml/Makefile.am
===
--- brlcad/trunk/src/other/tkhtml/Makefile.am   2010-08-19 17:27:37 UTC (rev 
40249)
+++ brlcad/trunk/src/other/tkhtml/Makefile.am   2010-08-19 17:43:34 UTC (rev 
40250)
@@ -365,7 +365,8 @@
 #  ( echo pkg_mkIndex -load Tk . \; exit; ) | $(WISH)
 
 pkgIndex.tcl:
-   echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) [list load 
[file join $$dir $(PKG_LIB_FILE)]]'  pkgIndex.tcl
+   echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) [list load 
[file join $$dir libTkhtml.so]]'  pkgIndex.tcl
+#  echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) [list load 
[file join $$dir $(PKG_LIB_FILE)]]'  pkgIndex.tcl
 
 
 #


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40251] brlcad/trunk

2010-08-19 Thread brlcad 
Revision: 40251
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40251view=rev
Author:   brlcad
Date: 2010-08-19 17:46:04 + (Thu, 19 Aug 2010)

Log Message:
---
drop the 3

Modified Paths:
--
brlcad/trunk/doc/docbook/system/mann/en/Introduction.xml
brlcad/trunk/src/archer/TODO
brlcad/trunk/src/other/tkhtml/README
brlcad/trunk/src/tclscripts/mged/man.tcl

Modified: brlcad/trunk/doc/docbook/system/mann/en/Introduction.xml
===
--- brlcad/trunk/doc/docbook/system/mann/en/Introduction.xml2010-08-19 
17:43:34 UTC (rev 40250)
+++ brlcad/trunk/doc/docbook/system/mann/en/Introduction.xml2010-08-19 
17:46:04 UTC (rev 40251)
@@ -6,13 +6,13 @@
   /articleinfo
 
para
-  This is MGED's help system for commands available at the MGED prompt.
-  To bring up the manual page for a specific command select it from the
-  list to the left of this welcome message.
+  This is MGED's help system for commands available at the MGED
+  prompt.  To bring up the manual page for a specific command
+  select it from the list to the left of this welcome message.
 /para
para
-  These manual pages are written in Docbook format and displayed as HTML
-  using the tkhtml3 Tk widget.
+  These manual pages are written in Docbook format and displayed
+  as HTML.
 /para
 
 /article

Modified: brlcad/trunk/src/archer/TODO
===
--- brlcad/trunk/src/archer/TODO2010-08-19 17:43:34 UTC (rev 40250)
+++ brlcad/trunk/src/archer/TODO2010-08-19 17:46:04 UTC (rev 40251)
@@ -132,7 +132,7 @@
 Help - Command Manual Pages|   DONE
 Help - Shift Grips |   DONE
 Help - Apropos |   INCOMPLETE, not working well in MGED 
either?
-Help - Manual  |   INCOMPLETE, even in MGED needs web 
browser, should use docbook/tkhtml3
+Help - Manual  |   INCOMPLETE, even in MGED needs web 
browser, should use docbook/tkhtml
 
 
 

Modified: brlcad/trunk/src/other/tkhtml/README
===
--- brlcad/trunk/src/other/tkhtml/README2010-08-19 17:43:34 UTC (rev 
40250)
+++ brlcad/trunk/src/other/tkhtml/README2010-08-19 17:46:04 UTC (rev 
40251)
@@ -1,14 +1,21 @@
 CVS checkout: cvs -d :pserver:anonym...@tkhtml.tcl.tk:/tkhtml checkout 
htmlwidget
 Date of last BRL-CAD update: 10/07/2008 
 
-Changes include using directory named tkhtml3 instead of htmlwidget,
-not using tkhtml3's make logic, and not including any of the test code.
-Only the tkhtml3 widget itself is included, not the hv browser code.
+Changes include using directory named tkhtml instead of htmlwidget,
+not using tkhtml's make logic, and not including any of the test code.
+Only the tkhtml widget itself is included, not the hv browser code.
 
-This build of Tkhtml3 incorporates files which are generated
-using tclsh in the main Tkhtml3 build.  In order to better work with
+The top-level Makefile.in file was converted to Makefile.am and
+modified to create a libtool library.
+
+The scripts that generate source files (src/*.tcl) were updated to
+generate sources in the correct location compatible with out-of-dir
+building.
+
+This build of Tkhtml incorporates files which are generated using
+tclsh in the main Tkhtml build.  In order to better work with
 BRL-CAD's existing build mechanisms, the following files are manually
-generated and updated when Tkhtml3 is updated:
+generated and updated when Tkhtml is updated:
 
 
 * Generated in the original distribution by the 

Modified: brlcad/trunk/src/tclscripts/mged/man.tcl
===
--- brlcad/trunk/src/tclscripts/mged/man.tcl2010-08-19 17:43:34 UTC (rev 
40250)
+++ brlcad/trunk/src/tclscripts/mged/man.tcl2010-08-19 17:46:04 UTC (rev 
40251)
@@ -83,7 +83,7 @@
frame .man.bot -relief raised -bd 1
pack .man.bot -side bottom -fill both
 
-   # Use tkhtml3 to dispay the data
+   # Use tkhtml to dispay the data
frame .man.top.msgF
html .man.top.msgT -yscrollcommand .man.top.msgS set
.man.top.msgT configure -parsemode html


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40252] brlcad/branches/cmake/misc/CMake/FindTCL.cmake

2010-08-19 Thread starseeker 
Revision: 40252
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40252view=rev
Author:   starseeker
Date: 2010-08-19 18:21:48 + (Thu, 19 Aug 2010)

Log Message:
---
Conditionalize a FIND_LIBRARY_VERSIONS based on TCL_PREFIX - looks OK.

Modified Paths:
--
brlcad/branches/cmake/misc/CMake/FindTCL.cmake

Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 17:46:04 UTC 
(rev 40251)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 18:21:48 UTC 
(rev 40252)
@@ -11,10 +11,10 @@
 # allow users, how to expose those controls, etc.  Here are the rules
 # this particular implementation of FindTCLTK will strive to express:
 #
-# 1. If a parent CMakeLists.txt defines a specific Tcl_Prefix
+# 1. If a parent CMakeLists.txt defines a specific TCLTK_PREFIX 
 #directory, don't look for or return any settings using
 #other Tcl/Tk installations, even if nothing is found
-#below Tcl_Prefix and other installations are present.
+#below TCLTK_PREFIX and other installations are present.
 #Report NOTFOUND instead.
 #
 # 2. There will be three possible variables for controlling
@@ -58,13 +58,15 @@
 # 4. By default, if no prefix is specified, FindTCLTK will search
 #a list of directories and the system path for tcl libraries.
 #This list can be expanded by a parent CMakeLists.txt file
-#by specifying additional paths in this variable:
+#by specifying additional paths in this variable, which will
+#be checked before the system path - essentially, this lets
+#a configure process do a soft set of the TCL prefix:
 #
 #TCLTK_SEARCH_ADDITIONAL_PATHS
 #
 # 5. On Apple platforms, there may be a Framework install of
 #Tcl/Tk. By default, FindTCLTK will start with this version
-#on OSX platforms if no TCL_PREFIX is specified, but will
+#on OSX platforms if no TCLTK_PREFIX is specified, but will
 #move on to another installation if the Framework Tcl/Tk doesn't
 #satisfy other criteria.  If a developer wishes to REQUIRE a 
 #Framework build of Tcl/Tk and reject other installs even though
@@ -179,7 +181,7 @@
  if(NOT MINORNUM LESS TCLTK_MIN_VERSION_MINOR)
  if(NOT MINORNUM GREATER TCLTK_MAX_VERSION_MINOR)
  SET(TCLTK_${targetname}${MAJORNUM}${MINORNUM} 
TCLTK_${targetname}${MAJORNUM}${MINORNUM}-NOTFOUND)
- FOREACH(SPATH ${pathnames})
+ FOREACH(SPATH ${${pathnames}})
 FIND_LIBRARY(TCLTK_${targetname}${MAJORNUM}${MINORNUM} NAMES 
${targetname}${MAJORNUM}.${MINORNUM} ${targetname}${MAJORNUM}${MINORNUM} PATHS 
${SPATH} ${options})
 IF(NOT TCLTK_${targetname}${MAJORNUM}${MINORNUM} MATCHES 
NOTFOUND$)
# On repeat configures, CMAKE_INSTALL_PREFIX apparently gets 
added to the FIND_* paths.  This is a problem
@@ -201,20 +203,22 @@
ENDFOREACH()
 ENDMACRO()
 
-# There are four variables that will be used as feeders
-# for locating Tcl/Tk installations - TCL_PREFIX, TCL_INCLUDE_DIR,
-# TCL_LIBRARY_DIR, and TCL_BIN_DIR.  In search paths, TCL_PREFIX
-# generated paths should come after the more specific variables.
+# Try to be a bit forgiving with the TCLTK prefix - if someone gives the
+# full path to the lib directory, catch that by adding the parent path
+# to the list to check
+IF(TCLTK_PREFIX)
+   SET(TCLTK_PREFIX_LIBDIRS ${TCLTK_PREFIX})
+   SET(TCLTK_PREFIX_LIBDIRS ${TCLTK_PREFIX_LIBDIRS} ${TCLTK_PREFIX}/lib)
+   GET_FILENAME_COMPONENT(TCLTK_LIB_PATH_PARENT ${TCLTK_PREFIX} PATH)
+   SET(TCLTK_PREFIX_LIBDIRS ${TCLTK_PREFIX_LIBDIRS} ${TCLTK_LIB_PATH_PARENT})
+   SET(TCLTK_PREFIX_LIBDIRS ${TCLTK_PREFIX_LIBDIRS} 
${TCLTK_LIB_PATH_PARENT}/lib)
+   LIST(REMOVE_DUPLICATES TCLTK_PREFIX_LIBDIRS)
+   FIND_LIBRARY_VERSIONS(tcl TCLTK_PREFIX_LIBDIRS NO_SYSTEM_PATH)
+ENDIF(TCLTK_PREFIX)
 
-IF(TCL_PREFIX)
-   SET(TCL_PREFIX_BIN ${TCL_PREFIX}/bin)
-   SET(TCL_PREFIX_LIB ${TCL_PREFIX}/lib)
-   SET(TCL_PREFIX_INC ${TCL_PREFIX}/include)
-ENDIF(TCL_PREFIX)
+SET(syspath /usr)
+FIND_LIBRARY_VERSIONS(tcl syspath )
 
-FIND_LIBRARY_VERSIONS(tcl ${TCL_PREFIX_LIB} NO_SYSTEM_PATH)
-FIND_LIBRARY_VERSIONS(tcl /usr )
-
 #LIST(REMOVE_DUPLICATES TCL_FOUND_MAJOR_VERSIONS)
 #LIST(REMOVE_DUPLICATES TCL_FOUND_MINOR_VERSIONS)
 
@@ -255,7 +259,7 @@
ENDFOREACH()
 ENDFOREACH()
 
-LIST(REMOVE_DUPLICATES TCLTK_POSSIBLE_PATHS)
+#LIST(REMOVE_DUPLICATES TCLTK_POSSIBLE_PATHS)
 
 MESSAGE(possible paths: ${TCLTK_POSSIBLE_PATHS})
 
@@ -419,3 +423,4 @@
 MESSAGE(TK_INCLUDE_PATH: ${TK_INCLUDE_PATH})
 MESSAGE(TCL_LIBRARY: ${TCL_LIBRARY})
 MESSAGE(TK_LIBRARY: ${TK_LIBRARY})
+


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter

[brlcad-commits] SF.net SVN: brlcad:[40253] rt^3/trunk/src/libPkgCpp/PkgClient.cxx

2010-08-19 Thread davidloman 
Revision: 40253
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40253view=rev
Author:   davidloman
Date: 2010-08-19 18:50:15 + (Thu, 19 Aug 2010)

Log Message:
---
Bugfixes from testing.

Modified Paths:
--
rt^3/trunk/src/libPkgCpp/PkgClient.cxx

Modified: rt^3/trunk/src/libPkgCpp/PkgClient.cxx
===
--- rt^3/trunk/src/libPkgCpp/PkgClient.cxx  2010-08-19 18:21:48 UTC (rev 
40252)
+++ rt^3/trunk/src/libPkgCpp/PkgClient.cxx  2010-08-19 18:50:15 UTC (rev 
40253)
@@ -28,11 +28,13 @@
 //TODO Need a path for a callback table to get to this
 PkgClient::PkgClient(std::string ipOrHostname, int port)
 {
-  char portCString[7] = { 0 };
+  char portCString[7] =
+{ 0 };
   snprintf(portCString, 6, %d, port);
 
   //TODO Make this more robust.  TCP being hardcoded is bad.
-  this-conn = pkg_open(ipOrHostname.c_str(), portCString, tcp, NULL, NULL, 
NULL, NULL);
+  this-conn = pkg_open(ipOrHostname.c_str(), portCString, tcp, NULL, NULL,
+  NULL, NULL);
 }
 
 PkgClient::PkgClient(pkg_conn* conn)
@@ -42,11 +44,6 @@
 
 PkgClient::~PkgClient()
 {
-  if (this-conn != NULL)
-{
-  this-close();
-  delete this-conn;
-}
 }
 
 bool
@@ -92,7 +89,8 @@
 int
 PkgClient::pullDataFromSocket()
 {
-  return pkg_suckin(this-conn);
+  int retVal = pkg_suckin(this-conn);
+  return retVal;
 }
 
 /*


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40255] brlcad/branches/cmake/misc/CMake/FindTCL.cmake

2010-08-19 Thread starseeker 
Revision: 40255
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40255view=rev
Author:   starseeker
Date: 2010-08-19 18:57:45 + (Thu, 19 Aug 2010)

Log Message:
---
get set to pull library paths off the arrays of results for suitability testing.

Modified Paths:
--
brlcad/branches/cmake/misc/CMake/FindTCL.cmake

Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 18:51:53 UTC 
(rev 40254)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 18:57:45 UTC 
(rev 40255)
@@ -32,7 +32,8 @@
 #no PATCH_VERSION is specified, any patch version will
 #be regarded as satisfying the criteria of any version
 #number test applied.  If no versions are specified it
-#is assumed any will do.
+#is assumed any will do.  Higher versions are preferred
+#over lower, within the above constraints.
 #
 # 3. Tk provides the option to compile either for
 #the native graphics system (aqua, win32, etc.) or for
@@ -194,7 +195,6 @@
 SET(TCLTK_${targetname}${MAJORNUM}${MINORNUM} 
TCLTK_${targetname}${MAJORNUM}${MINORNUM}-NOTFOUND)
  ENDFOREACH()
 MESSAGE(TCLTK_${targetname}${MAJORNUM}${MINORNUM}_LIST: 
${TCLTK_${targetname}${MAJORNUM}${MINORNUM}_LIST})
-SET(TCLTK_${targetname}${MAJORNUM}${MINORNUM}_LIST )
  endif()
  endif()
   ENDFOREACH()
@@ -203,17 +203,45 @@
ENDFOREACH()
 ENDMACRO()
 
+MACRO(PULL_PREFERRED_VERSION  targetname targetvar)
+   FOREACH(MAJORNUM ${TCLTK_POSSIBLE_MAJOR_VERSIONS})
+  if(NOT MAJORNUM LESS TCLTK_MIN_VERSION_MAJOR)
+  if(NOT MAJORNUM GREATER TCLTK_MAX_VERSION_MAJOR)
+  if(${${targetvar}} MATCHES NOTFOUND$)
+  FOREACH(MINORNUM ${TCLTK_POSSIBLE_MINOR_VERSIONS})
+ if(NOT MINORNUM LESS TCLTK_MIN_VERSION_MINOR)
+ if(NOT MINORNUM GREATER TCLTK_MAX_VERSION_MINOR)
+ if(${${targetvar}} MATCHES NOTFOUND$)
+   LIST(LENGTH TCLTK_${targetname}${MAJORNUM}${MINORNUM}_LIST 
LISTLENGTH)
+IF(LISTLENGTH GREATER 0)
+   LIST(GET TCLTK_${targetname}${MAJORNUM}${MINORNUM}_LIST 0 
${targetvar})
+  LIST(REMOVE_AT TCLTK_${targetname}${MAJORNUM}${MINORNUM}_LIST 0)
+endif()
+ endif()
+ endif()
+ endif()
+  ENDFOREACH()
+  endif()
+  endif()
+  endif()
+   ENDFOREACH()
+ENDMACRO()
+
 # Try to be a bit forgiving with the TCLTK prefix - if someone gives the
 # full path to the lib directory, catch that by adding the parent path
 # to the list to check
 IF(TCLTK_PREFIX)
-   SET(TCLTK_PREFIX_LIBDIRS ${TCLTK_PREFIX})
-   SET(TCLTK_PREFIX_LIBDIRS ${TCLTK_PREFIX_LIBDIRS} ${TCLTK_PREFIX}/lib)
+   SET(TCL_LIBRARY NOTFOUND)
+   SET(TCLTK_PREFIX_LIBDIRS ${TCLTK_PREFIX_LIBDIRS} ${TCLTK_PREFIX}/lib)
+   SET(TCLTK_PREFIX_LIBDIRS ${TCLTK_PREFIX_LIBDIRS} ${TCLTK_PREFIX})
GET_FILENAME_COMPONENT(TCLTK_LIB_PATH_PARENT ${TCLTK_PREFIX} PATH)
+   SET(TCLTK_PREFIX_LIBDIRS ${TCLTK_PREFIX_LIBDIRS} 
${TCLTK_LIB_PATH_PARENT}/lib)
SET(TCLTK_PREFIX_LIBDIRS ${TCLTK_PREFIX_LIBDIRS} ${TCLTK_LIB_PATH_PARENT})
-   SET(TCLTK_PREFIX_LIBDIRS ${TCLTK_PREFIX_LIBDIRS} 
${TCLTK_LIB_PATH_PARENT}/lib)
LIST(REMOVE_DUPLICATES TCLTK_PREFIX_LIBDIRS)
+   MESSAGE(TCLTK_PREFIX_LIBDIRS: ${TCLTK_PREFIX_LIBDIRS})
FIND_LIBRARY_VERSIONS(tcl TCLTK_PREFIX_LIBDIRS NO_SYSTEM_PATH)
+   PULL_PREFERRED_VERSION(tcl TCL_LIBRARY)
+   MESSAGE(TCL_LIBRARY: ${TCL_LIBRARY})
 ENDIF(TCLTK_PREFIX)
 
 SET(syspath /usr)


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40256] rt^3/trunk/tests/libpkgcpp/pkgcppTest.cxx

2010-08-19 Thread davidloman 
Revision: 40256
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40256view=rev
Author:   davidloman
Date: 2010-08-19 19:03:35 + (Thu, 19 Aug 2010)

Log Message:
---
Recreated tpkg.c only using libpkgcpp.  In this test, a client/server link is 
established and a randomly generated array of 1024 bytes is sent client-server.

Modified Paths:
--
rt^3/trunk/tests/libpkgcpp/pkgcppTest.cxx

Modified: rt^3/trunk/tests/libpkgcpp/pkgcppTest.cxx
===
--- rt^3/trunk/tests/libpkgcpp/pkgcppTest.cxx   2010-08-19 18:57:45 UTC (rev 
40255)
+++ rt^3/trunk/tests/libpkgcpp/pkgcppTest.cxx   2010-08-19 19:03:35 UTC (rev 
40256)
@@ -32,30 +32,32 @@
 #define SERVER_NAME ImaServer
 #define CLIENT_NAME ImaClient
 #define ENET_PROTO tcp
+#define RAND_DATA_SIZE 1024
 
 /* simple network transport protocol. connection starts with a HELO,
  * then a variable number of GEOM/ARGS messages, then a CIAO to end.
  */
 
-#define MSG_HELO1
-#define MSG_DATA2
-#define MSG_CIAO3
+#define PKGCPP_HELO1
+#define PKGCPP_DATA2
+#define PKGCPP_CIAO3
 
 
 //Declares
 void printUsage(std::string customMsg);
 std::string getValidIpOrHostname(char* data);
 int getValidPort(char* data);
-
+int tryProcess(PkgClient* pkgClient);
 int runServer(int port);
 int runClient(std::string ipOrHostname, int port);
 
-void server_helo(struct pkg_conn* connection, char* buf);
-void server_data(struct pkg_conn* connection, char* buf);
-void server_ciao(struct pkg_conn* connection, char* buf);
+void server_helo(struct pkg_conn* c, char* buf);
+void server_data(struct pkg_conn* c, char* buf);
+void server_ciao(struct pkg_conn* c, char* buf);
 
+//global
+bool listenLoop = true;
 
-
 int
 main(int argc, char** argv)
 {
@@ -138,9 +140,9 @@
 {
 
   struct pkg_switch callbacks[] = {
-   {MSG_HELO, server_helo, HELO},
-   {MSG_DATA, server_data, DATA},
-   {MSG_CIAO, server_ciao, CIAO},
+   {PKGCPP_HELO, server_helo, HELO},
+   {PKGCPP_DATA, server_data, DATA},
+   {PKGCPP_CIAO, server_ciao, CIAO},
{0, 0, (char* )0}
   };
 
@@ -150,9 +152,6 @@
 
 
   //Setup vars
-  struct pkg_conn* currentClient;
-  int netfd;
-  int pkg_result  = 0;
   char* buffer;
 
   PkgClient* pkgClient = NULL;
@@ -163,86 +162,144 @@
*/
   do
 {
+//Blocks
   pkgClient = pkgServer.waitForClient();
 
-  currentClient = pkg_getclient(netfd, callbacks, NULL, 0);
+  //TODO probably should failsafe this loop
   if (pkgClient == NULL)
 continue;
 
-  /* got a connection, process it */
-  buffer = pkg_bwaitfor(MSG_HELO, currentClient);
-  if (buffer == NULL)
+/*  //Attempt to get a HELO msg... and do nothing with it
+  buffer = pkgClient-waitForMsg(PKGCPP_HELO);
+
+   validate magic header that client should have sent
+  if (strcmp(buffer, CLIENT_NAME) != 0)
 {
-  bu_log(Failed to process the client connection, still waiting\n);
-  pkg_close(currentClient);
-  currentClient = PKC_NULL;
+  bu_log(Data Error, received a PKGCPP_HELO without proper data!\n);
+  pkgClient-close();
 }
-  else
-{
-  /* validate magic header that client should have sent */
-//  if (strcmp(buffer, MAGIC_ID) != 0)
-//{
-//  bu_log(
-//  Bizarre corruption, received a HELO without at matching 
MAGIC ID!\n);
-//  pkg_close(currentClient);
-//  currentClient = PKC_NULL;
-//}
-}
+
+  //TODO probably should failsafe this loop also
+  if (buffer == NULL)
+continue;
+ */
 }
   while (pkgClient == NULL);
 
+  int counter = 0;
+  int itemsRemain = 0;
   /* we got a validated client, process packets from the
* connection.  boilerplate triple-call loop.
*/
   bu_log(Processing data from client\n);
   do {
-  /* process packets potentially received in a processing callback */
-  pkg_result = pkg_process(currentClient);
-  if (pkg_result  0) {
-  bu_log(Unable to process packets? Weird.\n);
-  } else {
-  bu_log(Processed %d packet%s\n, pkg_result, pkg_result == 1 ?  : 
s);
-  }
+  bu_log(Loop Pass #%d\n, counter);
 
+/* process packets potentially received in a processing callback */
+  itemsRemain =  tryProcess(pkgClient);
+
   /* suck in data from the network */
-  pkg_result = pkg_suckin(currentClient);
+  int pkg_result = pkgClient-pullDataFromSocket();
   if (pkg_result  0) {
   bu_log(Seemed to have trouble sucking in packets.\n);
   break;
   } else if (pkg_result == 0) {
   bu_log(Client closed the connection.\n);
-  break;
+  //usleep(100);
+  //break;
   }
 
+  bu_log(Last pass: %d bytes.\n, pkg_result);
+
   /* process new packets received */
-  pkg_result =

[brlcad-commits] SF.net SVN: brlcad:[40257]

2010-08-19 Thread davidloman 
Revision: 40257
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40257view=rev
Author:   davidloman
Date: 2010-08-19 19:18:50 + (Thu, 19 Aug 2010)

Log Message:
---
Stub in tcp and udp subclasses of PkgServer in prep for inheritance heirarchy 
change.

Added Paths:
---
rt^3/trunk/src/libPkgCpp/PkgTcpServer.cxx
rt^3/trunk/src/libPkgCpp/PkgTcpServer.h
rt^3/trunk/src/libPkgCpp/PkgUdpServer.cxx
rt^3/trunk/src/libPkgCpp/PkgUdpServer.h

Added: rt^3/trunk/src/libPkgCpp/PkgTcpServer.cxx
===
--- rt^3/trunk/src/libPkgCpp/PkgTcpServer.cxx   (rev 0)
+++ rt^3/trunk/src/libPkgCpp/PkgTcpServer.cxx   2010-08-19 19:18:50 UTC (rev 
40257)
@@ -0,0 +1,48 @@
+/*P K G T C P S E R V E R . C X X
+ * BRL-CAD
+ *
+ * Copyright (c) 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 PkgTcpServer.cxx
+ * PkgTcpServer.cxx
+ *
+ *  Created on: Aug 19, 2010
+ *  Author: dloman
+ */
+
+#include PkgTcpServer.h
+
+PkgTcpServer::PkgTcpServer(pkg_switch callbacks[]) :
+  PkgServer(PKGCPP_PROTO_TCP, callbacks)
+{
+  // TODO Auto-generated constructor stub
+
+}
+
+PkgTcpServer::~PkgTcpServer()
+{
+  // TODO Auto-generated destructor stub
+}
+
+// Local Variables:
+// tab-width: 8
+// mode: C++
+// c-basic-offset: 4
+// indent-tabs-mode: t
+// c-file-style: stroustrup
+// End:
+// ex: shiftwidth=4 tabstop=8


Property changes on: rt^3/trunk/src/libPkgCpp/PkgTcpServer.cxx
___
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Revision Date Author
Added: svn:eol-style
   + native

Added: rt^3/trunk/src/libPkgCpp/PkgTcpServer.h
===
--- rt^3/trunk/src/libPkgCpp/PkgTcpServer.h (rev 0)
+++ rt^3/trunk/src/libPkgCpp/PkgTcpServer.h 2010-08-19 19:18:50 UTC (rev 
40257)
@@ -0,0 +1,50 @@
+/*  P K G T C P S E R V E R . H
+ * BRL-CAD
+ *
+ * Copyright (c) 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 PkgTcpServer.h
+ * PkgTcpServer.h
+ *
+ *  Created on: Aug 19, 2010
+ *  Author: dloman
+ */
+
+#ifndef __PKGTCPSERVER_H__
+#define __PKGTCPSERVER_H__
+
+#include PkgServer.h
+
+class PkgTcpServer : public PkgServer
+{
+public:
+  PkgTcpServer(pkg_switch callbacks[]);
+  virtual
+  ~PkgTcpServer();
+};
+
+#endif /* __PKGTCPSERVER_H__ */
+
+/*
+ * Local Variables:
+ * tab-width: 8
+ * mode: C
+ * indent-tabs-mode: t
+ * c-file-style: stroustrup
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */


Property changes on: rt^3/trunk/src/libPkgCpp/PkgTcpServer.h
___
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Revision Date Author
Added: svn:eol-style
   + native

Added: rt^3/trunk/src/libPkgCpp/PkgUdpServer.cxx
===
--- rt^3/trunk/src/libPkgCpp/PkgUdpServer.cxx   (rev 0)
+++ rt^3/trunk/src/libPkgCpp/PkgUdpServer.cxx   2010-08-19 19:18:50 UTC (rev 
40257)
@@ -0,0 +1,48 @@
+/*P K G U D P S E R V E R . C X X
+ * BRL-CAD
+ *
+ * Copyright (c) 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;

[brlcad-commits] SF.net SVN: brlcad:[40258]

2010-08-19 Thread davidloman 
Revision: 40258
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40258view=rev
Author:   davidloman
Date: 2010-08-19 19:20:18 + (Thu, 19 Aug 2010)

Log Message:
---
Modify PkgServer to take a Protocol argument, thus setting it to either TCP or 
UDP.

Modified Paths:
--
rt^3/trunk/include/PkgServer.h
rt^3/trunk/src/libPkgCpp/PkgServer.cxx

Modified: rt^3/trunk/include/PkgServer.h
===
--- rt^3/trunk/include/PkgServer.h  2010-08-19 19:18:50 UTC (rev 40257)
+++ rt^3/trunk/include/PkgServer.h  2010-08-19 19:20:18 UTC (rev 40258)
@@ -32,7 +32,7 @@
 class PkgServer
 {
 public:
-PkgServer(pkg_switch callbacks[]);
+PkgServer(std::string proto, pkg_switch callbacks[]);
 virtual ~PkgServer();
 
 bool listen(unsigned short port);
@@ -44,6 +44,7 @@
 
 
 private:
+std::string proto
 int listenFD;
 pkg_switch* callBackTable;
 };

Modified: rt^3/trunk/src/libPkgCpp/PkgServer.cxx
===
--- rt^3/trunk/src/libPkgCpp/PkgServer.cxx  2010-08-19 19:18:50 UTC (rev 
40257)
+++ rt^3/trunk/src/libPkgCpp/PkgServer.cxx  2010-08-19 19:20:18 UTC (rev 
40258)
@@ -45,8 +45,7 @@
   int fd;
   snprintf(portCString, 6, %d, port);
 
-  fd = pkg_permserver(portCString, tcp, 0, 0);
-  //TODO Make this more robust.  TCP being hardcoded is bad.
+  fd = pkg_permserver(portCString, this-proto, 0, 0);
 
   if (fd  0)
 return false;


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40259] rt^3/trunk/include/pkgcppcommon.h

2010-08-19 Thread davidloman 
Revision: 40259
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40259view=rev
Author:   davidloman
Date: 2010-08-19 19:20:35 + (Thu, 19 Aug 2010)

Log Message:
---
Add #defines to ease specifying protocols

Modified Paths:
--
rt^3/trunk/include/pkgcppcommon.h

Modified: rt^3/trunk/include/pkgcppcommon.h
===
--- rt^3/trunk/include/pkgcppcommon.h   2010-08-19 19:20:18 UTC (rev 40258)
+++ rt^3/trunk/include/pkgcppcommon.h   2010-08-19 19:20:35 UTC (rev 40259)
@@ -23,6 +23,8 @@
 #define __PKGCPPCOMMON_H__
 
 #define PKG_HEADER_MAGIC LPKG
+#define PKGCPP_PROTO_TCP tcp
+#define PKGCPP_PROTO_UDP udp
 
 #endif /* __PKGCPPCOMMON_H__ */
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40260]

2010-08-19 Thread davidloman 
Revision: 40260
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40260view=rev
Author:   davidloman
Date: 2010-08-19 19:31:24 + (Thu, 19 Aug 2010)

Log Message:
---
Implement PkgTcpServer and PkgUdpServer as subclasses of PkgServer.  Update 
cmake files and tests.

Modified Paths:
--
rt^3/trunk/src/libPkgCpp/CMakeLists.txt
rt^3/trunk/src/libPkgCpp/PkgServer.cxx
rt^3/trunk/src/libPkgCpp/PkgUdpServer.cxx
rt^3/trunk/tests/libpkgcpp/pkgcppTest.cxx

Added Paths:
---
rt^3/trunk/include/PkgServer.h
rt^3/trunk/include/PkgTcpServer.h
rt^3/trunk/include/PkgUdpServer.h

Removed Paths:
-
rt^3/trunk/include/PkgServer.h
rt^3/trunk/src/libPkgCpp/PkgTcpServer.h
rt^3/trunk/src/libPkgCpp/PkgUdpServer.h

Deleted: rt^3/trunk/include/PkgServer.h
===
--- rt^3/trunk/include/PkgServer.h  2010-08-19 19:20:35 UTC (rev 40259)
+++ rt^3/trunk/include/PkgServer.h  2010-08-19 19:31:24 UTC (rev 40260)
@@ -1,64 +0,0 @@
-/*P K G S E V E R . H
- * BRL-CAD
- *
- * Copyright (c) 2004-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 PkgServer.h
- *
- *
- */
-
-#ifndef __PKGSERVER_H__
-#define __PKGSERVER_H__
-
-#include brlcad/pkg.h
-#include pkgcppcommon.h
-#include PkgClient.h
-
-class PkgServer
-{
-public:
-PkgServer(std::string proto, pkg_switch callbacks[]);
-virtual ~PkgServer();
-
-bool listen(unsigned short port);
-
-/*
- * This function blocks until a new connection
- */
-PkgClient* waitForClient();
-
-
-private:
-std::string proto
-int listenFD;
-pkg_switch* callBackTable;
-};
-
-#endif /* __PKGSERVER_H__ */
-
-
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: stroustrup
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
-

Copied: rt^3/trunk/include/PkgServer.h (from rev 40258, 
rt^3/trunk/include/PkgServer.h)
===
--- rt^3/trunk/include/PkgServer.h  (rev 0)
+++ rt^3/trunk/include/PkgServer.h  2010-08-19 19:31:24 UTC (rev 40260)
@@ -0,0 +1,64 @@
+/*P K G S E V E R . H
+ * BRL-CAD
+ *
+ * Copyright (c) 2004-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 PkgServer.h
+ *
+ *
+ */
+
+#ifndef __PKGSERVER_H__
+#define __PKGSERVER_H__
+
+#include brlcad/pkg.h
+#include pkgcppcommon.h
+#include PkgClient.h
+
+class PkgServer
+{
+public:
+PkgServer(std::string proto, pkg_switch callbacks[]);
+virtual ~PkgServer();
+
+bool listen(unsigned short port);
+
+/*
+ * This function blocks until a new connection
+ */
+PkgClient* waitForClient();
+
+
+private:
+std::string proto;
+int listenFD;
+pkg_switch* callBackTable;
+};
+
+#endif /* __PKGSERVER_H__ */
+
+
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: stroustrup
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
+

Copied: rt^3/trunk/include/PkgTcpServer.h (from rev 40257, 
rt^3/trunk/src/libPkgCpp/PkgTcpServer.h)
===
--- rt^3/trunk/include/PkgTcpServer.h   (rev 0)
+++ rt^3/trunk/include/PkgTcpServer.h   2010-08-19 19:31:24 UTC (rev 40260)
@@ -0,0 +1,49 @@
+/*  P K G T C P S E R V E R . H
+ * BRL-CAD
+ *
+ * Copyright (c) 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

[brlcad-commits] SF.net SVN: brlcad:[40261] rt^3/trunk/include/pkgcppcommon.h

2010-08-19 Thread davidloman 
Revision: 40261
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40261view=rev
Author:   davidloman
Date: 2010-08-19 19:32:14 + (Thu, 19 Aug 2010)

Log Message:
---
Drop header magic value define for libpkgcpp as this value is hardcoded into 
libpkg.

Modified Paths:
--
rt^3/trunk/include/pkgcppcommon.h

Modified: rt^3/trunk/include/pkgcppcommon.h
===
--- rt^3/trunk/include/pkgcppcommon.h   2010-08-19 19:31:24 UTC (rev 40260)
+++ rt^3/trunk/include/pkgcppcommon.h   2010-08-19 19:32:14 UTC (rev 40261)
@@ -22,7 +22,6 @@
 #ifndef __PKGCPPCOMMON_H__
 #define __PKGCPPCOMMON_H__
 
-#define PKG_HEADER_MAGIC LPKG
 #define PKGCPP_PROTO_TCP tcp
 #define PKGCPP_PROTO_UDP udp
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40262]

2010-08-19 Thread davidloman 
Revision: 40262
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40262view=rev
Author:   davidloman
Date: 2010-08-19 19:52:52 + (Thu, 19 Aug 2010)

Log Message:
---
Implement PkgTcpClient and PkgUdpClient as subclasses of PkgClient.  Update 
cmake files and tests. Had to add connection specific getter methods to 
PkgServer subclasses so they can generate proper types of PkgClient subclasses.

Modified Paths:
--
rt^3/trunk/include/PkgClient.h
rt^3/trunk/include/PkgServer.h
rt^3/trunk/include/PkgTcpServer.h
rt^3/trunk/include/PkgUdpServer.h
rt^3/trunk/src/libPkgCpp/CMakeLists.txt
rt^3/trunk/src/libPkgCpp/PkgClient.cxx
rt^3/trunk/src/libPkgCpp/PkgServer.cxx
rt^3/trunk/src/libPkgCpp/PkgTcpServer.cxx
rt^3/trunk/src/libPkgCpp/PkgUdpServer.cxx
rt^3/trunk/tests/libpkgcpp/pkgcppTest.cxx

Added Paths:
---
rt^3/trunk/include/PkgTcpClient.h
rt^3/trunk/include/PkgUdpClient.h
rt^3/trunk/src/libPkgCpp/PkgTcpClient.cxx
rt^3/trunk/src/libPkgCpp/PkgUdpClient.cxx

Modified: rt^3/trunk/include/PkgClient.h
===
--- rt^3/trunk/include/PkgClient.h  2010-08-19 19:32:14 UTC (rev 40261)
+++ rt^3/trunk/include/PkgClient.h  2010-08-19 19:52:52 UTC (rev 40262)
@@ -33,8 +33,8 @@
 class PkgClient
 {
 public:
-PkgClient(std::string ipOrHostname, int port);
-PkgClient(pkg_conn* conn);
+PkgClient(std::string proto, std::string ipOrHostname, int port);
+PkgClient(std::string proto, pkg_conn* conn);
 virtual ~PkgClient();
 
 bool hasGoodConnection();
@@ -68,6 +68,7 @@
 int send(int opcode, const char* buffer, size_t bufferLen);
 
 private:
+std::string proto;
 pkg_conn* conn;
 
 

Modified: rt^3/trunk/include/PkgServer.h
===
--- rt^3/trunk/include/PkgServer.h  2010-08-19 19:32:14 UTC (rev 40261)
+++ rt^3/trunk/include/PkgServer.h  2010-08-19 19:52:52 UTC (rev 40262)
@@ -47,6 +47,9 @@
 std::string proto;
 int listenFD;
 pkg_switch* callBackTable;
+
+virtual PkgClient* getNewClient(pkg_conn* conn) = 0;
+
 };
 
 #endif /* __PKGSERVER_H__ */

Added: rt^3/trunk/include/PkgTcpClient.h
===
--- rt^3/trunk/include/PkgTcpClient.h   (rev 0)
+++ rt^3/trunk/include/PkgTcpClient.h   2010-08-19 19:52:52 UTC (rev 40262)
@@ -0,0 +1,51 @@
+/*  P K G T C P C L I E N T . H
+ * BRL-CAD
+ *
+ * Copyright (c) 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 PkgTcpClient.h
+ * PkgTcpClient.h
+ *
+ *  Created on: Aug 19, 2010
+ *  Author: dloman
+ */
+
+#ifndef __PKGTCPCLIENT_H__
+#define __PKGTCPCLIENT_H__
+
+#include PkgClient.h
+
+class PkgTcpClient : public PkgClient
+{
+public:
+  PkgTcpClient(std::string ipOrHostname, int port);
+  PkgTcpClient(pkg_conn* conn);
+  virtual
+  ~PkgTcpClient();
+};
+
+#endif /* __PKGTCPCLIENT_H__ */
+
+/*
+ * Local Variables:
+ * tab-width: 8
+ * mode: C
+ * indent-tabs-mode: t
+ * c-file-style: stroustrup
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */


Property changes on: rt^3/trunk/include/PkgTcpClient.h
___
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Revision Date Author
Added: svn:eol-style
   + native

Modified: rt^3/trunk/include/PkgTcpServer.h
===
--- rt^3/trunk/include/PkgTcpServer.h   2010-08-19 19:32:14 UTC (rev 40261)
+++ rt^3/trunk/include/PkgTcpServer.h   2010-08-19 19:52:52 UTC (rev 40262)
@@ -28,12 +28,17 @@
 #define __PKGTCPSERVER_H__
 
 #include PkgServer.h
+#include PkgTcpClient.h
 
 class PkgTcpServer : public PkgServer
 {
 public:
   PkgTcpServer(pkg_switch callbacks[]);
   virtual ~PkgTcpServer();
+
+private:
+  PkgClient* getNewClient(pkg_conn* conn);
+
 };
 
 #endif /* __PKGTCPSERVER_H__ */

Added: rt^3/trunk/include/PkgUdpClient.h
===
--- rt^3/trunk/include/PkgUdpClient.h   (rev 0)
+++ rt^3/trunk/include/PkgUdpClient.h   2010-08-19 19:52:52 UTC (rev 40262)
@@ -0,0 +1,50 @@
+/*  P K G U D P C L I E N T

[brlcad-commits] SF.net SVN: brlcad:[40263]

2010-08-19 Thread davidloman 
Revision: 40263
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40263view=rev
Author:   davidloman
Date: 2010-08-19 19:54:20 + (Thu, 19 Aug 2010)

Log Message:
---
WS, Formatting. Used Eclipse formatter so svn diff is likely useless.

Modified Paths:
--
rt^3/trunk/include/PkgClient.h
rt^3/trunk/include/PkgServer.h
rt^3/trunk/include/PkgTcpServer.h
rt^3/trunk/include/PkgUdpClient.h
rt^3/trunk/include/PkgUdpServer.h
rt^3/trunk/include/pkgcppcommon.h
rt^3/trunk/src/libPkgCpp/PkgClient.cxx
rt^3/trunk/src/libPkgCpp/PkgServer.cxx
rt^3/trunk/src/libPkgCpp/PkgTcpClient.cxx
rt^3/trunk/src/libPkgCpp/PkgTcpServer.cxx
rt^3/trunk/src/libPkgCpp/PkgUdpClient.cxx
rt^3/trunk/src/libPkgCpp/PkgUdpServer.cxx
rt^3/trunk/tests/libpkgcpp/pkgcppTest.cxx

Modified: rt^3/trunk/include/PkgClient.h
===
--- rt^3/trunk/include/PkgClient.h  2010-08-19 19:52:52 UTC (rev 40262)
+++ rt^3/trunk/include/PkgClient.h  2010-08-19 19:54:20 UTC (rev 40263)
@@ -33,50 +33,55 @@
 class PkgClient
 {
 public:
-PkgClient(std::string proto, std::string ipOrHostname, int port);
-PkgClient(std::string proto, pkg_conn* conn);
-virtual ~PkgClient();
+  PkgClient(std::string proto, std::string ipOrHostname, int port);
+  PkgClient(std::string proto, pkg_conn* conn);
+  virtual
+  ~PkgClient();
 
-bool hasGoodConnection();
+  bool
+  hasGoodConnection();
 
-/*
- * Blocks until a specific opcode has been received on the connection
- */
-char* waitForMsg(int opcode);
+  /*
+   * Blocks until a specific opcode has been received on the connection
+   */
+  char*
+  waitForMsg(int opcode);
 
-/*
- * Attempts to route data in buffer to the appropriate call back.
- * Returns:
- *  0 on error
- *  0 on EOF
- *  0 on success
- */
-int processData();
+  /*
+   * Attempts to route data in buffer to the appropriate call back.
+   * Returns:
+   *  0 on error
+   *  0 on EOF
+   *  0 on success
+   */
+  int
+  processData();
 
-/*
- * Attempts to pull data off of the associated
- * socket and place it in the internal buffer
- * Returns:
- *  0 on error
- *  0 on EOF
- *  0 on success
- */
-int pullDataFromSocket();
+  /*
+   * Attempts to pull data off of the associated
+   * socket and place it in the internal buffer
+   * Returns:
+   *  0 on error
+   *  0 on EOF
+   *  0 on success
+   */
+  int
+  pullDataFromSocket();
 
-void close();
+  void
+  close();
 
-int send(int opcode, const char* buffer, size_t bufferLen);
+  int
+  send(int opcode, const char* buffer, size_t bufferLen);
 
 private:
-std::string proto;
-pkg_conn* conn;
+  std::string proto;
+  pkg_conn* conn;
 
-
 };
 
 #endif /* __PKGCLIENT_H__ */
 
-
 /*
  * Local Variables:
  * mode: C

Modified: rt^3/trunk/include/PkgServer.h
===
--- rt^3/trunk/include/PkgServer.h  2010-08-19 19:52:52 UTC (rev 40262)
+++ rt^3/trunk/include/PkgServer.h  2010-08-19 19:54:20 UTC (rev 40263)
@@ -32,29 +32,31 @@
 class PkgServer
 {
 public:
-PkgServer(std::string proto, pkg_switch callbacks[]);
-virtual ~PkgServer();
+  PkgServer(std::string proto, pkg_switch callbacks[]);
+  virtual
+  ~PkgServer();
 
-bool listen(unsigned short port);
+  bool
+  listen(unsigned short port);
 
-/*
- * This function blocks until a new connection
- */
-PkgClient* waitForClient();
+  /*
+   * This function blocks until a new connection
+   */
+  PkgClient*
+  waitForClient();
 
-
 private:
-std::string proto;
-int listenFD;
-pkg_switch* callBackTable;
+  std::string proto;
+  int listenFD;
+  pkg_switch* callBackTable;
 
-virtual PkgClient* getNewClient(pkg_conn* conn) = 0;
+  virtual PkgClient*
+  getNewClient(pkg_conn* conn) = 0;
 
 };
 
 #endif /* __PKGSERVER_H__ */
 
-
 /*
  * Local Variables:
  * mode: C

Modified: rt^3/trunk/include/PkgTcpServer.h
===
--- rt^3/trunk/include/PkgTcpServer.h   2010-08-19 19:52:52 UTC (rev 40262)
+++ rt^3/trunk/include/PkgTcpServer.h   2010-08-19 19:54:20 UTC (rev 40263)
@@ -34,10 +34,12 @@
 {
 public:
   PkgTcpServer(pkg_switch callbacks[]);
-  virtual ~PkgTcpServer();
+  virtual
+  ~PkgTcpServer();
 
 private:
-  PkgClient* getNewClient(pkg_conn* conn);
+  PkgClient*
+  getNewClient(pkg_conn* conn);
 
 };
 

Modified: rt^3/trunk/include/PkgUdpClient.h
===
--- rt^3/trunk/include/PkgUdpClient.h   2010-08-19 19:52:52 UTC (rev 40262)
+++ rt^3/trunk/include/PkgUdpClient.h   2010-08-19 19:54:20 UTC (rev 40263)
@@ -34,7 +34,8 @@
 public:
   PkgUdpClient(std::string ipOrHostname, int port);

[brlcad-commits] SF.net SVN: brlcad:[40264] brlcad/branches/cmake/misc/CMake/FindTCL.cmake

2010-08-19 Thread starseeker 
Revision: 40264
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40264view=rev
Author:   starseeker
Date: 2010-08-19 21:40:21 + (Thu, 19 Aug 2010)

Log Message:
---
Looks like we'll need this trick to handle tclConfig.sh:  
http://www.cmake.org/pipermail/cmake/2007-July/015194.html

Modified Paths:
--
brlcad/branches/cmake/misc/CMake/FindTCL.cmake

Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 19:54:20 UTC 
(rev 40263)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake  2010-08-19 21:40:21 UTC 
(rev 40264)
@@ -194,7 +194,7 @@
 endif()
 SET(TCLTK_${targetname}${MAJORNUM}${MINORNUM} 
TCLTK_${targetname}${MAJORNUM}${MINORNUM}-NOTFOUND)
  ENDFOREACH()
-MESSAGE(TCLTK_${targetname}${MAJORNUM}${MINORNUM}_LIST: 
${TCLTK_${targetname}${MAJORNUM}${MINORNUM}_LIST})
+#MESSAGE(TCLTK_${targetname}${MAJORNUM}${MINORNUM}_LIST: 
${TCLTK_${targetname}${MAJORNUM}${MINORNUM}_LIST})
  endif()
  endif()
   ENDFOREACH()
@@ -242,10 +242,24 @@
FIND_LIBRARY_VERSIONS(tcl TCLTK_PREFIX_LIBDIRS NO_SYSTEM_PATH)
PULL_PREFERRED_VERSION(tcl TCL_LIBRARY)
MESSAGE(TCL_LIBRARY: ${TCL_LIBRARY})
+   GET_FILENAME_COMPONENT(TCLTK_LIB_PATH_PARENT ${TCL_LIBRARY} PATH)
+   MESSAGE(TCL_PATH: ${TCLTK_LIB_PATH_PARENT})
+ set(tclconffile tclConfig.sh-NOTFOUND) 
+ find_file(tclconffile tclConfig.sh PATHS ${TCLTK_LIB_PATH_PARENT})
+ if(NOT tclconffile MATCHES NOTFOUND$)
+   MESSAGE(Found config file: ${tclconffile})
+FILE(READ ${tclconffile} TCL_CONF_FILE)
+#MESSAGE(${tclconffile}:\n ${TCL_CONF_FILE})
+STRING(REGEX REPLACE \r?\n ; ENT ${TCL_CONF_FILE})
+FOREACH(line ${ENT})
+#   STRING(REGEX REPLACE (tclConfig) \\1 INCLUDEDIR 
${TCL_CONF_FILE})
+  MESSAGE(INCLUDEDIR: ${line})
+   endforeach()
+ endif()
 ENDIF(TCLTK_PREFIX)
 
-SET(syspath /usr)
-FIND_LIBRARY_VERSIONS(tcl syspath )
+#SET(syspath /usr)
+#FIND_LIBRARY_VERSIONS(tcl syspath )
 
 #LIST(REMOVE_DUPLICATES TCL_FOUND_MAJOR_VERSIONS)
 #LIST(REMOVE_DUPLICATES TCL_FOUND_MINOR_VERSIONS)
@@ -289,8 +303,6 @@
 
 #LIST(REMOVE_DUPLICATES TCLTK_POSSIBLE_PATHS)
 
-MESSAGE(possible paths: ${TCLTK_POSSIBLE_PATHS})
-
 FOREACH(SPATH ${TCLTK_POSSIBLE_PATHS})
  set(tclconffile tclConfig.sh-NOTFOUND) 
  find_file(tclconffile tclConfig.sh PATHS ${SPATH}/lib)
@@ -303,7 +315,6 @@
 GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT ${TCL_TCLSH_PATH} PATH)
 STRING(REGEX REPLACE 
   ^.*tclsh([0-9]\\.*[0-9]).*$ \\1 TCL_TCLSH_VERSION ${TCL_TCLSH})
-
 GET_FILENAME_COMPONENT(TK_WISH_PATH ${TK_WISH} PATH)
 GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT ${TK_WISH_PATH} PATH)
 STRING(REGEX REPLACE 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
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:[40266] brlcad/branches/cmake/CMakeLists.txt

2010-08-19 Thread starseeker 
Revision: 40266
  http://brlcad.svn.sourceforge.net/brlcad/?rev=40266view=rev
Author:   starseeker
Date: 2010-08-20 04:25:08 + (Fri, 20 Aug 2010)

Log Message:
---
Closest thing so far to a working ExternalProject_ADD command - it appears to 
do the configure, make and make install PRIOR to building anything else, which 
means things like TCL_LIBRARY will need to point to the installed location of 
the library.

Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt

Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2010-08-20 03:25:35 UTC (rev 
40265)
+++ brlcad/branches/cmake/CMakeLists.txt2010-08-20 04:25:08 UTC (rev 
40266)
@@ -720,8 +720,24 @@
 # Programs, not a library - needs libutahrle, but the check for system 
install logic
 # will be different here.  Ignore for now, revisit later.
 
-INCLUDE(${BRLCAD_CMAKE_DIR}/FindTCL.cmake)
+#INCLUDE(${BRLCAD_CMAKE_DIR}/FindTCL.cmake)
 
+include(ExternalProject)
+ExternalProject_Add(
+  tcl
+  DOWNLOAD_COMMAND 
+  PREFIX ${BRLCAD_BINARY_DIR}
+  SOURCE_DIR ${BRLCAD_SOURCE_DIR}/src/other/tcl/unix
+  CONFIGURE_COMMAND autoconf -I ${BRLCAD_SOURCE_DIR}/src/other/tcl/unix -o
+  ${BRLCAD_SOURCE_DIR}/src/other/tcl/unix/configure
+  ${BRLCAD_SOURCE_DIR}/src/other/tcl/unix/configure.in  mkdir -p
+  ${BRLCAD_BINARY_DIR}/src/other/tcl/  cd
+  ${BRLCAD_BINARY_DIR}/src/other/tcl/ 
+  SOURCE_DIR/configure --prefix=${BRLCAD_PREFIX}
+  BUILD_COMMAND cd ${BRLCAD_BINARY_DIR}/src/other/tcl/  make
+  INSTALL_COMMAND  cd ${BRLCAD_BINARY_DIR}/src/other/tcl/  make install
+)
+
 # Tk
 #include(ExternalProject)
 #ExternalProject_Add(


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits