From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 10 Jun 2011 18:08:51 +0000 (+0300)
Subject: Merge branch 'io-master'
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=c7afef88380ebebc8c2b04e48664d73281ec8848;p=libs%2Fcore.git

Merge branch 'io-master'

Conflicts:
	.gitignore
	Build
	Changelog.txt
---

c7afef88380ebebc8c2b04e48664d73281ec8848
diff --cc .gitignore
index 82b1d62,c200d8f..0c896d6
--- a/.gitignore
+++ b/.gitignore
@@@ -1,15 -1,10 +1,13 @@@
  /.deps
  /.options.*
  /.profile
 +/arm
  /debug
 -/libmspio.a
 -/libmspio.so
 -/mspio.pc
 +/grep
 +/libmspcore.a
 +/libmspcore.so
- /libmspstrings.a
- /libmspstrings.so
 +/mspcore.pc
  /release
  /temp
 +/transcode
  /win32
diff --cc Build
index e1f3fd7,32d717d..cdd83c4
--- a/Build
+++ b/Build
@@@ -1,65 -1,23 +1,72 @@@
  /* $Id$ */
  
 -package "mspio"
 +package "mspcore"
  {
  	version "1.1";
 -	description "Object-oriented input/output library";
 +	description "Mikkosoft Productions core library";
  
 -	require "mspstrings";
 -	require "mspcore";
  	require "sigc++-2.0";
 +	if "arch!=win32"
 +	{
 +		build_info
 +		{
 +			library "pthread";
 +		};
 +	};
 +	if "arch=linux"
 +	{
 +		build_info
 +		{
 +			library "dl";
 +		};
 +	};
 +
 +	feature "exception_backtrace" "Generate a backtrace when an exception is thrown.";
 +
 +	headers "msp/core"
 +	{
 +		source "source/core";
 +		install true;
 +	};
 +
 +	headers "msp/time"
 +	{
 +		source "source/time";
 +		install true;
 +	};
 +
 +	headers "msp/debug"
 +	{
 +		source "source/debug";
 +		install true;
 +	};
 +
 +	headers "msp/strings"
 +	{
 +		source "source/strings";
 +		install true;
 +	};
 +
 +	headers "msp/stringcodec"
 +	{
 +		source "source/stringcodec";
 +		install true;
 +	};
  
+ 	headers "msp/io"
+ 	{
 -		source "source";
++		source "src/io";
+ 		install true;
+ 	};
+ 
 -	library "mspio"
 +	library "mspcore"
  	{
 -		source "source";
 +		source "source/core";
 +		source "source/debug";
 +		source "source/time";
 +		source "source/strings";
 +		source "source/stringcodec";
++		source "source/io";
  		install true;
  	};
  
diff --cc Changelog.txt
index a9d3619,5225d21..498e9ff
--- a/Changelog.txt
+++ b/Changelog.txt
@@@ -1,32 -1,11 +1,42 @@@
 +2.0
 +
 +== Changes from pre-2.0 mspcore ==
 +
 +1.1
 +* Time zone support
 +* Some more time operations
 +* Bugfixes
 +  - Compatibility fixes for FreeBSD and 64-bit systems
 +  - Proper handling of string arguments with spaces in GetOpt
 +  - DateTime addition fixes
 +  - Timer no longer drops duplicate timeouts
 +
 +1.0
 +* First released version
 +
 +== Changes from pre-2.0 mspstrings ==
 +
 +1.1
 +* Codec autodetection
 +* lexical_cast rewritten from scratch
 +* Some new utility functions
 +* Bugfixes
 +  - 64-bit compatibility
 +  - Don't generate invalid octal escape sequences
 +  - UTF-8 decoder now passes the UTF-8 test file
 +  - Regex fixes
 +
 +1.0
 +* First released version
 +
- ($Id$)
++== Changes from pre-2.0 mspio ==
++
+ 1.1
+ * Filter class makes adding filters easier
+ * Memory class enables I/O from/to memory buffers
+ * Console size can be queried
+ * Bugfixes
+   - Don't consider an empty set for poll an error
+ 
+ 1.0
+ * First released version
 -
 -($Id$)