pclasses-cvs — P::Classes CVS commits

[pclasses-cvs] pclasses2/include/pclasses Algorithm.h,1.1.1.1,1.2

[Christian P. <cp...@us...>]

Update of /cvsroot/pclasses/pclasses2/include/pclasses
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2870/include/pclasses

Modified Files:
	Algorithm.h 
Log Message:
Added 'typename' to satisfy gcc 3.4 

Index: Algorithm.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Algorithm.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Algorithm.h	22 Dec 2004 17:54:40 -0000	1.1.1.1
+++ Algorithm.h	24 Dec 2004 16:49:14 -0000	1.2
@@ -98,7 +98,8 @@
 	while(count--)
 	{
 		*dest++ = *src;
-		destruct(src++, 1, Traits::TypeTraits<Type>::HasTrivialCtor());
+		destruct(src++, 1, 
+			typename Traits::TypeTraits<Type>::HasTrivialCtor());
 	}
 }
 
@@ -107,19 +108,25 @@
 //! Construction algorithm
 template <typename Type>
 void construct(Type* dest, size_t count)
-{ Details::construct(dest, count, Traits::TypeTraits<Type>::HasTrivialCtor()); }
+{ 
+	Details::construct(dest, count, 
+		typename Traits::TypeTraits<Type>::HasTrivialCtor()); 
+}
 
 //! Destruction algorithm
 template <typename Type>
 void destruct(Type* dest, size_t count) throw()
-{ Details::destruct(dest, count, Traits::TypeTraits<Type>::HasTrivialCtor()); }
+{ 
+	Details::destruct(dest, count, 
+		typename Traits::TypeTraits<Type>::HasTrivialCtor()); 
+}
 
 //! Copy-construction algorithm
 template <typename Type>
 void copy_construct(Type* dest, const Type* src, size_t count)
 {
 	Details::copy_construct(dest, src, count,
-		Traits::TypeTraits<Type>::HasTrivialCtor());
+		typename Traits::TypeTraits<Type>::HasTrivialCtor());
 }
 
 //! Copy algorithm
@@ -127,7 +134,7 @@
 void copy(Type* dest, const Type* src, size_t count)
 {
 	Details::copy(dest, src, count,
-		Traits::TypeTraits<Type>::HasTrivialCopy());
+		typename Traits::TypeTraits<Type>::HasTrivialCopy());
 }
 
 //! Destructive copy-algorithm
@@ -135,7 +142,7 @@
 void destructive_copy(Type* dest, Type* src, size_t count)
 {
 	Details::destructive_copy(dest, src, count,
-		Traits::TypeTraits<Type>::HasTrivialCopy());
+		typename Traits::TypeTraits<Type>::HasTrivialCopy());
 }
 
 template <typename Iterator>

[pclasses-cvs] pclasses2/src Exception.cpp,1.2,1.3

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

Update of /cvsroot/pclasses/pclasses2/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2556/src

Modified Files:
	Exception.cpp 
Log Message:
added where() method. Had to do a small amount of refactoring.

Index: Exception.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/Exception.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Exception.cpp	23 Dec 2004 02:25:32 -0000	1.2
+++ Exception.cpp	24 Dec 2004 16:48:04 -0000	1.3
@@ -23,12 +23,17 @@
 namespace P {
 
 Exception::Exception(const char* what, const SourceInfo& si) throw()
-: _what(what), _source(&si)
+	: _what(what), _source(&si), _where()
+{
+}
+
+Exception::Exception(const std::string & what, const SourceInfo& si) throw()
+	: _what(what), _source(&si), _where()
 {
 }
 
 Exception::Exception(const Exception& err) throw()
-: _what(err._what), _source(err._source)
+	: _what(err._what), _source(err._source), _where(err._where)
 {
 }
 
@@ -36,9 +41,24 @@
 {
 }
 
+const char * Exception::where() const throw()
+{
+	if( _where.empty() &&  _source )
+	{
+		_where = "[file = ";
+		_where += _source->file();
+		_where += " : line = ";
+		_where += _source->line();
+		_where += " : function = ";
+		_where += _source->func();
+		_where += "]";
+	}
+	return _where.c_str();
+}
+
 const char* Exception::what() const throw()
 {
-	return _what;
+	return _what.c_str();
 }
 
 Exception& Exception::operator=(const Exception& err) throw()

[pclasses-cvs] pclasses2/include/pclasses Exception.h,1.1.1.1,1.2

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

Update of /cvsroot/pclasses/pclasses2/include/pclasses
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2556/include/pclasses

Modified Files:
	Exception.h 
Log Message:
added where() method. Had to do a small amount of refactoring.

Index: Exception.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Exception.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Exception.h	22 Dec 2004 17:54:39 -0000	1.1.1.1
+++ Exception.h	24 Dec 2004 16:48:05 -0000	1.2
@@ -21,24 +21,55 @@
 #ifndef _P_Exception_h_
 #define _P_Exception_h_
 
+#include <string>
 #include <pclasses/SourceInfo.h>
 
 namespace P {
 
-//! Exception base class
+/**
+This is the base Exception class for the P framework.
+
+Exception uses a non-traditional ctor, requiring a SourceInfo
+argument. Use the P_SOURCEINFO macro to pass SourceInfo to exceptions:
+
+throw MyException( "dammit!", P_SOURCEINFO );
+
+Clients may use the what() and where() methods to get information
+about the exception.
+
+*/
 class Exception {
 	public:
+		/**
+		   Creates an exception with the given what() string
+		   and the given SourceInfo.
+		*/
 		Exception(const char* what, const SourceInfo& si) throw();
+		/**
+		   Convenience/compatibility overload.
+		*/
+		Exception(const std::string & what, const SourceInfo& si) throw();
+
 		Exception(const Exception& err) throw();
 		~Exception() throw();
 
 		Exception& operator=(const Exception& err) throw();
 
+		/**
+		   Returns a description of the exception.
+		 */
 		const char* what() const throw();
 
+		/**
+		   Returns a string describing where this exception
+		   was thrown.
+		*/
+		const char * where() const throw();
+
 	private:
-		const char*        _what;
+		std::string _what;
 		const SourceInfo*  _source;
+		mutable std::string _where; // really should be a const char *, but that's not practical here w/o malloc()ing.
 };
 
 //! Logic error

[pclasses-cvs] pclasses2/include/pclasses/System Mime.h,1.5,1.6

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

Update of /cvsroot/pclasses/pclasses2/include/pclasses/System
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31114/include/pclasses/System

Modified Files:
	Mime.h 
Log Message:
added readDatabase(istream) and writeDatabase(ostream).

Index: Mime.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/System/Mime.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Mime.h	24 Dec 2004 15:13:34 -0000	1.5
+++ Mime.h	24 Dec 2004 16:23:24 -0000	1.6
@@ -121,6 +121,8 @@
 
 	   @fixme: should not re-insert existing file extension mappings
 	   into mimeToFilesMap().
+
+	   @fixme: allow file_ext to e ba space-separated list of extensions.
 	*/
 	void mapExtension(const MimeType& type, const std::string & file_ext );
     
@@ -143,6 +145,54 @@
 	const MimeType * findByFileExt(const std::string& fileExt) const;
 
 	/**
+	   UNTESTED.
+
+	   For each file extension mapping for key, the extension is
+	   push_back()'d to target.
+
+	   Returns the number of items added to target.
+
+	   ListT must be compatible with std::list<std::string>.
+	*/
+	template <typename ListT>
+	size_t extensionsForMimeType( const MimeType & key, ListT & target ) const
+	{
+		MimeToFilesMap::const_iterator it = mimeToFilesMap().lower_bound( key ),
+			et = mimeToFilesMap().upper_bound( key );
+		size_t count = 0;
+		for( ; et != it; ++it )
+		{
+			++count;
+			target.push_back( (*it).second );
+		}
+		return count;
+	}
+
+	/**
+	   UNTESTED.
+
+	   For each mime type associated with the given extension, the mime type is
+	   push_back()'d to target.
+
+	   Returns the number of items added to target.
+
+	   ListT must be compatible with std::list<MimeType>.
+	*/
+	template <typename ListT>
+	size_t mimeTypesForExtension( const std::string & ext, ListT & target ) const
+	{
+		FileToMimesMap::const_iterator it = fileToMimesMap().lower_bound( ext ),
+			et = mimeToFilesMap().upper_bound( ext );
+		size_t count = 0;
+		for( ; et != it; ++it )
+		{
+			++count;
+			target.push_back( (*it).second );
+		}
+		return count;
+	}
+
+	/**
 	   An iterator to the first string-to-mime map entry.
 	*/
 	inline const_iterator begin() const
@@ -201,6 +251,20 @@
 	const FileToMimesMap & fileToMimesMap() const
 	{ return this->m_rexts; }
 
+	/**
+	   Writes the current database state to the given ostream,
+	   using the conventional mime.types db format.
+	*/
+	void writeDatabase( std::ostream & );
+
+	/**
+	   Parses in a mime.types-format file from the given stream.
+	   Returns the number of mime type entries parsed from the
+	   stream.
+	*/
+	size_t readDatabase( std::istream & );
+
+	void clear();
 
   private:
 	MimeTypeMap m_types;

[pclasses-cvs] pclasses2/src/System Mime.cpp,1.6,1.7

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

Update of /cvsroot/pclasses/pclasses2/src/System
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31114/src/System

Modified Files:
	Mime.cpp 
Log Message:
added readDatabase(istream) and writeDatabase(ostream).

Index: Mime.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/System/Mime.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Mime.cpp	24 Dec 2004 15:13:35 -0000	1.6
+++ Mime.cpp	24 Dec 2004 16:23:24 -0000	1.7
@@ -166,6 +166,7 @@
 
 bool MimeTypeDb::add(const MimeType& mtype)
 {
+	if( mtype.mimeType().empty() ) return false;
 	if( this->typeMap().end() != this->typeMap().find( mtype.mimeType() ) )
 	{
 		return false;
@@ -208,17 +209,43 @@
 	return pf.find( "mime" );
 }
 
+/**
+   Internal helper: loads system-wide mime.types file for
+   MimeTypeDb::instance().
+*/
 size_t readSystemMimeTypes( const std::string & dbfile, MimeTypeDb & db )
 {
-	size_t count = 0;
-
 	if( dbfile.empty() )
 	{
 		CERR << "WARNING: Could not find mime.types database!\n";
-		return count;
+		return 0;
 	}
 	// CERR << "Mime db file=["<<dbfile<<"]\n";
 	std::ifstream strm(dbfile.c_str());
+	if( ! strm.good() ) return 0;
+
+	size_t count = 0;
+	{ // i'm such an asshole ;)
+		MimeType s11n("application/x-s11n");
+		db.add( s11n );
+		db.mapExtension( s11n, "s11n" );
+		++count;
+	}
+
+	return count + db.readDatabase( strm );
+}
+
+void
+MimeTypeDb::clear()
+{
+	this->m_types.clear();
+	this->m_exts.clear();
+	this->m_rexts.clear();
+}
+
+size_t
+MimeTypeDb::readDatabase( std::istream & strm )
+{
 	std::string line;
 	std::string::size_type pos;
 	std::string ext;
@@ -226,6 +253,7 @@
 	std::string strMediaType;
 	std::string strSubType;
 	MimeType mimet;
+	size_t count = 0;
 	while(!strm.eof())
 	{
 		getline(strm, line);
@@ -246,7 +274,7 @@
 			: line.substr(pos+1,(line.size()-pos));
   		///CERR << "media=["<<strMediaType<<"]\t subtype=["<<strSubType<<"]\t" << "rest=["<<rest<<"]\n";
 		mimet = MimeType(strMediaType, strSubType);
- 		db.add(mimet);
+ 		this->add(mimet);
 		++count;
 		if( rest.empty() )
 		{
@@ -260,14 +288,44 @@
 			if( ! ext.empty() && ext[0] != '#' )
 			{
 				++pos;
-				db.mapExtension( mimet, ext );
+				this->mapExtension( mimet, ext );
 			}
 			ext = "";
 		}
 		//CERR << "Mapped "<<pos<<" file extensions for "<<strMediaType<<"/" << strSubType<<"\n";
 	}
 	return count;
-	
+
+}
+
+void
+MimeTypeDb::writeDatabase( std::ostream & os )
+{
+	os << "# mime.types db written by MimeTypeDb\n";
+
+
+	const MimeTypeMap & mimes = this->typeMap();
+	const MimeToFilesMap & m2f = this->mimeToFilesMap();
+	MimeTypeMap::const_iterator it = mimes.begin(),
+		et = mimes.end();
+	MimeToFilesMap::const_iterator fit, fet;
+	MimeType mimet;
+	for( ; et != it; it++ )
+	{
+		mimet = (*it).second;
+		os << mimet.mimeType();
+		fit = m2f.lower_bound( mimet );
+		fet = m2f.upper_bound( mimet );
+		if( fet != fit )
+		{
+			os << "\t\t\t";
+			for( ; fet != fit; fit++ )
+			{
+				os << " " << (*fit).second;
+			}
+		}
+		os << "\n";
+	}
 }
 
 void

[pclasses-cvs] pclasses2/src/System testMime.cpp,1.2,1.3

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

Update of /cvsroot/pclasses/pclasses2/src/System
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18070

Modified Files:
	testMime.cpp 
Log Message:
appears to work (again)

Index: testMime.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/System/testMime.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- testMime.cpp	24 Dec 2004 12:44:02 -0000	1.2
+++ testMime.cpp	24 Dec 2004 15:14:18 -0000	1.3
@@ -1,4 +1,3 @@
-
 #include "pclasses/System/Mime.h"
 #include "pclasses/pclasses-config.h"
 #include <stdlib.h> // getenv()
@@ -26,22 +25,40 @@
 
 	MimeTypeDb & db = MimeTypeDb::instance();
 
-	MimeTypeDb::const_iterator it = db.begin(),
-		et = db.end();
-	typedef MimeTypeDb::FileExtensionsMap FMap;
+	MimeTypeDb::const_iterator it, et;
+	CERR << "MimeTypeDb entries== "<<db.typeMap().size()<<" mime types, " << db.mimeToFilesMap().size() << " mimes-to-ext entries.\n";
+	it = db.begin();
+	et = db.end();
+	typedef MimeTypeDb::MimeToFilesMap FMap;
 	FMap::const_iterator fit, fet;
 	MimeType mimet;
 	for( ; et != it; it++ )
 	{
 		mimet = (*it).second;
 		CERR << "Mime type: " << mimet.mimeType() << "\n";
-		fit = db.extensionsMap().lower_bound( mimet );
-		fet = db.extensionsMap().upper_bound( mimet );
- 		for( ; fet != fit; fit++ )
+		fit = db.mimeToFilesMap().lower_bound( mimet );
+		fet = db.mimeToFilesMap().upper_bound( mimet );
+		if( fet == fit )
+		{
+			CERR << "\t No associated file extensions.\n";
+		}
+ 		else for( ; fet != fit; fit++ )
  		{
  			CERR << "\t extension: " << (*fit).second << "\n";
  		}
 	}
 
+	if( 0 )
+	{
+		CERR << "mime-to-files map:\n";
+		fit = db.mimeToFilesMap().begin();
+		fet = db.mimeToFilesMap().end();
+		for( ; fet != fit; fit++ )
+		{
+			CERR <<(*fit).first.mimeType()<< " ==> extension: " << (*fit).second << "\n";
+		}
+	}
+
+
 	return 0;
 }

[pclasses-cvs] pclasses2/include/pclasses SharingContext.h,NONE,1.1

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

Update of /cvsroot/pclasses/pclasses2/include/pclasses
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18001

Added Files:
	SharingContext.h 
Log Message:
added MimeContext

--- NEW FILE: SharingContext.h ---
#ifndef Sharing_SHARING_HPP_INCLUDED
#define Sharing_SHARING_HPP_INCLUDED 1

namespace P
{
/**
   Namespace Sharing holds internal "sharing context" marker
   classes.
*/
namespace Sharing {

	/** Internal marker class. */
	struct SystemContext {};
	/** Internal marker class. */
	struct UnicodeContext {};
	/** Internal marker class. */
	struct FactoryContext {};
	/** Internal marker class. */
	struct CoreContext {};
	/** Internal marker class. */
	struct IOContext {};
	/** Internal marker class. */
	struct NetContext {};
	/** Internal marker class. */
	struct CryptoContext {};
	/** Internal marker class. */
	struct MimeContext {};

} } // namespace P::Sharing


#endif // Sharing_SHARING_HPP_INCLUDED

[pclasses-cvs] pclasses2/src/System Mime.cpp,1.5,1.6

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

Update of /cvsroot/pclasses/pclasses2/src/System
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17916/src/System

Modified Files:
	Mime.cpp 
Log Message:
major reworks

Index: Mime.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/System/Mime.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Mime.cpp	24 Dec 2004 12:44:02 -0000	1.5
+++ Mime.cpp	24 Dec 2004 15:13:35 -0000	1.6
@@ -36,6 +36,51 @@
 
 using namespace std;
 
+/**
+   Internal helper. Parses type/subtype from instr. Returns true on
+   success, false on error.
+
+   The output goes to the media and subtype strings.
+
+   This function ignores anything following a space after the subtype
+   name, so it may be used to parse, e.g., mime.types data without
+   worrying about any trailing file extensions data.
+
+   TODO: add a third (string &) to capture (optional) file extensions
+   data.
+*/
+bool parseMimeType( const std::string instr,
+		    std::string & media,
+		    std::string & subtype )
+{
+	std::string::size_type slashat = instr.find("/");
+	if( std::string::npos == slashat ||
+	    (instr.size()-1) == slashat) // trailing slash
+	{
+		CERR << "parseMimeType(["<<instr<<"]) failed\n";
+		return false;
+	}
+	media = instr.substr(0,slashat);
+	std::string::size_type spat = instr.find_first_of(" \t", slashat );
+	if( std::string::npos == spat )
+	{
+		subtype = instr.substr(slashat+1);
+	}
+	else
+	{
+		subtype = instr.substr(slashat+1,spat-slashat-1);
+	}
+
+	//CERR << "parseMimeType(["<<instr<<"]) == ["<<media<<"]/["<<subtype<<"]\n";
+	return true;
+}
+
+MimeType::MimeType( const std::string & media_subtype )
+: m_mediaType(), m_subType()
+{
+	parseMimeType( media_subtype, m_mediaType, m_subType );
+}
+
 MimeType::MimeType(const string& mediaType, const string& subType)
 : m_mediaType(mediaType), m_subType(subType)
 {
@@ -81,6 +126,7 @@
 {
   m_types.clear();
   m_exts.clear();
+  m_rexts.clear();
 }
 
 
@@ -91,78 +137,64 @@
 }
 
 
-MimeType* MimeTypeDb::findByMimeType(const string& mimeTypeName) const
+const MimeType *
+MimeTypeDb::findByMimeType(const string& mimeTypeName) const
 {
   typedef MimeTypeMap::const_iterator MI;
-
-  std::string::size_type slashat = mimeTypeName.find("/");
-  if( std::string::npos == slashat ||
-      (mimeTypeName.size()-1) == slashat) // trailing slash
-  {
-	  return 0;
-  }
-
-  string strMediaType = mimeTypeName.substr(0,slashat);
-  string strSubType = mimeTypeName.substr(slashat+1);
-
-  const MimeType* type = 0;
-  pair<MI,MI> i = m_types.equal_range(strMediaType);
-  while(1)
+  const MimeType * m = 0;
+  MI it = this->typeMap().find(mimeTypeName);
+  if( this->typeMap().end() == it )
   {
-    type = &(*i.first).second;
-    if(type->subType() == strSubType)
-      return const_cast<MimeType*>(type);
-    if(i.first == i.second)
-      break;
-    ++i.first;
+	  return m;
   }
-  return 0;
+  m = &((*it).second);
+  return m;
 }
 
-MimeType* MimeTypeDb::findByFileExt(const string& fileExt) const
+const MimeType * MimeTypeDb::findByFileExt(const string& fileExt) const
 {
- 	CERR << "findByFileExt() not yet implemented.\n";
 	return 0;
-//   const MimeType* type = 0;
-//   MimeTypeMap::const_iterator i = m_types.begin();
-
-//   while(i != m_types.end())
-//   {
-//     type = &i->second;
-
-//     const MimeType::FileExtVector& fileExts = type->fileExts();
-
-//     if(find(fileExts.begin(), fileExts.end(), fileExt) != fileExts.end())
-//       return const_cast<MimeType*>(type);
-
-//     ++i;
-//   }
-
-//   return 0;
+	const MimeType* m = 0;
+  	FileToMimesMap::const_iterator it = this->m_rexts.lower_bound( fileExt );
+	if( it == this->m_rexts.end() )
+	{
+		return m;
+	}
+	m = &((*it).second);
+	return m;
 }
 
-bool MimeTypeDb::add(const MimeType& type)
+bool MimeTypeDb::add(const MimeType& mtype)
 {
-  if(findByMimeType(type.mimeType()))
-    return false;
-
-  insert(type);
-  return true;
+	if( this->typeMap().end() != this->typeMap().find( mtype.mimeType() ) )
+	{
+		return false;
+	}
+	// CERR << "Adding mime type ["<<mtype.mimeType()<<"]\n";
+	this->insert(mtype);
+	return true;
 }
+	
+void MimeTypeDb::mapExtension(const MimeType& mimet, const std::string & file_ext )
+{
+	// CERR << "mapping extension ["<<file_ext<<"] \t==>\t[" << mimet.mimeType()<<"]\n";
 
-void MimeTypeDb::insert(const MimeType& type)
+	//CERR << "add("<<mimet.mimeType()<<", ["<<file_ext<<"])\n";
+// 	this->add( mimet );
+	// @fixme: don't re-insert existing extension entries:
+	this->m_exts.insert( make_pair( mimet, file_ext ) );
+	this->m_rexts.insert( make_pair( file_ext, mimet ) );
+}
+void MimeTypeDb::insert(const MimeType& mimet)
 {
-  m_types.insert(make_pair(type.mediaType(), type));
+	m_types.insert(make_pair(mimet.mimeType(), mimet));
 }
 
-#ifndef CERR
-#define CERR std::cerr << __FILE__ << ":" << std::dec << __LINE__ << " : "
-#endif
-
 std::string findSystemMimeTypeFile()
 {
 	::P::System::PathFinder pf;
 #ifndef WIN32
+	pf.addPath( "." );
 	pf.addPath( PCLASSES_SHARED_DATA_DIR );
 	pf.addPath( "/etc" );
 	pf.addPath( "/etc/apache2/conf" );
@@ -176,20 +208,19 @@
 	return pf.find( "mime" );
 }
 
-void readSystemMimeTypes( MimeTypeDb & db )
+size_t readSystemMimeTypes( const std::string & dbfile, MimeTypeDb & db )
 {
+	size_t count = 0;
 
-	std::string mf = findSystemMimeTypeFile();
-
-	if( mf.empty() )
+	if( dbfile.empty() )
 	{
 		CERR << "WARNING: Could not find mime.types database!\n";
-		return;
+		return count;
 	}
-
-	std::ifstream strm(mf.c_str());
+	// CERR << "Mime db file=["<<dbfile<<"]\n";
+	std::ifstream strm(dbfile.c_str());
 	std::string line;
-	std::string::size_type p1, p2;
+	std::string::size_type pos;
 	std::string ext;
 	std::string rest;
 	std::string strMediaType;
@@ -202,38 +233,40 @@
 		{
 			continue;
 		}
-		p1 = line.find("/");
-		p2 = line.find_first_of( " \t", p1+1 );
-		// line.find_first_not_of( "abcdefghijklmnopqrstuvqxyz-ABCDEFGHIJKLMNOPQRSTUVQXYZ0123456789", p1+1 );
-		// ^^^ find_first_of( " \t", p1+1 ) is giving me until line.end()!
-		if( std::string::npos == p1
-		    || std::string::npos == p2 )
+		
+		strMediaType = strSubType = "";
+		if( ! parseMimeType( line, strMediaType, strSubType ) )
 		{
 			continue;
 		}
 
-		strMediaType = line.substr(0,p1);
-		strSubType = line.substr(p1+1,p2-(p1+1));
-		rest = line.substr(p2+1,(line.size()-p2));
-//  		CERR << "media=["<<strMediaType<<"]\t subtype=["<<strSubType<<"]\t"
-//  		     << "rest=["<<rest<<"]\n";
+		pos = line.find_first_of( " \t" );
+		rest = (std::string::npos == pos)
+			? ""
+			: line.substr(pos+1,(line.size()-pos));
+  		///CERR << "media=["<<strMediaType<<"]\t subtype=["<<strSubType<<"]\t" << "rest=["<<rest<<"]\n";
 		mimet = MimeType(strMediaType, strSubType);
-		db.typeMap().insert(make_pair(strMediaType, mimet ) );
-
+ 		db.add(mimet);
+		++count;
+		if( rest.empty() )
+		{
+			continue;
+		}
 		std::istringstream istr(rest.c_str());
-		p1 = 0;
+		pos = 0;
 		while( ! istr.eof() )
 		{
 			istr >> ext;
 			if( ! ext.empty() && ext[0] != '#' )
 			{
-				++p1;
-				db.extensionsMap().insert(make_pair(mimet, ext ) );
+				++pos;
+				db.mapExtension( mimet, ext );
 			}
 			ext = "";
 		}
-		// CERR << "Mapped "<<p1<<" file extensions for "<<strMediaType<<" / " << strSubType<<"\n";
+		//CERR << "Mapped "<<pos<<" file extensions for "<<strMediaType<<"/" << strSubType<<"\n";
 	}
+	return count;
 	
 }
 
@@ -242,7 +275,12 @@
 {
 	if( db.end() == db.begin() )
 	{
-		readSystemMimeTypes(db);
+		std::string mf = findSystemMimeTypeFile();
+		if( ! mf.empty() )
+		{
+			size_t c = readSystemMimeTypes(mf,db);
+			CERR << "Read " << c << " entries from ["<<mf<<"]\n";
+		}
 	}
 }
 

[pclasses-cvs] pclasses2/include/pclasses/System Mime.h,1.4,1.5

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

Update of /cvsroot/pclasses/pclasses2/include/pclasses/System
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17916/include/pclasses/System

Modified Files:
	Mime.h 
Log Message:
major reworks

Index: Mime.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/System/Mime.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Mime.h	24 Dec 2004 04:06:27 -0000	1.4
+++ Mime.h	24 Dec 2004 15:13:34 -0000	1.5
@@ -47,7 +47,13 @@
 	  \param subType MIME sub type
 	  \param fileExts vector of associated file extensions
 	*/
-	MimeType(const std::string& mediaType, const std::string& subType );
+	MimeType(const std::string & mediaType, const std::string& subType );
+
+	/**
+	   If media_subtype is not a valid media/subtype string
+	   then this function is equivalent to the default ctor.
+	*/
+	explicit MimeType( const std::string & media_subtype );
              
 	~MimeType();
 
@@ -93,47 +99,114 @@
 class /* PIO_EXPORT */ MimeTypeDb
 {
   public:
-	typedef std::multimap< std::string, MimeType > MimeTypeMap;
+	/**
+	   Map of "media/sybtype" strings to MimeType.
+	*/
+	typedef std::map< std::string, MimeType > MimeTypeMap;
 	typedef MimeTypeMap::const_iterator const_iterator;
 
-	typedef std::multimap< MimeType, std::string > FileExtensionsMap;
   
 	/**
 	   Add MIME type to database. Does not re-insert if type is
 	   already in the db.
+
 	*/
 	bool add(const MimeType& type);
+
+	/**
+	   Maps the given MimeType to the given file extension.
+
+	   This function does not call add(type), though it arguably
+	   should.
+
+	   @fixme: should not re-insert existing file extension mappings
+	   into mimeToFilesMap().
+	*/
+	void mapExtension(const MimeType& type, const std::string & file_ext );
     
-	//! Find MIME type by full name
-	MimeType* findByMimeType(const std::string& mimeType) const;
+	/**
+	   Find MIME type by "media/subtype" string.
 
-	//! Find MIME type by file extension
-	MimeType* findByFileExt(const std::string& fileExt) const;
+	   Returns 0 if none is mapped.
+
+	*/
+	const MimeType * findByMimeType(const std::string& mimeType) const;
+
+	/**
+	   Find MIME type by file extension.
+
+	   Returns 0 if none is mapped.
+
+	   Achtung: it returns only the first of possibly multiple
+	   matches.
+	*/
+	const MimeType * findByFileExt(const std::string& fileExt) const;
 
+	/**
+	   An iterator to the first string-to-mime map entry.
+	*/
 	inline const_iterator begin() const
 	{ return m_types.begin(); }
 
+	/**
+	   An iterator to the after-the-end string-to-mime map entry.
+	*/
 	inline const_iterator end() const
 	{ return m_types.end(); }
 
-	FileExtensionsMap & extensionsMap()
-	{ return this->m_exts; }
-
-	const FileExtensionsMap & extensionsMap() const
-	{ return this->m_exts; }
 
 	MimeTypeDb();
 	~MimeTypeDb();
 
+	/**
+	   Returns the string-to-Mime map.
+	*/
 	MimeTypeMap & typeMap()
 	{ return this->m_types; }
 
+	/**
+	   Returns the string-to-Mime map.
+	*/
 	const MimeTypeMap & typeMap() const
 	{ return this->m_types; }
 
+	/**
+	   Returns a shared instance of this object.
+	   This instance reads mime types data
+	   from a platform-specific database,
+	   e.g. /etc/mime.types.
+	*/
 	static MimeTypeDb & instance();
 
+	/**
+	   Map of MimeType to file extensions (strings).
+	*/
+	typedef std::multimap< MimeType, std::string > MimeToFilesMap;
+
+ 	/**
+ 	   Returns the Mime-to-File extensions map.
+ 	*/
+ 	const MimeToFilesMap & mimeToFilesMap() const
+ 	{ return this->m_exts; }
+
+	/**
+	   A reverse mapping of MimeToFilesMap, to ease some
+	   implementation code.
+	*/
+	typedef std::multimap< std::string, MimeType > FileToMimesMap;
+
+	/**
+	   Returns the File extension-to-Mime map.
+	*/
+	const FileToMimesMap & fileToMimesMap() const
+	{ return this->m_rexts; }
+
+
   private:
+	MimeTypeMap m_types;
+	MimeToFilesMap m_exts;
+ 	FileToMimesMap m_rexts;
+
 	/** For use with P::Phoenix. */
 	struct init_functor
 	{
@@ -146,10 +219,22 @@
 	};
 	/** Like add(), but this inserts regardless of duplication. */
 	void insert(const MimeType& type);
-	MimeTypeMap m_types;
-	FileExtensionsMap m_exts;
 };
 
 } } // P::System
 
+#include "pclasses/Factory.h"
+#include "pclasses/SharingContext.h"
+namespace P { 
+
+namespace System
+{
+	template <typename InterfaceT>
+	class MimeHandlerFactory : public ::P::Factory< InterfaceT, MimeType,::P::Sharing::MimeContext >
+	{
+
+	};
+
+} } // P::System
+
 #endif

[pclasses-cvs] pclasses2/include/pclasses Factory.h,1.5,1.6

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

Update of /cvsroot/pclasses/pclasses2/include/pclasses
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26242

Modified Files:
	Factory.h 
Log Message:
Moved Sharing namespace into SharingContext.h, for documentation and dependencies reasons.


Index: Factory.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Factory.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Factory.h	24 Dec 2004 01:01:38 -0000	1.5
+++ Factory.h	24 Dec 2004 13:10:54 -0000	1.6
@@ -9,21 +9,13 @@
 #include <functional>
 
 #include <pclasses/Phoenix.h> // i don't like this dep, but i also don't like
+#include <pclasses/SharingContext.h>
 // what happens in some cases when i don't use
 // phoenix. :/
 
 namespace P
 {
 	
-	/**
-	   Namespace Sharing holds internal "sharing context" marker
-	   classes.
-	*/
-	namespace Sharing
-	{
-		/** Internal marker class. */
-		struct FactoryContext {};
-	}
 
 	/**
 	   The Hook namespace holds classes intended to be used to

[pclasses-cvs] pclasses2/m4 Makefile.toc,1.2,1.3

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

Update of /cvsroot/pclasses/pclasses2/m4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22442

Modified Files:
	Makefile.toc 
Log Message:
backrevved to 1.1. Ver 1.2 should never have happened.

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/m4/Makefile.toc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.toc	24 Dec 2004 12:44:01 -0000	1.2
+++ Makefile.toc	24 Dec 2004 12:49:17 -0000	1.3
@@ -1,14 +1,15 @@
-#!/usr/bin/make -f
+#!/usr/bin/make
 ###################################################
 # AUTO-GENERATED guess at a toc-aware Makefile,
 # based off of the contents of directory:
-#   ./m4
+#   ./src
 # Created by ./toc/bin/create_makefile_stubs.sh
-# Thu Dec 23 01:31:56 CET 2004
+# Wed Dec 22 23:10:45 CET 2004
 # It must be tweaked to suit your needs.
 ###################################################
 include toc.make
-############## FLEXES:
+
+DIST_FILES += $(wildcard *.m4 *.am)
 all:
 ###################################################
 # end auto-generated rules

[pclasses-cvs] pclasses2/m4 Makefile.toc,1.1,1.2

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

Update of /cvsroot/pclasses/pclasses2/m4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438/m4

Modified Files:
	Makefile.toc 
Log Message:
mass commit: toc-related fixes/changes

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/m4/Makefile.toc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.toc	23 Dec 2004 00:32:03 -0000	1.1
+++ Makefile.toc	24 Dec 2004 12:44:01 -0000	1.2
@@ -1,15 +1,14 @@
-#!/usr/bin/make
+#!/usr/bin/make -f
 ###################################################
 # AUTO-GENERATED guess at a toc-aware Makefile,
 # based off of the contents of directory:
-#   ./src
+#   ./m4
 # Created by ./toc/bin/create_makefile_stubs.sh
-# Wed Dec 22 23:10:45 CET 2004
+# Thu Dec 23 01:31:56 CET 2004
 # It must be tweaked to suit your needs.
 ###################################################
 include toc.make
-
-DIST_FILES += $(wildcard *.m4 *.am)
+############## FLEXES:
 all:
 ###################################################
 # end auto-generated rules

[pclasses-cvs] pclasses2 configure.pclasses2,1.5,1.6 configure.toc,1.2,1.3 toc.pclasses2.help,1.1,1.2 toc.pclasses2.make.at,1.2,1.3

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

Update of /cvsroot/pclasses/pclasses2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438

Modified Files:
	configure.pclasses2 configure.toc toc.pclasses2.help 
	toc.pclasses2.make.at 
Log Message:
mass commit: toc-related fixes/changes

Index: toc.pclasses2.make.at
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/toc.pclasses2.make.at,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- toc.pclasses2.make.at	24 Dec 2004 10:58:46 -0000	1.2
+++ toc.pclasses2.make.at	24 Dec 2004 12:44:00 -0000	1.3
@@ -5,7 +5,9 @@
 
 # CXXFLAGS += -fPIC
 
+ifneq (,$(wildcard Makefile.am))
 DIST_FILES += Makefile.am
+endif
 
 INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/pclasses
 

Index: configure.pclasses2
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/configure.pclasses2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.pclasses2	23 Dec 2004 21:08:53 -0000	1.5
+++ configure.pclasses2	24 Dec 2004 12:44:00 -0000	1.6
@@ -31,9 +31,18 @@
 
 ############################################################
 # supplemental libs
-toc_test mysql_config
-toc_test pg_config
-# toc_test libexpat # && ldadd="${ldadd} -lexpat"
+if test x0 != "x${configure_with_mysql-1}"; then
+    toc_test mysql_config
+fi
+if test x0 != "x${configure_with_postgres-1}"; then
+    toc_test pg_config
+fi
+if test x0 != "x${configure_with_lyx-1}"; then
+    toc_find lyx "${configure_with_lyx%/*}:$PATH" \
+	&& toc_export LYX_BIN=${TOC_FIND_RESULT} # for (future) lib manual
+fi
+toc_test libs11n; toc_export PCLASSES_HAVE_S11N=${HAVE_LIBS11N}
+toc_test libexpat
 
 ########################################################################
 # pthreads kludge...
@@ -41,7 +50,7 @@
 toc_test gcc_try_compile ${TOC_HOME}/tests/c/check_for_pthread.c && {
     use_pthread=1
     THREADS_LDADD="-lpthread"
-    THREADS_INCLUDES="" # i hope it's in a system default path!
+    THREADS_CFLAGS="" # i hope it's in a system default path!
 }
 
 if test x0 = "x${pclasses2_HAVE_PTHREAD}" ; then
@@ -53,21 +62,7 @@
 
 
 ########################################################################
-{ # huge_kludges:
-cat <<EOF > /dev/null
-the following defs needs to be ported to toc:
-PTHREAD_CREATE_JOINABLE
-STDC_HEADERS
-WITH_STL
-WORDS_BIGENDIAN
-_FILE_OFFSET_BITS
-_LARGE_FILES
-_MINIX
-_POSIX_1_SOURCE
-_POSIX_SOURCE
-EOF
-
-
+# huge_kludges:
 ########################################################################
 # Force default config options until the config tests are all ported:
 # reminder: the following list only works with numeric defines, not
@@ -104,9 +99,9 @@
 HAVE_SYS_STAT_H=1
 HAVE_SYS_TYPES_H=1
 HAVE_UNISTD_H=1
-HAVE_ATALK=0
-HAVE_IPV6=0
-HAVE_IPX=0
+HAVE_ATALK=${configure_with_atalk-0}
+HAVE_IPV6=${configure_with_ipv6-0}
+HAVE_IPX=${configure_with_ipx-0}
 SIZEOF___INT64=64
 WITH_STL=${configure_with_stl-1}
 "
@@ -124,20 +119,28 @@
     done
     rm sizes
 
-} # /huge_kludges
+cat <<EOF > /dev/null
+the following defs needs to be ported to toc:
+PTHREAD_CREATE_JOINABLE
+STDC_HEADERS
+WITH_STL
+WORDS_BIGENDIAN
+_FILE_OFFSET_BITS
+_LARGE_FILES
+_MINIX
+_POSIX_1_SOURCE
+_POSIX_SOURCE
+EOF
+
+# /huge_kludges
 ########################################################################
 
-###### stuff:
-toc_find lyx ${configure_with_lyx%/*}:$PATH \
-    && toc_export LYX_BIN=${TOC_FIND_RESULT} # for (future) lib manual
 toc_export BUILD_USER="$USER"
 toc_export BUILD_HOST=$(hostname)
 toc_export PACKAGE_EMAIL_ADDRESS=pcl...@li...
 toc_export PACKAGE_URL=http://pclasses.com
 toc_export PACKAGE_LICENSE="GNU LGPL"
 
-CLIENT_LDADD="-L${prefix}/lib -lpclasses_core"
-CLIENT_INCLUDES="-I${prefix}/include"
 
 ########################################################################
 # removeDupes is a helper app to remove duplicate entries from linker/
@@ -152,50 +155,50 @@
 #                  LIBPxxx_NAME
 #   LIBPxxx_CLIENT_LDADD = linker args for clients of LIBPxxx_NAME.
 ########################################################################
+toc_export LIBPCORE_NAME=libpclasses_core
+toc_export LIBPCORE_LDADD="-l${LIBCORE_NAME}"
+toc_export LIBPCORE_CLIENT_LDADD="${ldadd}"
+toc_export LIBPCORE_CFLAGS="${inc}"
+
 toc_export LIBPNET_NAME=libpclasses_net
-toc_export LIBPNET_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPNET_CLIENT_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPNET_INCLUDES="$(${removeDupes} ${inc})"
+toc_export LIBPNET_LDADD="-l${LIBPNET_NAME}"
+toc_export LIBPNET_CLIENT_LDADD="${ldadd}"
+toc_export LIBPNET_CFLAGS="${inc}"
 
 toc_export LIBPIO_NAME=libpclasses_io
-toc_export LIBPIO_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPIO_CLIENT_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPIO_INCLUDES="$(${removeDupes} ${inc})"
+toc_export LIBPIO_LDADD="-l${LIBPIO_NAME}"
+toc_export LIBPIO_CLIENT_LDADD="${ldadd}"
+toc_export LIBPIO_CFLAGS="${inc}"
 
 toc_export LIBPUNICODE_NAME=libpclasses_unicode
-toc_export LIBPUNICODE_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPUNICODE_CLIENT_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPUNICODE_INCLUDES="$(${removeDupes} ${inc})"
-
-toc_export LIBPCORE_NAME=libpclasses_core
-toc_export LIBPCORE_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPCORE_CLIENT_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPCORE_INCLUDES="$(${removeDupes} ${inc})"
+toc_export LIBPUNICODE_LDADD="-l${LIBPUNICODE_NAME}"
+toc_export LIBPUNICODE_CLIENT_LDADD="${ldadd}"
+toc_export LIBPUNICODE_CFLAGS="${inc}"
 
 toc_export LIBPSYSTEM_NAME=libpclasses_system
-toc_export LIBPSYSTEM_LDADD="$(${removeDupes} ${THREADS_INCLUDES})"
-toc_export LIBPSYSTEM_CLIENT_LDADD="$(${removeDupes} ${THREADS_INCLUDES})"
-toc_export LIBPSYSTEM_INCLUDES="$(${removeDupes} ${THREADS_INCLUDES})"
+toc_export LIBPSYSTEM_LDADD="-l${LIBPSYSTEM_NAME}"
+toc_export LIBPSYSTEM_CLIENT_LDADD="${THREADS_CFLAGS}"
+toc_export LIBPSYSTEM_CFLAGS="${THREADS_CFLAGS}"
 
 toc_export LIBPUTIL_NAME=libpclasses_util
-toc_export LIBPUTIL_LDADD="$(${removeDupes} ${THREADS_LDADD})"
-toc_export LIBPUTIL_CLIENT_LDADD="$(${removeDupes} ${THREADS_LDADD})"
-toc_export LIBPUTIL_INCLUDES="$(${removeDupes} ${THREADS_INCLUDES})"
+toc_export LIBPUTIL_LDADD="-l${LIBPUTIL_NAME_LDADD}"
+toc_export LIBPUTIL_CLIENT_LDADD="${THREADS_LDADD}"
+toc_export LIBPUTIL_CFLAGS="${THREADS_CFLAGS}"
 
 ########################################################################
 # Enable mysql driver...
 if test -x "${MYSQL_CONFIG_BIN}"; then
     toc_export LIBPSQL_HAVE_MYSQL=1
-    toc_export LIBPSQL_MYSQL_LDADD="$(${removeDupes} ${ldadd} ${MYSQL_LIBS})"
-    toc_export LIBPSQL_MYSQL_INCLUDES="$(${removeDupes} ${inc} ${MYSQL_INCLUDES})"
+    toc_export LIBPSQL_MYSQL_LDADD="${ldadd} ${MYSQL_LIBS}"
+    toc_export LIBPSQL_MYSQL_CFLAGS="${inc} ${MYSQL_INCLUDES}"
 fi
 
 ########################################################################
-# Enable postgress driver...
+# Enable postgres driver...
 if test -x "${POSTGRES_CONFIG_BIN}"; then
     toc_export LIBPSQL_HAVE_POSTGRES=1
-    toc_export LIBPSQL_POSTSQL_LDADD="$(${removeDupes} ${ldadd} ${POSTGRES_LIBS})"
-    toc_export LIBPSQL_POSTSQL_INCLUDES="$(${removeDupes} ${inc} ${POSTGRES_INCLUDES})"
+    toc_export LIBPSQL_POSTSQL_LDADD="${ldadd} ${POSTGRES_LIBS}"
+    toc_export LIBPSQL_POSTSQL_CFLAGS="${inc} ${POSTGRES_INCLUDES}"
 fi
 
 
@@ -206,6 +209,10 @@
 # now exporting our files...
 ########################################################################
 
+toc_test_require atfilter_file \
+    include/pclasses/pclasses-config.h.at \
+    include/pclasses/pclasses-config.h
+
 ########################################################################
 toc_boldecho "======================= Creating Makefiles..."
 make_out=${PWD}/.toc.Makefile
@@ -220,11 +227,10 @@
 	DIST_FILES := \$(filter-out Makefile,\$(DIST_FILES))
 	# ^^^^ toc automatically adds Makefile to DIST_FILES.
 	DISTCLEAN_FILES += Makefile
-	# ^^^^ todo
 EOF
 } > $make_out
-
-#### Make Makefiles
+########################################################################
+# Make Makefiles
 for m in $(find . -type f -name Makefile.toc | sort); do
     nm=${m%%.toc}
     echo -en "\t\t$nm ... "
@@ -239,11 +245,10 @@
 toc_boldecho "======================= ${TOC_EMOTICON_OKAY} Created Makefiles."
 ########################################################################
 
-toc_test_require atfilter_file \
-    include/pclasses/pclasses-config.h.at \
-    include/pclasses/pclasses-config.h
-
-##### close the config-filtered files:
+##### Create toc.make and end config process... this must come last.
 toc_test_require toc_project_makefile
-# ^^^^ this must come last.
-return 0
+########################################################################
+# The end. Nothing past here, please. If you do that then this text,
+# by definition, would not longer be The End, and would therefor the
+# statement "The End" would be technically inaccurate ;).
+########################################################################

Index: configure.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/configure.toc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.toc	22 Dec 2004 22:19:15 -0000	1.2
+++ configure.toc	24 Dec 2004 12:44:00 -0000	1.3
@@ -4,7 +4,7 @@
 . ./find_toc.sh || exit
 
 export PACKAGE_NAME=pclasses2
-export PACKAGE_VERSION=2004.12.x
+export PACKAGE_VERSION=2.0.dev
 
 # Kludge to allow toc and autotools to coexist...
 TOC_CONFIGURE_SCRIPT=${PWD}/configure.toc

Index: toc.pclasses2.help
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/toc.pclasses2.help,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- toc.pclasses2.help	24 Dec 2004 10:57:11 -0000	1.1
+++ toc.pclasses2.help	24 Dec 2004 12:44:00 -0000	1.2
@@ -1,10 +1,39 @@
-(Reminder: not all of the following options actually work yet!)
+************************************************************************
+ACHTUNG: Options below marked with a * do not completely work yet.
+************************************************************************
 
---without-stl : disable STL support. Might or might not result in a buildable tree.
+Compatibility options:
 
---with-atalk  : enable AppleTalk protocol support.
+*	--without-stl
+		Disable STL support. Might or might not result in a
+		buildable tree.
 
---with-ipx    : enable IPX protocol.
+	--without-s11n
+		Disable the check for libs11n (1.0.x).
 
---with-ipv6   : enable IPV6.
+Networking options:
+*	--with-atalk
+		Enable AppleTalk protocol support.
+
+*	--with-ipx
+		Enable IPX protocol.
+
+*	--with-ipv6
+		Enable IPV6.
+
+	--without-mysql
+		Disables test for MySQL.
+
+	--without-postgres
+		Disables test for Postgres.
+
+*	--without-oci8
+		Enables test for Oracle OCI.
+
+Docs options:
+	--with-lyx=/path/to/lyx 
+		Set path to lyx binary.
+
+	--without-lyx
+		Explicitely disable lyx support.
 

[pclasses-cvs] pclasses2/src Makefile.toc,1.5,1.6

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

Update of /cvsroot/pclasses/pclasses2/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438/src

Modified Files:
	Makefile.toc 
Log Message:
mass commit: toc-related fixes/changes

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/Makefile.toc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.toc	23 Dec 2004 06:24:54 -0000	1.5
+++ Makefile.toc	24 Dec 2004 12:44:01 -0000	1.6
@@ -18,7 +18,7 @@
 CLEAN_FILES += $(OBJECTS)
 
 build_libs = 1
-LIBNAME = libpcore
+LIBNAME = $(LIBPCORE_NAME)
 ifeq (1,$(build_libs))
   STATIC_LIBS = $(LIBNAME)
   SHARED_LIBS = $(STATIC_LIBS)

[pclasses-cvs] pclasses2/src/IO Makefile.toc,1.1,1.2

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

Update of /cvsroot/pclasses/pclasses2/src/IO
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438/src/IO

Modified Files:
	Makefile.toc 
Log Message:
mass commit: toc-related fixes/changes

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/IO/Makefile.toc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.toc	23 Dec 2004 05:55:10 -0000	1.1
+++ Makefile.toc	24 Dec 2004 12:44:01 -0000	1.2
@@ -12,7 +12,7 @@
 CLEAN_FILES += $(OBJECTS)
 
 build_libs = 1
-LIBNAME = libpio
+LIBNAME = $(LIBPIO_NAME)
 ifeq (1,$(build_libs))
   STATIC_LIBS = $(LIBNAME)
   SHARED_LIBS = $(STATIC_LIBS)

[pclasses-cvs] pclasses2/include Makefile.toc,1.1,1.2

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

Update of /cvsroot/pclasses/pclasses2/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438/include

Modified Files:
	Makefile.toc 
Log Message:
mass commit: toc-related fixes/changes

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/Makefile.toc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.toc	23 Dec 2004 00:18:59 -0000	1.1
+++ Makefile.toc	24 Dec 2004 12:44:00 -0000	1.2
@@ -1,22 +1,15 @@
+#!/usr/bin/make -f
 ###################################################
 # AUTO-GENERATED guess at a toc-aware Makefile,
 # based off of the contents of directory:
 #   ./include
 # Created by ./toc/bin/create_makefile_stubs.sh
-# Wed Dec 22 23:10:45 CET 2004
+# Thu Dec 23 01:31:56 CET 2004
 # It must be tweaked to suit your needs.
 ###################################################
 include toc.make
 SUBDIRS =  pclasses
-############## FLEXES:
-# WARNING: FLEXES stuff only works for C++-based flexers
-FLEXES = 
-FLEXES_ARGS = -+ -p
-OBJECTS += 
-include $(TOC_MAKESDIR)/flex.make
-# Run target FLEXES to process these.
-# REMINDER: add the generated C++ files to your SOURCES, if needed.
-############## /FLEXES
+
 all:
 ###################################################
 # end auto-generated rules

[pclasses-cvs] pclasses2/src/Net Makefile.toc,1.3,1.4

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

Update of /cvsroot/pclasses/pclasses2/src/Net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438/src/Net

Modified Files:
	Makefile.toc 
Log Message:
mass commit: toc-related fixes/changes

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/Net/Makefile.toc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.toc	23 Dec 2004 06:25:34 -0000	1.3
+++ Makefile.toc	24 Dec 2004 12:44:02 -0000	1.4
@@ -21,7 +21,7 @@
 CLEAN_FILES += $(OBJECTS)
 
 build_libs = 1
-LIBNAME = libpnet
+LIBNAME = $(LIBPNET_NAME)
 ifeq (1,$(build_libs))
   STATIC_LIBS = $(LIBNAME)
   SHARED_LIBS = $(LIBNAME)

[pclasses-cvs] pclasses2/include/pclasses Makefile.toc,1.3,1.4 pclasses-config.h.at,1.2,1.3

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

Update of /cvsroot/pclasses/pclasses2/include/pclasses
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438/include/pclasses

Modified Files:
	Makefile.toc pclasses-config.h.at 
Log Message:
mass commit: toc-related fixes/changes

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Makefile.toc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.toc	24 Dec 2004 04:52:03 -0000	1.3
+++ Makefile.toc	24 Dec 2004 12:44:01 -0000	1.4
@@ -5,40 +5,15 @@
 SUBDIRS = Unicode IO Net System Util
 
 
-HEADERS = Algorithm.h \
-	Alloc.h \
-	Atomic.h \
-	AtomicTraits.h \
-	BasicTypes.h \
-	ByteOrderTraits.h \
-	CircularQueue.h \
-	Exception.h \
-	Factory.h \
-	IntrusivePtr.h \
-	IntTypeLimits.h \
-	IntTypes.h \
-	IODevice.h \
-	LinkedItem.h \
-	List.h \
-	LockTraits.h \
-	NonCopyable.h \
-	Pair.h \
-	Phoenix.h \
-	Queue.h \
-	ScopedArrayPtr.h \
-	ScopedPtr.h \
-	SharedPtr.h \
-	SourceInfo.h \
-	Stack.h \
-	TypeTraits.h \
-	ValueType.h \
-	Vector.h
-
 CONF_H = pclasses-config.h
 CONF_H_IN = pclasses-config.h.at
+
+HEADERS = $(wildcard *.h)
+DIST_HEADERS = $(filter-out $(CONF_H),$(HEADERS))
+
 INSTALL_PACKAGE_HEADERS += $(HEADERS) $(CONF_H)
 
-DIST_FILES += $(HEADERS) $(CONF_H_IN)
+DIST_FILES += $(DIST_HEADERS) $(CONF_H_IN)
 DISTCLEAN_FILES += $(CONF_H)
 
 all: subdirs

Index: pclasses-config.h.at
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/pclasses-config.h.at,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pclasses-config.h.at	24 Dec 2004 01:45:02 -0000	1.2
+++ pclasses-config.h.at	24 Dec 2004 12:44:01 -0000	1.3
@@ -11,6 +11,7 @@
 
 #define PCLASSES_INSTALL_PREFIX "@prefix@"
 #define PCLASSES_LIB_DIR "@prefix@/lib"
+#define PCLASSES_SHARED_DATA_DIR "@prefix@/share/@PACKAGE_NAME@"
 #define PCLASSES_PLUGINS_DIR "@prefix@/lib/pclasses"
 
 #if @PCLASSES_HAVE_LARGEFILE@ == 0

[pclasses-cvs] pclasses2/toc/tests PACKAGE_NAME-config.at,1.1,1.2 libdl.sh,1.1,1.2 libltdl.sh,1.1,1.2 libs11n.sh,1.1,1.2

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

Update of /cvsroot/pclasses/pclasses2/toc/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438/toc/tests

Modified Files:
	PACKAGE_NAME-config.at libdl.sh libltdl.sh libs11n.sh 
Log Message:
mass commit: toc-related fixes/changes

Index: libdl.sh
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/toc/tests/libdl.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libdl.sh	22 Dec 2004 19:04:25 -0000	1.1
+++ libdl.sh	24 Dec 2004 12:44:04 -0000	1.2
@@ -1,32 +1,28 @@
 # toc_run_description = looking for libdl
 # toc_begin_help =
 #
-# Looks for libdl. It calls toc_export
-# for the following variables:
+# Looks for libdl. It exports the following config variables:
 #
 #	HAVE_LIBDL = 0 or 1
-#	LDADD_LIBDL = empty or "-ldl -rdynamic"
-#	LDADD_DL = empty or "-ldl -rdynamic", possibly with -L/path...
+#	HAVE_DLFCN_H = currently always the same as HAVE_LIBDL.
+#	LDADD_LIBDL = empty or "-ldl -rdynamic", possibly with -L/path...
+#	LDADD_DL = same as LDADD_LIBDL
 #
 # Note that LDADD_LIBDL is specific to the libdl test, whereas LDADD_DL is used
-# by both the libdl and libltdl tests.
+# by both the libdl and libltdl tests, and possibly other libdl-like tests.
 #
 # = toc_end_help
 
-toc_add_config HAVE_LIBDL=0
-toc_add_config LDADD_LIBDL=
-toc_export LDADD_DL=
-
 err=1
 
-toc_test gcc_build_and_run ${TOC_HOME}/tests/c/check_for_dlopen_and_friends.c -rdynamic -ldl && {
+if toc_test gcc_build_and_run \
+    ${TOC_HOME}/tests/c/check_for_dlopen_and_friends.c -rdynamic -ldl ; then
     err=0
     toc_export HAVE_LIBDL=1
+    toc_export HAVE_DLFCN_H=1
+    toc_export HAVE_DLOPEN=1
     toc_export LDADD_LIBDL="-ldl -rdynamic"
     toc_export LDADD_DL="${LDADD_LIBDL}"
-}
+fi
 
 return $err
-
-
-

Index: PACKAGE_NAME-config.at
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/toc/tests/PACKAGE_NAME-config.at,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PACKAGE_NAME-config.at	22 Dec 2004 19:04:25 -0000	1.1
+++ PACKAGE_NAME-config.at	24 Dec 2004 12:44:04 -0000	1.2
@@ -3,6 +3,12 @@
 # This gets filtered at configure-time to create
 # ${PACKAGE_NAME}-config.
 
+
+version="@PACKAGE_VERSION@"
+ldadd="@CLIENT_LDADD@"
+includes="@CLIENT_INCLUDES@"
+prefix="@prefix@"
+
 usage() {
     cat <<EOF 1>&2
 
@@ -13,10 +19,14 @@
 $0 [options]
 
 Options:
---libs        : prints linker information about what libs clients should link to
+--libs        : prints linker information about what libs clients should link to.
+                [${ldadd}]
 --includes    : prints INCLUDES information
+                [$includes]
 --prefix      : prints the library's installation prefix
+                [$prefix]
 --version     : prints the library's version
+                [$version]
 --toc-make    : prints a makefile snippet suitable for use with toc makefiles
 --toc-config  : prints info suitable for use in a toc configure script
 EOF
@@ -28,11 +38,6 @@
     exit 1;
 }
 
-version="@PACKAGE_VERSION@"
-ldadd="@CLIENT_LDADD@"
-includes="@CLIENT_INCLUDES@"
-prefix="@prefix@"
-
 for arg in "$@"; do
 
     case $arg in

Index: libltdl.sh
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/toc/tests/libltdl.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libltdl.sh	22 Dec 2004 19:04:25 -0000	1.1
+++ libltdl.sh	24 Dec 2004 12:44:04 -0000	1.2
@@ -20,12 +20,12 @@
 
 err=1
 
-toc_test gcc_build_and_run ${TOC_HOME}/tests/c/check_for_ltdlopen_and_friends.c -rdynamic -lltdl && {
+if toc_test gcc_build_and_run ${TOC_HOME}/tests/c/check_for_ltdlopen_and_friends.c -rdynamic -lltdl; then
     err=0
     toc_export HAVE_LIBLTDL=1
     toc_export LDADD_LIBLTDL="-lltdl -rdynamic"
     toc_export LDADD_DL="${LDADD_LIBLTDL}"
-}
+fi
 
 return $err
 

Index: libs11n.sh
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/toc/tests/libs11n.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libs11n.sh	22 Dec 2004 19:04:25 -0000	1.1
+++ libs11n.sh	24 Dec 2004 12:44:04 -0000	1.2
@@ -13,6 +13,8 @@
 #
 # This test exports the following config vars:
 #
+# - HAVE_LIBS11N = 0 or 1
+#
 # - LIBS11N_PREFIX: an empty value if the test fails or s11n's
 # installation prefix if the test passes.
 #
@@ -30,6 +32,12 @@
 # = toc_end_help
 
 
+toc_export HAVE_LIBS11N=0
+if test x0 = "x${configure_with_s11n-1}"; then
+    echo "s11n was explicitely disabled."
+    return 0
+fi
+
 s11n_path=${1-${s11n_prefix-${prefix}}}:${prefix}/bin:${PATH}
 
 toc_find libs11n-config $s11n_path  || {
@@ -40,7 +48,7 @@
 
 
 s11nconfig=${TOC_FIND_RESULT}
-
+toc_export HAVE_LIBS11N=1
 toc_export LIBS11N_PREFIX=$($s11nconfig --prefix)
 toc_export LIBS11N_CONFIG=$s11nconfig
 

[pclasses-cvs] pclasses2/test FactoryTest.cpp,1.1,1.2

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

Update of /cvsroot/pclasses/pclasses2/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438/test

Modified Files:
	FactoryTest.cpp 
Log Message:
mass commit: toc-related fixes/changes

Index: FactoryTest.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/test/FactoryTest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FactoryTest.cpp	23 Dec 2004 20:12:14 -0000	1.1
+++ FactoryTest.cpp	24 Dec 2004 12:44:03 -0000	1.2
@@ -9,11 +9,19 @@
 
 #include <pclasses/Factory.h>
 
+
 #ifndef CERR
 #define CERR std::cerr << __FILE__ << ":" << std::dec << __LINE__ << " : "
 #endif
 
-struct AType
+struct TheBase
+{
+
+	virtual ~TheBase() {}
+	virtual std::string classname() const = 0;
+};
+
+struct AType : public TheBase
 {
 	AType()
 	{
@@ -24,7 +32,7 @@
 		CERR << "~AType()\n";
 	}
 
-	virtual std::string classname() { return "AType"; }
+	virtual std::string classname() const { return "AType"; }
 
 };
 
@@ -38,7 +46,7 @@
 	{
 		CERR << "~BType()\n";
 	}
-	virtual std::string classname() { return "BType"; }
+	virtual std::string classname() const { return "BType"; }
 };
 
 struct CType : public BType
@@ -51,27 +59,39 @@
 	{
 		CERR << "~CType()\n";
 	}
-	virtual std::string classname() { return "CType"; }
+	virtual std::string classname() const { return "CType"; }
 };
 
-int main( int argc, char ** argv )
-{
-	CERR << "Factory tests...\n";
 
-	typedef P::Factory<AType> FT;
+#define PFACREG_TYPE AType
+#define PFACREG_TYPE_INTERFACE TheBase
+// #define PFACREG_TYPE_IS_ABSTRACT // define to install a null factory for AType
+#define PFACREG_TYPE_NAME "AType"
+#include <pclasses/FactoryReg.h>
 
-	P::CL::registerBase<AType>( "AType" );
-	P::CL::registerSubtype<AType,BType>( "BType" );
-	P::CL::registerSubtype<AType,CType>( "CType" );
+#define PFACREG_TYPE BType
+#define PFACREG_TYPE_INTERFACE TheBase
+#define PFACREG_TYPE_NAME "BType"
+#include <pclasses/FactoryReg.h>
 
+#define PFACREG_TYPE CType
+#define PFACREG_TYPE_INTERFACE TheBase
+#define PFACREG_TYPE_NAME "CType"
+#include <pclasses/FactoryReg.h>
 
-	AType * a = 0;
 
-#define LOAD(CN) a = P::CL::classload<AType>( CN ); \
+int main( int argc, char ** argv )
+{
+	CERR << "Factory tests...\n";
+
+	TheBase * a = 0;
+
+#define LOAD(CN) a = P::CL::classload<TheBase>( CN ); \
 	CERR << CN << " loaded? == " << a << "\n"; \
 	if( a ) CERR << "classname="<<a->classname()<<"\n"; \
 	delete( a ); a = 0;
 
+	LOAD("TheBase");
 	LOAD("AType");
 	LOAD("BType");
 	LOAD("CType");

[pclasses-cvs] pclasses2/toc/make INSTALL_XXX.make,1.1,1.2 makerules.INSTALL_XXX,1.1,1.2

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

Update of /cvsroot/pclasses/pclasses2/toc/make
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438/toc/make

Modified Files:
	INSTALL_XXX.make makerules.INSTALL_XXX 
Log Message:
mass commit: toc-related fixes/changes

Index: INSTALL_XXX.make
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/toc/make/INSTALL_XXX.make,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- INSTALL_XXX.make	22 Dec 2004 19:04:24 -0000	1.1
+++ INSTALL_XXX.make	24 Dec 2004 12:44:03 -0000	1.2
@@ -159,7 +159,12 @@
 #############
 
 
-TOC_INSTALL_TARGET_BASENAMES += BINS SBINS LIBS PACKAGE_LIBS LIBEXECS HEADERS PACKAGE_HEADERS PACKAGE_DATA DOCS \
+TOC_INSTALL_TARGET_BASENAMES += BINS SBINS \
+	LIBS PACKAGE_LIBS LIBEXECS \
+	HEADERS PACKAGE_HEADERS \
+	PACKAGE_DATA DOCS \
+	MAN1 MAN2 MAN3 MAN4 MAN5 MAN6 MAN7 MAN8 \
+	PKGCONFIG
 
 
 

Index: makerules.INSTALL_XXX
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/toc/make/makerules.INSTALL_XXX,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- makerules.INSTALL_XXX	22 Dec 2004 19:04:24 -0000	1.1
+++ makerules.INSTALL_XXX	24 Dec 2004 12:44:03 -0000	1.2
@@ -11,22 +11,23 @@
 for kvp in $@; do
     tgt=${kvp%%=*}
     dest='$(prefix)/'${kvp##*=}
+    INST="INSTALL_${tgt}"
     cat <<EOF
-# rules for INSTALL_${tgt}:
-INSTALL_${tgt}_DEST ?= $dest
+# rules for ${INST}:
+${INST}_DEST ?= $dest
 install-${tgt}: FORCE
-	@\$(call toc_make_install,\$(INSTALL_${tgt}),\$(DESTDIR)\$(INSTALL_${tgt}_DEST),\$(INSTALL_${tgt}_INSTALL_FLAGS))
+	@\$(call toc_make_install,\$(${INST}),\$(DESTDIR)\$(${INST}_DEST),\$(${INST}_INSTALL_FLAGS))
 install-${tgt}-update: FORCE
-	@\$(call toc_make_install_update,\$(INSTALL_${tgt}),\$(DESTDIR)\$(INSTALL_${tgt}_DEST),\$(INSTALL_${tgt}_INSTALL_FLAGS))
+	@\$(call toc_make_install_update,\$(${INST}),\$(DESTDIR)\$(${INST}_DEST),\$(${INST}_INSTALL_FLAGS))
 uninstall-${tgt}:
-	@\$(call toc_make_uninstall,\$(INSTALL_${tgt}),\$(DESTDIR)\$(INSTALL_${tgt}_DEST))
+	@\$(call toc_make_uninstall,\$(${INST}),\$(DESTDIR)\$(${INST}_DEST))
 install-${tgt}-symlink:
-	@\$(call toc_make_install_symlink,\$(INSTALL_${tgt}),\$(DESTDIR)\$(INSTALL_${tgt}_DEST))
+	@\$(call toc_make_install_symlink,\$(${INST}),\$(DESTDIR)\$(${INST}_DEST))
 install: install-${tgt}
 uninstall: uninstall-${tgt}
 install-update: install-${tgt}-update
 install-symlink: install-${tgt}-symlink
-# end INSTALL_${tgt} rules
+# end ${INST} rules
 
 EOF
 done

[pclasses-cvs] pclasses2/src/Util Makefile.toc,1.3,1.4

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

Update of /cvsroot/pclasses/pclasses2/src/Util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438/src/Util

Modified Files:
	Makefile.toc 
Log Message:
mass commit: toc-related fixes/changes

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/Util/Makefile.toc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.toc	23 Dec 2004 06:18:56 -0000	1.3
+++ Makefile.toc	24 Dec 2004 12:44:02 -0000	1.4
@@ -23,7 +23,7 @@
 
 INCLUDES += $(LIBPUTIL_INCLUDES)
 build_libs = 1
-LIBNAME = libputil
+LIBNAME = $(LIBPUTIL_NAME)
 ifeq (1,$(build_libs))
   STATIC_LIBS = $(LIBNAME)
   SHARED_LIBS = $(STATIC_LIBS)

[pclasses-cvs] pclasses2/src/System Makefile.toc,1.7,1.8 Mime.cpp,1.4,1.5 testMime.cpp,1.1,1.2

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

Update of /cvsroot/pclasses/pclasses2/src/System
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438/src/System

Modified Files:
	Makefile.toc Mime.cpp testMime.cpp 
Log Message:
mass commit: toc-related fixes/changes

Index: testMime.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/System/testMime.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- testMime.cpp	24 Dec 2004 03:24:56 -0000	1.1
+++ testMime.cpp	24 Dec 2004 12:44:02 -0000	1.2
@@ -15,22 +15,32 @@
 	using P::System::MimeType;
 	using P::System::MimeTypeDb;
 
+	MimeType m1( "text", "plain" );
+	MimeType m2( "application", "html" );
+#define MCMP(M1,OP,M2) CERR << M1.mimeType() << " "<<# OP<<" "<< M2.mimeType() << " == " << (M1 OP M2)<<"\n";
+#define MCMP2(M1,M2) MCMP(M1,<,M2); MCMP(M2,<,M1); MCMP(M1,==,M2);
+	MCMP2(m1,m2);
+	MCMP2(MimeType( "application", "x" ),MimeType( "application", "x" ));
+
+// 	return 0;
+
 	MimeTypeDb & db = MimeTypeDb::instance();
 
 	MimeTypeDb::const_iterator it = db.begin(),
 		et = db.end();
 	typedef MimeTypeDb::FileExtensionsMap FMap;
 	FMap::const_iterator fit, fet;
-	for( ; et != it; ++it )
+	MimeType mimet;
+	for( ; et != it; it++ )
 	{
-		CERR << "Mime type: " << (*it).second.mimeType() << "\n";
-		fit = db.extensionsMap().lower_bound( (*it).second );
-		fet = db.extensionsMap().upper_bound( (*it).second );
-		CERR << "\tNumber of extensions: " << std::distance(fit, fet )<<"\n";
-// 		for( ; fet != fit; ++fit )
-// 		{
-// 			CERR << "\t extension: " << (*fit).second << "\n";
-// 		}
+		mimet = (*it).second;
+		CERR << "Mime type: " << mimet.mimeType() << "\n";
+		fit = db.extensionsMap().lower_bound( mimet );
+		fet = db.extensionsMap().upper_bound( mimet );
+ 		for( ; fet != fit; fit++ )
+ 		{
+ 			CERR << "\t extension: " << (*fit).second << "\n";
+ 		}
 	}
 
 	return 0;

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/System/Makefile.toc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.toc	24 Dec 2004 03:25:07 -0000	1.7
+++ Makefile.toc	24 Dec 2004 12:44:02 -0000	1.8
@@ -91,6 +91,7 @@
   include $(TOC_MAKESDIR)/SHARED_LIBS.make
   include $(TOC_MAKESDIR)/STATIC_LIBS.make
   # Run targets STATIC_LIBS and SHARED_LIBS build these.
+SHARED_LIBS: STATIC_LIBS 
 endif
 
 BIN_PROGRAMS = testPathFinder testMime
@@ -98,7 +99,8 @@
 testMime_bin_OBJECTS = testMime.o Mime.o PathFinder.o
 include $(TOC_MAKESDIR)/BIN_PROGRAMS.make
 
-all: STATIC_LIBS SHARED_LIBS
+BIN_PROGRAMS: SHARED_LIBS
+all: SHARED_LIBS
 ###################################################
 # end auto-generated rules
 ###################################################

Index: Mime.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/System/Mime.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Mime.cpp	24 Dec 2004 04:06:35 -0000	1.4
+++ Mime.cpp	24 Dec 2004 12:44:02 -0000	1.5
@@ -17,6 +17,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "pclasses/pclasses-config.h"
 #include "pclasses/System/Mime.h"
 #include "pclasses/System/PathFinder.h"
 #include "pclasses/Phoenix.h"
@@ -162,10 +163,11 @@
 {
 	::P::System::PathFinder pf;
 #ifndef WIN32
-	pf.addPath( "/etc/" );
-	pf.addPath( "/usr/share/pclasses/" );
-	pf.addPath( "/usr/local/share/pclasses/" );
-	pf.addPath( "/etc/apache2/conf/" );
+	pf.addPath( PCLASSES_SHARED_DATA_DIR );
+	pf.addPath( "/etc" );
+	pf.addPath( "/etc/apache2/conf" );
+	pf.addPath( "/usr/share/pclasses" );
+	pf.addPath( "/usr/local/share/pclasses" );
 #else
 	// @fixme: add win32 paths
 #endif

[pclasses-cvs] pclasses2/templates Makefile.toc,1.1,1.2

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

Update of /cvsroot/pclasses/pclasses2/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438/templates

Modified Files:
	Makefile.toc 
Log Message:
mass commit: toc-related fixes/changes

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/templates/Makefile.toc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.toc	23 Dec 2004 00:19:00 -0000	1.1
+++ Makefile.toc	24 Dec 2004 12:44:03 -0000	1.2
@@ -1,21 +1,14 @@
+#!/usr/bin/make -f
 ###################################################
 # AUTO-GENERATED guess at a toc-aware Makefile,
 # based off of the contents of directory:
 #   ./templates
 # Created by ./toc/bin/create_makefile_stubs.sh
-# Wed Dec 22 23:10:45 CET 2004
+# Thu Dec 23 01:31:56 CET 2004
 # It must be tweaked to suit your needs.
 ###################################################
 include toc.make
 ############## FLEXES:
-# WARNING: FLEXES stuff only works for C++-based flexers
-FLEXES = 
-FLEXES_ARGS = -+ -p
-OBJECTS += 
-include $(TOC_MAKESDIR)/flex.make
-# Run target FLEXES to process these.
-# REMINDER: add the generated C++ files to your SOURCES, if needed.
-############## /FLEXES
 all:
 ###################################################
 # end auto-generated rules

[pclasses-cvs] pclasses2/src/Unicode Makefile.toc,1.3,1.4

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

Update of /cvsroot/pclasses/pclasses2/src/Unicode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438/src/Unicode

Modified Files:
	Makefile.toc 
Log Message:
mass commit: toc-related fixes/changes

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/Unicode/Makefile.toc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.toc	23 Dec 2004 06:05:26 -0000	1.3
+++ Makefile.toc	24 Dec 2004 12:44:02 -0000	1.4
@@ -18,7 +18,7 @@
 CLEAN_FILES += $(OBJECTS)
 
 build_libs = 1
-LIBNAME = libpunicode
+LIBNAME = $(LIBPUNICODE_NAME)
 ifeq (1,$(build_libs))
   STATIC_LIBS = $(LIBNAME)
   SHARED_LIBS = $(STATIC_LIBS)