From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 25 May 2011 13:46:08 +0000 (+0300)
Subject: Merge branch 'strings-master'
X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=commitdiff_plain;h=b56eb5ec1da675da0c66abc53c1e4f6c4e4cccbd

Merge branch 'strings-master'

Conflicts:
	.gitignore
	Build
	Changelog.txt
---

b56eb5ec1da675da0c66abc53c1e4f6c4e4cccbd
diff --cc .gitignore
index ae72e46,6191adc..82b1d62
--- a/.gitignore
+++ b/.gitignore
@@@ -1,12 -1,13 +1,15 @@@
  /.deps
  /.options.*
  /.profile
 +/arm
  /debug
+ /grep
 +/libmspcore.a
 +/libmspcore.so
+ /libmspstrings.a
+ /libmspstrings.so
 -/mspstrings.pc
 +/mspcore.pc
  /release
  /temp
+ /transcode
  /win32
--
diff --cc Build
index 359f6b1,06545dc..e1f3fd7
--- a/Build
+++ b/Build
@@@ -1,54 -1,49 +1,86 @@@
 -// $Id$
 +/* $Id$ */
  
 -package "mspstrings"
 +package "mspcore"
  {
  	version "1.1";
 -	description "String utilities library";
 +	description "Mikkosoft Productions core library";
  
 -	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;
+ 	};
+ 
 -	library "mspstrings"
 +	library "mspcore"
  	{
 +		source "source/core";
 +		source "source/debug";
 +		source "source/time";
+ 		source "source/strings";
+ 		source "source/stringcodec";
  		install true;
  	};
  
+ 	program "grep"
+ 	{
+ 		source "grep.cpp";
+ 		build_info
+ 		{
 -			library "mspstrings";
++			library "mspcore";
+ 		};
+ 	};
+ 
+ 	program "transcode"
+ 	{
+ 		source "transcode.cpp";
+ 		build_info
+ 		{
 -			library "mspstrings";
++			library "mspcore";
+ 		};
+ 	};
+ 
  	tarball "@src"
  	{
  		source "License.txt";
diff --cc Changelog.txt
index 1e5fe5e,9af98cd..a9d3619
--- a/Changelog.txt
+++ b/Changelog.txt
@@@ -1,13 -1,14 +1,32 @@@
++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$)