qub-cvstree — Bug updates & CVS checkins (may be high traffic)

[qub-cvstree] CVS: eshell/lib/eshell eshell.cpp,1.7,1.8 eshell.h,1.4,1.5

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell/lib/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21598/lib/eshell

Modified Files:
	eshell.cpp eshell.h 
Log Message:
brought up to date with s11n 0.9pre2

Index: eshell.cpp
===================================================================
RCS file: /cvsroot/qub/eshell/lib/eshell/eshell.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eshell.cpp	1 Jun 2004 06:58:31 -0000	1.7
+++ eshell.cpp	2 Jun 2004 06:57:44 -0000	1.8
@@ -13,7 +13,7 @@
 #  include <boost/timer.hpp>
 #endif
 
-#include <s11n.net/t5x/key_value_parser.hpp>
+#include <s11n.net/acme/key_value_parser.hpp>
 #include <s11n.net/stringutil/string_util.hpp> // trim_string()
 #include <s11n.net/stringutil/stdstring_tokenizer.hpp> // trim_string()
 #include <eshell/ShellProcess.h>
@@ -29,8 +29,8 @@
 #endif
 
 #include <s11n.net/phoenix/phoenix.hpp>
-#include <s11n.net/t5x/aliaser.hpp>
-#include <s11n.net/t5x/environment.hpp>
+#include <s11n.net/acme/aliaser.hpp>
+#include <s11n.net/acme/environment.hpp>
 
 
 #if HAVE_LIBREADLINECPP
@@ -41,8 +41,8 @@
 #define ESHELLDEBUG if( env().get_bool( "debug", false ) ) CERR
 namespace eshell {
 
-        using t5x::aliaser;
-        using t5x::environment;
+        using acme::aliaser;
+        using acme::environment;
 
         struct eshell_sharing_context {}; // private type for use with phoenix<>
 
@@ -105,7 +105,7 @@
 
         void init( int argc, char ** argv )
         {
-                t5x::argv_parser & a = t5x::argv_parser::args( argc, argv );
+                acme::argv_parser & a = acme::argv_parser::args( argc, argv );
                 if( a.get_bool( "classloader-debug", false ) )
                 {
                         cl::class_loader_debug_level( 1 );
@@ -117,19 +117,19 @@
                 cllite::class_path().add_path( "." );
         }
 
-        t5x::environment & env()
+        acme::environment & env()
         {
-                return t5x::environment::env();
+                return acme::environment::env();
         }
 
-        t5x::argv_parser & args()
+        acme::argv_parser & args()
         {
-                return t5x::argv_parser::args();
+                return acme::argv_parser::args();
         }
 
-        t5x::aliaser & aliases()
+        acme::aliaser & aliases()
         {
-                return phoenix::phoenix<t5x::aliaser,commander_map>::instance();
+                return phoenix::phoenix<acme::aliaser,commander_map>::instance();
         }
 
 
@@ -326,7 +326,7 @@
                         }
                         arguments::args_list::const_iterator cit = args.argv().begin();
                         ++cit; // discard arg0
-                        t5x::key_value_parser kp;
+                        acme::key_value_parser kp;
                         if( ! kp.parse( *cit ) )
                         {
                                 os << "set: unparseable tokens: ["<<(*cit)<<"]"<< std::endl;
@@ -432,7 +432,7 @@
 
                         if( std::string::npos != rest.find_first_of( "=" ) )
                         { // alias foo=bar
-                                t5x::key_value_parser kp;
+                                acme::key_value_parser kp;
                                 if( ! kp.parse( rest ) )
                                 {
                                         os << "alias: unparseable tokens: ["<<rest<<"]"<< std::endl;

Index: eshell.h
===================================================================
RCS file: /cvsroot/qub/eshell/lib/eshell/eshell.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eshell.h	1 Jun 2004 06:58:31 -0000	1.4
+++ eshell.h	2 Jun 2004 06:57:44 -0000	1.5
@@ -12,9 +12,9 @@
 
 #include "eshell_config.h"
 
-#include <s11n.net/t5x/environment.hpp>
-#include <s11n.net/t5x/aliaser.hpp>
-#include <s11n.net/t5x/argv_parser.hpp>
+#include <s11n.net/acme/environment.hpp>
+#include <s11n.net/acme/aliaser.hpp>
+#include <s11n.net/acme/argv_parser.hpp>
 #include <s11n.net/stringutil/stdstring_tokenizer.hpp>
 
 #include <s11n.net/s11n/s11nlite.hpp>
@@ -131,18 +131,18 @@
            See the docs for environment::propagate_sets(): that is set
            to true in the returned object.
         */
-        t5x::environment & env();
+        acme::environment & env();
 
         /**
            Returns the arguments passed in to eshell::init(). The returned
            object is not valid before eshell::init() is called.
         */
-        t5x::argv_parser & args();
+        acme::argv_parser & args();
 
         /**
            Returns this shell's aliases
         */
-        t5x::aliaser & aliases();
+        acme::aliaser & aliases();
 
         /**
            Splits command into tokens and pass them to

[qub-cvstree] CVS: eshell/client/gcom gcom.h,1.3,1.4 properties.cpp,1.2,1.3 properties.h,1.3,1.4

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell/client/gcom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21598/client/gcom

Modified Files:
	gcom.h properties.cpp properties.h 
Log Message:
brought up to date with s11n 0.9pre2

Index: gcom.h
===================================================================
RCS file: /cvsroot/qub/eshell/client/gcom/gcom.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcom.h	31 May 2004 15:19:07 -0000	1.3
+++ gcom.h	2 Jun 2004 06:57:44 -0000	1.4
@@ -5,7 +5,7 @@
 #include <list>
 
 #include <s11n.net/s11n/s11n_debuggering_macros.hpp> // COUT/CERR
-#include <s11n.net/t5x/children_holder.hpp> // a parent-child manager
+#include <s11n.net/acme/children_holder.hpp> // a parent-child manager
 #include "properties.h" // properties class
 #include "event.h" // event framework
 namespace gcom {
@@ -151,7 +151,7 @@
                 /**
                    An internal helper type. Don't rely on it.
                 */
-                typedef t5x::children_holder<basic_gcom,basic_gcom> babysitter_type;
+                typedef acme::children_holder<basic_gcom,basic_gcom> babysitter_type;
                 /**
                    Guaranteed to be std::list/vector compatible.
                  */

Index: properties.cpp
===================================================================
RCS file: /cvsroot/qub/eshell/client/gcom/properties.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- properties.cpp	31 May 2004 15:19:07 -0000	1.2
+++ properties.cpp	2 Jun 2004 06:57:44 -0000	1.3
@@ -18,7 +18,7 @@
         bool
         properties::unset( const std::string & key )
         {
-                bool b = this->t5x::property_store::unset( key );
+                bool b = this->acme::property_store::unset( key );
                 if( b )
                 {
                         event::fire_event<property_event>(new property_event( this, key, property_event::Unset ),
@@ -30,7 +30,7 @@
         void
         properties::set_string( const std::string & key, const std::string & val )
         {
-                this->t5x::property_store::set_string( key, val );
+                this->acme::property_store::set_string( key, val );
                 event::fire_event<property_event>(new property_event( this, key, property_event::Modified ),
                                                   true );
         }

Index: properties.h
===================================================================
RCS file: /cvsroot/qub/eshell/client/gcom/properties.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- properties.h	31 May 2004 15:19:07 -0000	1.3
+++ properties.h	2 Jun 2004 06:57:44 -0000	1.4
@@ -7,7 +7,7 @@
 // License: Do As You Damned Well Please
 // Author: stephan
 ////////////////////////////////////////////////////////////////////////
-#include <s11n.net/t5x/property_store.hpp>
+#include <s11n.net/acme/property_store.hpp>
 
 #include "event.h" // event framework
 
@@ -84,7 +84,7 @@
         or should graceful unregister itself when it dies.
 
         */
-        class properties : public t5x::property_store
+        class properties : public acme::property_store
         {
         public:
                 /**

[qub-cvstree] CVS: eshell LICENSE.eshell,1.3,NONE

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9532

Removed Files:
	LICENSE.eshell 
Log Message:
doh - accidentally re-added it.

--- LICENSE.eshell DELETED ---

[qub-cvstree] CVS: eshell LICENSE.libeshell,NONE,1.1

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9379

Added Files:
	LICENSE.libeshell 
Log Message:
egg

--- NEW FILE: LICENSE.libeshell ---
========================================================================
This is the license for the eshell library, effective 26 Dec 2003.
========================================================================

Specifically, 'eshell' refers to all C/C++ source code files which
reside in the following subdirectories of this distribution:

  lib/eshell
  client/*

except in cases where the source files or their accompanying licenses
specify otherwise. In all cases the files are released under Open
Source-compatible terms, but some files do have specific licenses
other than those listed here. Any license listed in a source file
supercedes this license. In the case of C/C++ source code, the license
is normally listed in the header file only, and not in the
implementation file(s).

eshell is released under a dual-license:
[...277 lines suppressed...]
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

[qub-cvstree] CVS: eshell LICENSE.eshell,1.2,1.3

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9105

Added Files:
	LICENSE.eshell 
Log Message:
egg

[qub-cvstree] CVS: eshell LICENSE.eshell,1.1.1.1,NONE

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9060

Removed Files:
	LICENSE.eshell 
Log Message:
renamed to LICENSE.libeshell

--- LICENSE.eshell DELETED ---

[qub-cvstree] CVS: eshell configure,1.2,1.3

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8837

Modified Files:
	configure 
Log Message:
renamed eshell --> libeshell

Index: configure
===================================================================
RCS file: /cvsroot/qub/eshell/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure	31 May 2004 15:21:17 -0000	1.2
+++ configure	1 Jun 2004 07:02:52 -0000	1.3
@@ -2,10 +2,10 @@
 
 . ./find_toc.sh || exit
 
-export PACKAGE_NAME=eshell
+export PACKAGE_NAME=libeshell
 export PACKAGE_VERSION="$(date +%Y.%m.%d)"
 
 # toconfigure will call configure.${PACKAGE_NAME}, so package-specific
 # processing should be done there.
-source toc/sbin/toconfigure "$@"
+source ${TOC_HOME}/sbin/toconfigure "$@"
 

[qub-cvstree] CVS: eshell configure.libeshell,NONE,1.1 toc.libeshell.make.at,NONE,1.1 toc.libeshell.help,NONE,1.1

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8814

Added Files:
	configure.libeshell toc.libeshell.make.at toc.libeshell.help 
Log Message:
egg

--- NEW FILE: configure.libeshell ---
#!/do/not/bash
# configure script for the eshell project

toc_test check_dist_md5s

toc_test user_is_stephan_beal

toc_test_require gnu_cpp_tools
toc_test_require gcc_try_compile ${TOC_HOME}/tests/cpp/check_stl_newstyle.cpp


toc_test_require libs11n
# eval $(${s11n_config} --toc-config  | sed -e 's/$/; /')

{ # readline support?
    readln=0
    if [ 1 = ${configure_with_readline-1} ] ; then
        toc_test find_appconfig libreadline_cpp && {
            readln=1
            eval $(${libreadline_cpp_config} --toc-config | sed -e 's/$/; /')
        }
    else
        echo "libreadline_cpp support has been disabled via --without-readline."
    fi
    toc_export HAVE_LIBREADLINECPP=$readln
    test x0 = "x${readln}" && {
    cat <<EOF
${TOC_BOLD_}
************************************************************************
WARNING: building without libreadine_cpp!
This means that interactive editing and command history will not be
enabled!
************************************************************************
${_TOC_BOLD}
EOF
    }
    unset readln
} # end readline


toc_test_require find_header s11n.net/tostring/to_string.hpp ${prefix}/include:/usr/include:/usr/local/include

############################ eshell-config
removeDupes=${TOC_HOME}/bin/removeDupeArgs
ldadd="$(${removeDupes} -L${prefix}/lib ${LIBREADLINECPP_CLIENT_LDADD} ${LIBS11N_CLIENT_LDADD} -leshell)"
inc="$(${removeDupes} -I${prefix}/include ${LIBREADLINECPP_CLIENT_INCLUDES} ${LIBS11N_CLIENT_INCLUDES})"
toc_test_require PACKAGE_NAME-config \
    PACKAGE_PREFIX=LIBESHELL_ \
    CLIENT_LDADD="${ldadd}" \
    CLIENT_INCLUDES="${inc}"
eval $(./${PACKAGE_NAME}-config --toc-config | sed -e 's/$/; /')

############################ /eshell-config


toc_test_require atfilter_file lib/eshell/eshell_config.h.at lib/eshell/eshell_config.h

toc_test_require toc_project_makefile

--- NEW FILE: toc.libeshell.make.at ---
#!/do/not/make
#^^^ only to help emacs out.
#
# Expects AT LEAST the following configure tests to be run:
#
#     zlib, bzlib, libltdl, libs11n, flex, boost, readline, lyxport
#
# But this code doesn't care whether the tests pass or not.

configure_with_lyxport = @configure_with_lyxport@

INCLUDES += $(LIBS11N_CLIENT_INCLUDES) -I$(top_srcdir)/include

CLEAN_FILES += $(wildcard *.o *~)

LIBESHELL_LIBDIR = $(top_srcdir)/lib/eshell
LIBESHELL_CLIENT_LDADD :=  \
	-L$(LIBESHELL_LIBDIR) \
	$(LIBESHELL_CLIENT_LDADD) \
	-export-dynamic

LIBESHELL_LDADD = $(LIBREADLINECPP_CLIENT_LDADD) $(LIBS11N_CLIENT_LDADD)

ifeq (1,$(configure_with_lyxport))
    LYXPORT_L2HARGS = -nonavigation -show_section_numbers -split 0 -noimages
    LYXPORT_ARGS = -c -tt
    LYXPORT_ARGS += --html --opts_l2h '$(LYXPORT_L2HARGS)'
    LYXPORT_ARGS += --ps --pdf
    LYXPORT_BIN = @LYXPORT_BIN@
endif


--- NEW FILE: toc.libeshell.help ---
#!/bin/sh



cat <<EOF

--disable-zlib
        disables zlib support for es11n.

--with-lyxport=/path/to/lyxport
        Specify a path to find lyxport (a LyX-to-PDF/PS/HTML conversion utility)

--with-boost=/path/to/boost/src/tree
        Top-most path to the boost source tree (espace needs this).

--s11n-prefix=/prefix
        Path under which libs11n is installed.

There are many other options supported by various tests.
Try --help-X, where X is any of these:

EOF

sed -n -e 's/^ *//;/^toc_test/p;' configure.common configure.eshell | cut -d' ' -f 2
echo
echo "(there may be others, not shown here)"

[qub-cvstree] CVS: eshell configure.eshell,1.4,NONE toc.eshell.make.at,1.2,NONE toc.eshell.help,1.1.1.1,NONE

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8515

Removed Files:
	configure.eshell toc.eshell.make.at toc.eshell.help 
Log Message:
renamed to *.libeshell

--- configure.eshell DELETED ---

--- toc.eshell.make.at DELETED ---

--- toc.eshell.help DELETED ---

[qub-cvstree] CVS: eshell configure.common,1.2,NONE

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8469

Removed Files:
	configure.common 
Log Message:
no longer used

--- configure.common DELETED ---

[qub-cvstree] CVS: eshell/lib/eshell eshell.cpp,1.6,1.7 eshell.h,1.3,1.4

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell/lib/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8096

Modified Files:
	eshell.cpp eshell.h 
Log Message:
fixed: read_line() now appends to Readline history

Index: eshell.cpp
===================================================================
RCS file: /cvsroot/qub/eshell/lib/eshell/eshell.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eshell.cpp	1 Jun 2004 03:30:58 -0000	1.6
+++ eshell.cpp	1 Jun 2004 06:58:31 -0000	1.7
@@ -196,11 +196,14 @@
         std::string read_line( const std::string & prompt, bool & breakout )
         {
                 std::string realprompt = env().expand_vars( prompt );
+                std::string str;
 #if HAVE_LIBREADLINECPP
-                return readline().readline( realprompt, breakout );
+                str = readline().readline( realprompt, breakout );
+                if( breakout ) return "";
+                if( ! str.empty() ) readline().add_history( str );
+                return str;
 #else
                 std::cout << realprompt;
-                std::string str;
                 breakout = std::getline( std::cin, str ).eof();
                 return breakout ? "" : str;
 #endif // HAVE_LIBREADLINECPP

Index: eshell.h
===================================================================
RCS file: /cvsroot/qub/eshell/lib/eshell/eshell.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eshell.h	31 May 2004 19:56:03 -0000	1.3
+++ eshell.h	1 Jun 2004 06:58:31 -0000	1.4
@@ -271,7 +271,9 @@
            depends on the exact input method used by this library.
 
            Note that $var expansion are done on prompt, so it may
-           container environment variables.
+           container environment variables. Also, the input line is
+           added to the command-line history if this library is build
+           with libreadline_cpp support.
 
            No other processing is done: the exact input value is
            passed back to the client without eshell dispatching it or

[qub-cvstree] CVS: eshell/lib/eshell eshell_config.h.at,NONE,1.1

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell/lib/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25366

Added Files:
	eshell_config.h.at 
Log Message:
egg

--- NEW FILE: eshell_config.h.at ---
#ifndef ESHELL_CONFIG_H_INCLUDED
#define ESHELL_CONFIG_H_INCLUDED 1

#define HAVE_LIBREADLINECPP @HAVE_LIBREADLINECPP@


#endif // ESHELL_CONFIG_H_INCLUDED

[qub-cvstree] CVS: eshell/lib/eshell eshell.cpp,1.5,1.6 object_pool.h,1.3,1.4

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell/lib/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11600/lib/eshell

Modified Files:
	eshell.cpp object_pool.h 
Log Message:
mass commit, so i can work from the office.

Index: eshell.cpp
===================================================================
RCS file: /cvsroot/qub/eshell/lib/eshell/eshell.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eshell.cpp	31 May 2004 20:05:37 -0000	1.5
+++ eshell.cpp	1 Jun 2004 03:30:58 -0000	1.6
@@ -501,13 +501,13 @@
                 {
                         arguments a = args;
                         std::string arg = a.shift();
-                        int myint = stringutil::from_string( a.shift(), 0 );
+                        int myint = tostring::from_string( a.shift(), 0 );
                         if( 0 >= myint )
                         {
                                 os << "Error: time to sleep to small. You must use a number >= 0." << std::endl;
                                 return 1;
                         }
-                        int noisy = stringutil::from_string( a.shift(), 0 );
+                        int noisy = tostring::from_string( a.shift(), 0 );
 #if ESHELL_USE_SIGNALS
                         typedef void (*signalfunc)(int);
                         signalfunc old_sighandler = ::signal( SIGINT, eshell_SIGINT );

Index: object_pool.h
===================================================================
RCS file: /cvsroot/qub/eshell/lib/eshell/object_pool.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- object_pool.h	31 May 2004 19:56:03 -0000	1.3
+++ object_pool.h	1 Jun 2004 03:30:58 -0000	1.4
@@ -4,10 +4,23 @@
 #include <string>
 #include <map>
 
-#include <s11n.net/s11n/s11n_debuggering_macros.hpp> // COUT/CERR
 #include <s11n.net/cl/cllite.hpp> // classloader framework
 #include <s11n.net/phoenix/phoenix.hpp> // phoenix class
 
+// CERR is a drop-in replacement for std::cerr, but slightly more
+// decorative.
+#ifndef CERR
+#  define CERR std::cerr << __FILE__ << ":" << std::dec << __LINE__ << " : "
+#endif
+
+#ifndef COUT
+#  define COUT std::cout << __FILE__ << ":" << std::dec << __LINE__ << " : "
+#endif
+
+
+#endif //  DEBUGGERING_MACROS_H
+
+
 namespace eshell {
 
         /**

[qub-cvstree] CVS: eshell/client/gcom main.cpp,1.3,1.4

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell/client/gcom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11600/client/gcom

Modified Files:
	main.cpp 
Log Message:
mass commit, so i can work from the office.

Index: main.cpp
===================================================================
RCS file: /cvsroot/qub/eshell/client/gcom/main.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- main.cpp	31 May 2004 15:19:07 -0000	1.3
+++ main.cpp	1 Jun 2004 03:30:57 -0000	1.4
@@ -181,6 +181,23 @@
   return 0;
 }
 
+void setup_TheGCom()
+{
+        gcom::basic_gcom & gc = *TheGCom;
+        gc.name( "fred" );
+        gc.props().set( "coord", Coord2D( 10, 27 ) );
+        gc.props().set( "sumdumproperty", "sumdumvalue" );
+        gcom::basic_gcom * gch = new gcom::dummy_gcom();
+        gch->name( "baby" );
+        gch->props().set( "got_milk", 1 );
+        gc.children().push_back( gch );
+//         test_gcom_handler th;
+//         th.listen_to( TheGCom );
+// 	th.listen_to( gch );
+//         test_property_handler tph;
+//         tph.listen_to( &(TheGCom->props()) );
+//         tph.listen_to( &(gch->props()) );
+}
 int main( int argc, char **argv )
 {
         eshell::init( argc, argv );
@@ -188,28 +205,12 @@
 
         CERR << "Type 'event' to run the event test.\n";
 
-        ////////////////////////////////////////////////////////////
-        // event test setup...
+        setup_TheGCom();
+
         eshell::map_commander( "event", ::test_event );
         eshell::map_commander( "gset", ::test_gset );
         eshell::map_commander( "gunset", ::test_gunset );
         eshell::map_commander( "dump", ::dump_TheGCom );
-        gcom::basic_gcom & gc = *TheGCom;
-        gc.name( "fred" );
-        gc.props().set( "coord", Coord2D( 10, 27 ) );
-        gc.props().set( "sumdumproperty", "sumdumvalue" );
-        gcom::basic_gcom * gch = new gcom::dummy_gcom();
-        gch->name( "baby" );
-        gch->props().set( "got_milk", 1 );
-        gc.children().push_back( gch );
-        test_gcom_handler th;
-        th.listen_to( TheGCom );
-	th.listen_to( gch );
-        test_property_handler tph;
-        tph.listen_to( &(TheGCom->props()) );
-        tph.listen_to( &(gch->props()) );
-        // end event test setup
-        ////////////////////////////////////////////////////////////
         eshell::map_commander( "cgme", ::test_cgme );
         eshell::map_commander( "hex", ::test_hexagon_key );
 

[qub-cvstree] CVS: eshell configure.eshell,1.3,1.4

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18401

Modified Files:
	configure.eshell 
Log Message:
mass commit, in case i missed something :/

Index: configure.eshell
===================================================================
RCS file: /cvsroot/qub/eshell/configure.eshell,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.eshell	31 May 2004 19:56:03 -0000	1.3
+++ configure.eshell	31 May 2004 20:06:38 -0000	1.4
@@ -17,7 +17,7 @@
     if [ 1 = ${configure_with_readline-1} ] ; then
         toc_test find_appconfig libreadline_cpp && {
             readln=1
-            eval $(${readline_cpp_config} --toc-config | sed -e 's/$/; /')
+            eval $(${libreadline_cpp_config} --toc-config | sed -e 's/$/; /')
         }
     else
         echo "libreadline_cpp support has been disabled via --without-readline."

[qub-cvstree] CVS: eshell/lib/eshell eshell.cpp,1.4,1.5

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell/lib/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18220

Modified Files:
	eshell.cpp 
Log Message:
corrected missing prompt in non-readline mode

Index: eshell.cpp
===================================================================
RCS file: /cvsroot/qub/eshell/lib/eshell/eshell.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eshell.cpp	31 May 2004 19:56:03 -0000	1.4
+++ eshell.cpp	31 May 2004 20:05:37 -0000	1.5
@@ -199,6 +199,7 @@
 #if HAVE_LIBREADLINECPP
                 return readline().readline( realprompt, breakout );
 #else
+                std::cout << realprompt;
                 std::string str;
                 breakout = std::getline( std::cin, str ).eof();
                 return breakout ? "" : str;

[qub-cvstree] CVS: readline_cpp configure,1.1.1.1,1.2

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/readline_cpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17127

Modified Files:
	configure 
Log Message:
corrected readline_cpp --> libreadline_cpp

Index: configure
===================================================================
RCS file: /cvsroot/qub/readline_cpp/configure,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- configure	31 May 2004 15:14:12 -0000	1.1.1.1
+++ configure	31 May 2004 20:03:18 -0000	1.2
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PACKAGE_NAME=readline_cpp
+export PACKAGE_NAME=libreadline_cpp
 export PACKAGE_VERSION="$(date +%Y.%m.%d)"
 
 # toconfigure will call configure.${PACKAGE_NAME}, so package-specific

[qub-cvstree] CVS: readline_cpp/src Makefile,1.1.1.1,1.2

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/readline_cpp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16544/src

Modified Files:
	Makefile 
Log Message:
corrected missing Readline_s11n.hpp

Index: Makefile
===================================================================
RCS file: /cvsroot/qub/readline_cpp/src/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile	31 May 2004 15:14:12 -0000	1.1.1.1
+++ Makefile	31 May 2004 20:00:31 -0000	1.2
@@ -2,11 +2,8 @@
 
 SOURCES = Readline.cpp
 
-HEADERS = Readline.hpp 
-
-ifeq (1,$(HAVE_LIBS11N))
-    HEADERS += Readline_s11n.hpp
-endif
+HEADERS = Readline.hpp \
+	Readline_s11n.hpp
 
 DISTCLEAN_FILES = Readline_config.hpp
 
@@ -16,7 +13,7 @@
 INSTALL_HEADERS = $(HEADERS) Readline_config.hpp
 
 
-LIBNAME = libreadline_cpp
+LIBNAME = $(PACKAGE_NAME)
 SHARED_LIBS = $(LIBNAME)
 $(LIBNAME)_so_OBJECTS = Readline.o
 $(LIBNAME)_so_VERSION = $(PACKAGE_VERSION)

[qub-cvstree] CVS: eshell/lib/eshell eshell.cpp,1.3,1.4 eshell.h,1.2,1.3 object_pool.h,1.2,1.3

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell/lib/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15538/lib/eshell

Modified Files:
	eshell.cpp eshell.h object_pool.h 
Log Message:
libreadline_cpp support is now optional.

Index: eshell.cpp
===================================================================
RCS file: /cvsroot/qub/eshell/lib/eshell/eshell.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eshell.cpp	31 May 2004 15:18:25 -0000	1.3
+++ eshell.cpp	31 May 2004 19:56:03 -0000	1.4
@@ -33,8 +33,10 @@
 #include <s11n.net/t5x/environment.hpp>
 
 
-#include <s11n.net/readline/Readline.hpp>
-#include <s11n.net/readline/Readline_s11n.hpp>
+#if HAVE_LIBREADLINECPP
+#    include <s11n.net/readline/Readline.hpp>
+#    include <s11n.net/readline/Readline_s11n.hpp>
+#endif
 
 #define ESHELLDEBUG if( env().get_bool( "debug", false ) ) CERR
[...106 lines suppressed...]
+#if HAVE_LIBREADLINECPP
                 s11n::serialize_subnode( node, "readline", readline() );
+#endif
                 return s11nlite::save( node, filename );
         }
 
@@ -578,11 +594,12 @@
 
                 s11n::map::deserialize_streamable_map( session(), "aliases", aliases().map() );
                 s11n::map::deserialize_streamable_map( session(), "environment", env().get_map() );
+#if HAVE_LIBREADLINECPP
                 if( (node = s11nlite::find_child( session(), "readline" )) )
                 {
                         s11nlite::deserialize( *node, readline() );
                 }
-
+#endif
                 return true;
         }
 

Index: eshell.h
===================================================================
RCS file: /cvsroot/qub/eshell/lib/eshell/eshell.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eshell.h	31 May 2004 15:18:25 -0000	1.2
+++ eshell.h	31 May 2004 19:56:03 -0000	1.3
@@ -261,6 +261,25 @@
         void map_commander( const std::string & key, command_handler );
 
         /**
+           Reads a line of input and returns it. The exact mechanism
+           used to read the input depends on whether or not this lib
+           was build with libreadline_cpp support.
+
+           When this function returns, if breakout is true then this
+           is a signal to the client that no more input should be
+           read. This is normally triggered by Ctrl-D, but that
+           depends on the exact input method used by this library.
+
+           Note that $var expansion are done on prompt, so it may
+           container environment variables.
+
+           No other processing is done: the exact input value is
+           passed back to the client without eshell dispatching it or
+           setting any error codes.
+        */
+        std::string read_line( const std::string & prompt, bool & breakout );
+
+        /**
            Accepts input from the command line until the user taps
            Ctrl-D or types one of quit/exit/logout. It dispatch()es
            each input line after doing alias and $environment_var

Index: object_pool.h
===================================================================
RCS file: /cvsroot/qub/eshell/lib/eshell/object_pool.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- object_pool.h	31 May 2004 15:18:25 -0000	1.2
+++ object_pool.h	31 May 2004 19:56:03 -0000	1.3
@@ -135,13 +135,15 @@
                 {
                         if( 0 == key )
                         {
-                                typename object_map::iterator it;
-                                do
-                                { // look until we find an empty spot:
-                                        it = m_hashish.find( key = next_key() );
-                                } while( m_hashish.end() != it );
-                                // ^^^ Will cause an endless loop once you have max(key_type) objects in the map.
-                                // Since that number is in the billions, that's not really a bug just yet.
+                                key = next_key();
+//                                 typename object_map::iterator it,
+//                                         eit = m_hashish.end();
+//                                 do
+//                                 { // look until we find an empty spot:
+//                                         it = m_hashish.find( key = next_key() );
+//                                 } while( eit != it );
+//                                 // ^^^ Will cause an endless loop once you have max(key_type) objects in the map.
+//                                 // Since that number is in the billions, that's not really a bug just yet.
                         }
                         m_hashish[key] = obj;
                         m_reverse[obj] = key;
@@ -188,10 +190,10 @@
                 }
 
                 /**
-                   Relinquishes control of this object.
-                   Returns NULL if it did not have the given child, otherwise
-                   a pointer to that object. The caller becomes
-                   the owner of that object.
+                   Relinquishes control of this object.  Returns 0 if
+                   it did not have the given child, otherwise a
+                   pointer to that object. The caller becomes the
+                   owner of that object.
 
                    This would be called release_object(), but that is
                    easily misunderstood as freeing up resources, something
@@ -200,7 +202,7 @@
                 value_type * relinquish_object( const key_type key )
                 {
                         typename object_map::iterator it = m_hashish.find( key );
-                        if( m_hashish.end() == it ) return NULL;
+                        if( m_hashish.end() == it ) return 0;
                         value_type * v = (*it).second;
                         m_hashish.erase( it );
                         if( v )

[qub-cvstree] CVS: eshell configure.eshell,1.2,1.3

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15538

Modified Files:
	configure.eshell 
Log Message:
libreadline_cpp support is now optional.

Index: configure.eshell
===================================================================
RCS file: /cvsroot/qub/eshell/configure.eshell,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure.eshell	31 May 2004 15:19:07 -0000	1.2
+++ configure.eshell	31 May 2004 19:56:03 -0000	1.3
@@ -12,13 +12,38 @@
 toc_test_require libs11n
 # eval $(${s11n_config} --toc-config  | sed -e 's/$/; /')
 
-toc_test_require find_appconfig readline_cpp
-eval $(${readline_cpp_config} --toc-config | sed -e 's/$/; /')
+{ # readline support?
+    readln=0
+    if [ 1 = ${configure_with_readline-1} ] ; then
+        toc_test find_appconfig libreadline_cpp && {
+            readln=1
+            eval $(${readline_cpp_config} --toc-config | sed -e 's/$/; /')
+        }
+    else
+        echo "libreadline_cpp support has been disabled via --without-readline."
+    fi
+    toc_export HAVE_LIBREADLINECPP=$readln
+    test x0 = "x${readln}" && {
+    cat <<EOF
+${TOC_BOLD_}
+************************************************************************
+WARNING: building without libreadine_cpp!
+This means that interactive editing and command history will not be
+enabled!
+************************************************************************
+${_TOC_BOLD}
+EOF
+    }
+    unset readln
+} # end readline
+
+
+toc_test_require find_header s11n.net/tostring/to_string.hpp ${prefix}/include:/usr/include:/usr/local/include
 
 ############################ eshell-config
 removeDupes=${TOC_HOME}/bin/removeDupeArgs
 ldadd="$(${removeDupes} ${LIBREADLINECPP_CLIENT_LDADD} ${LIBS11N_CLIENT_LDADD} -L${prefix}/lib -leshell)"
-inc="$(${removeDupes} -I${prefix}/include ${LIBS11N_CLIENT_INCLUDES})"
+inc="$(${removeDupes} ${LIBREADLINECPP_CLIENT_INCLUDES} ${LIBS11N_CLIENT_INCLUDES} -I${prefix}/include)"
 toc_test_require PACKAGE_NAME-config \
     PACKAGE_PREFIX=LIBESHELL_ \
     CLIENT_LDADD="${ldadd}" \

[qub-cvstree] CVS: readline_cpp README.libreadline_cpp,NONE,1.1

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/readline_cpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15053

Added Files:
	README.libreadline_cpp 
Log Message:
egg

--- NEW FILE: README.libreadline_cpp ---
This is the README for libreadline++

readline++ is a C++ front-end to the excellent GNU libreadline,
providing the basic libreadline functionality through a C++
interface. It can also function without libreadline, and linking it
without libreadline affects the license under which it is
released. See the LICENSE file for details.

[qub-cvstree] CVS: readline_cpp README.readline_cpp,1.1.1.1,NONE

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/readline_cpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14873

Removed Files:
	README.readline_cpp 
Log Message:
renamed to *.libreadline_cpp...

--- README.readline_cpp DELETED ---

[qub-cvstree] CVS: readline_cpp configure.libreadline_cpp,NONE,1.1 LICENSE.libreadline_cpp,NONE,1.1 toc.libreadline_cpp.make.at,NONE,1.1

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/readline_cpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14663

Added Files:
	configure.libreadline_cpp LICENSE.libreadline_cpp 
	toc.libreadline_cpp.make.at 
Log Message:
egg

--- NEW FILE: configure.libreadline_cpp ---
#!/do/not/bash
# configure script for the eshell project

toc_test check_dist_md5s

toc_test user_is_stephan_beal

toc_test_require gnu_cpp_tools
toc_test_require gcc_try_compile toc/tests/cpp/check_stl_newstyle.cpp

configure_enable_gpl=0
toc_test readline
test 1 = ${configure_with_libreadline} && configure_enable_gpl=1

licensedesc="Public Domain"
test 1 = $configure_enable_gpl && {
    cat <<EOF
Enabling optional GPL-powered support. This means that this package is now
maintained under the terms of the GNU General Public License.
Use --without-libreadline to explicitely disable this.

EOF
    licensedesc="GNU General Public License. Copyright (c) 2002-2003 stephan beal <st...@s1...>."
}

toc_add_config PACKAGE_LICENSE="$licensedesc"

############################ PACKAGE_NAME-config
toc_test_require PACKAGE_NAME-config \
    PACKAGE_PREFIX=LIBREADLINECPP_ \
    CLIENT_LDADD="${LIBREADLINE_LDADD} -L${prefix}/lib -lreadline_cpp" \
    CLIENT_INCLUDES="-I${prefix}/include"
############################ /PACKAGE_NAME-config

toc_test_require atfilter_file src/Readline_config.hpp.at src/Readline_config.hpp

toc_test_require toc_project_makefile

--- NEW FILE: LICENSE.libreadline_cpp ---
This is the LICENSE file for libreadline++.

The license this source is released under depends on whether or not is
is linked with GNU libreadline. If so, then this library is released
under the GNU GPL. If it is configured using --without-libreadline,
that support is disabled and it is released into the Public Domain.

For purposes of the GPL, this library is Copyright (c) 2002-2004
stephan beal (st...@s1...).


--- NEW FILE: toc.libreadline_cpp.make.at ---
#!/do/not/make
#^^^ only to help emacs out.

configure_with_libreadline = @configure_with_libreadline@

INSTALL_HEADERS_DEST = $(prefix)/include/s11n.net/readline

CLEAN_FILES += $(wildcard *.o *~)

[qub-cvstree] CVS: readline_cpp configure.readline_cpp,1.1.1.1,NONE LICENSE.readline_cpp,1.1.1.1,NONE toc.readline_cpp.make.at,1.1.1.1,NONE

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/readline_cpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14508

Removed Files:
	configure.readline_cpp LICENSE.readline_cpp 
	toc.readline_cpp.make.at 
Log Message:
renamed to *.libreadline_cpp...

--- configure.readline_cpp DELETED ---

--- LICENSE.readline_cpp DELETED ---

--- toc.readline_cpp.make.at DELETED ---

[qub-cvstree] CVS: eshell/lib/eshell cli.flex.at,1.2,NONE common_flex_definitions.at,1.1,NONE

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell/lib/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5248

Removed Files:
	cli.flex.at common_flex_definitions.at 
Log Message:
obsolete

--- cli.flex.at DELETED ---

--- common_flex_definitions.at DELETED ---