Permalink
Browse files

Merge remote branch 'upstream/develop' into develop

  • Loading branch information...
2 parents 908a347 + 8147b94 commit 3d7367e82ff342c0dbc29425b58c14cf1dd5fd45 @pprindeville committed Dec 26, 2012
Showing with 76 additions and 25 deletions.
  1. +3 −3 CHANGELOG
  2. +47 −0 doc/99100-ReleaseNotes.page
  3. +0 −3 release/script/cpproj
  4. +10 −1 release/script/mkrel
  5. +16 −18 release/script/mkrelease
View
6 CHANGELOG
@@ -1,10 +1,9 @@
This is the changelog file for the POCO C++ Libraries.
-Release 1.5.0 (2012-12-17)
+Release 1.5.1 (2012-12-25)
==========================
- using double-conversion library for floating-point numeric/string conversions
- added Poco::istring (case-insensitive string) and Poco::isubstr
-- improved SQLite execute() return (affected rows) value
- added SQLite sys.dual (in-memory system table)
- applied SF Patch #120: The ExpireLRUCache does not compile with a tuple as key on Visual Studio 2010
- fixed SF Bug #599: JSON::Array and JSON::Object size() member can implicitly lose precision
@@ -30,11 +29,12 @@ Release 1.5.0 (2012-12-17)
- fixed GH #22: MySQL connection string lowercased
- added MySQL support for Date/Time
- upgraded SQLite to version 3.7.15.1 (2012-12-19)
-- fixed SQLite affectedRows reporting and added tests
+- improved SQLite execute() return (affected rows) value and added tests
- added SQLite::Utility::isThreadSafe() function
- added SQLite::Utility::setThreadMode(int mode) function
- fixed GH #41: Buffer::resize crash
+
Release 1.5.0 (2012-10-14)
==========================
View
47 doc/99100-ReleaseNotes.page
@@ -1,6 +1,53 @@
POCO C++ Libraries Release Notes
AAAIntroduction
+!!!Release 1.5.1
+
+!!Summary of Changes
+
+ - using double-conversion library for floating-point numeric/string conversions
+ - added Poco::istring (case-insensitive string) and Poco::isubstr (case-insensitive substring)
+ - added Poco::Data::SQLite sys.dual (in-memory system table)
+ - applied SF Patch #120: The ExpireLRUCache does not compile with a tuple as key on Visual Studio 2010
+ - fixed SF Bug #599: Poco::JSON::Array and JSON::Object size() member can implicitly lose precision
+ - fixed SF Bug #602: iterating database table rows not correct if no data in table
+ - fixed SF Bug #603: count() is missing in HashMap
+ - fixed GH #23: Poco::JSON::Object::stringify throw BadCastException
+ - fixed GH #16: Poco::Net::NetworkInterface::firstAddress() should not throw on unconfigured interfaces
+ - Android compile/build support (Rangel Reale)
+ - improved iPhone compile/build (Rangel Reale)
+ - TypeHandler::prepare() now takes const-reference
+ - fixed GH #27: Poco::URI::decode() doesn't properly handle '+'
+ - fixed GH #31: Poco::JSON implementation bug
+ - fixed SF #597: Configure script ignores cflags
+ - fixed SF #593: Poco 1.5.0 on FreeBSD: cannot find -ldl
+ - added SF #542: SocketAddress() needs port-only constructor
+ - fixed SF #215: Wrong return type in SocketConnector.h
+ - applied SF Patch #97: fix c++0x / clang++ bugs
+ - fixed GH32/SF596: Poco::JSON: Parsing long integer (int64) value fails.
+ - added Net ifconfig sample (contributed by Philip Prindeville)
+ - merged GH #34: add algorithm header (Roger Meier/Philip Prindeville)
+ - improved CMake build (Mathaus Mendel)
+ - fixed GH #26: Cannot compile on gcc
+ - merged SF #111: FTP Client logging (Marian Krivos)
+ - fixed GH #30: Poco::Path::home() throws when called from Windows Service
+ - fixed GH #22: Poco::Data::MySQL connection string lowercased
+ - added MySQL support for Date/Time
+ - upgraded SQLite to version 3.7.15.1 (2012-12-19)
+ - improved SQLite execute() return (affected rows) value and added tests
+ - added bool Poco::Data::SQLite::Utility::isThreadSafe() function
+ - added bool Poco::Data::SQLite::Utility::setThreadMode(int) function
+ - added int Poco::Data::SQLite::Utility::getThreadMode() function
+ - fixed GH #41: Buffer::resize crash
+
+!!Incompatible Changes and Possible Transition Issues
+
+ - Please note that 1.5.x releases are development releases and not considered stable. Interfaces may
+ change, and backwards compatibility with the stable 1.4 release series
+ is not guaranteed. There may also be some rough edges.
+ The next stable release incorporating 1.5 features will be 1.6.
+
+
!!!Release 1.5.0
!!Summary of Changes
View
3 release/script/cpproj 100644 → 100755
@@ -35,7 +35,6 @@ cp ${src}/*.sln ${dst}
cp ${src}/*.vcproj ${dst}
cp ${src}/*.vcxproj ${dst}
cp ${src}/*.vcxproj.filters ${dst}
-cp ${src}/*.vcxproj.user ${dst}
cp ${src}/Makefile* ${dst}
cp ${src}/*.make ${dst}
cp ${src}/*.progen ${dst}
@@ -72,7 +71,6 @@ if [ -d ${src}/testsuite ] ; then
cp ${src}/testsuite/*.vcproj ${dst}/testsuite
cp ${src}/testsuite/*.vcxproj ${dst}/testsuite
cp ${src}/testsuite/*.vcxproj.filters ${dst}/testsuite
- cp ${src}/testsuite/*.vcxproj.user ${dst}/testsuite
cp ${src}/testsuite/Makefile* ${dst}/testsuite
cp ${src}/testsuite/*.make ${dst}/testsuite
cp ${src}/testsuite/*.progen ${dst}/testsuite
@@ -149,7 +147,6 @@ if [ -d ${src}/samples ] ; then
cp ${src}/samples/${sample}/*.vcproj ${dst}/samples/${sample}
cp ${src}/samples/${sample}/*.vcxproj ${dst}/samples/${sample}
cp ${src}/samples/${sample}/*.vcxproj.filters ${dst}/samples/${sample}
- cp ${src}/samples/${sample}/*.vcxproj.user ${dst}/samples/${sample}
cp ${src}/samples/${sample}/Makefile* ${dst}/samples/${sample}
cp ${src}/samples/${sample}/*.make ${dst}/samples/${sample}
cp ${src}/samples/${sample}/*.progen ${dst}/samples/${sample}
View
11 release/script/mkrel
@@ -35,12 +35,17 @@ esac
label=""
spec=""
+lineEndConv=""
while [ "$1" != "" ] ;
do
if [ "$1" = "-l" ] ; then
shift
label=@$1
shift
+ elif [ "$1" = "-c" ] ; then
+ shift
+ lineEndConv=$1
+ shift
else
spec=$1
shift
@@ -56,6 +61,10 @@ else
reltag=""
fi
+if [ "$lineEndConv" != "" ] ; then
+ lnendcvt="-c ${lineEndConv}"
+fi
+
if [ $cygwin ] ; then
export PWD=`cygpath -w $POCO_BASE`
fi
@@ -75,5 +84,5 @@ release=$version$reltag
echo "Building release $release"
rm -rf releases/poco-$release.*
-$POCO_BASE/release/script/mkrelease $release $relspec
+$POCO_BASE/release/script/mkrelease $release $relspec $lnendcvt
View
34 release/script/mkrelease 100644 → 100755
@@ -14,22 +14,17 @@ if [ "$1" = "" ] ; then
echo " -i - include internal tools"
echo " -f specfile - read component list from specfile"
echo " -o dir - specify output directory"
+ echo " -c location - specify line-ending conversion utility (enables conversion)"
echo " -l - include licensing"
exit 1
fi
-case `uname` in
- CYGWIN*) cygwin=1
- ;;
- *) cygwin=""
- ;;
-esac
-
comps="Foundation XML JSON Util Net"
internal=0
specfile=""
version=""
output=""
+lineEndConv=""
licensingDep=""
while [ "$1" != "" ] ;
@@ -45,6 +40,10 @@ do
shift
output=$1
shift
+ elif [ "$1" = "-c" ] ; then
+ shift
+ lineEndConv=$1
+ shift
elif [ "$1" = "-l" ] ; then
shift
licensingDep="Licensing-libexec"
@@ -426,17 +425,16 @@ ENDOFSCRIPT
#
# Fix line endings
#
-if [ $cygwin ] ; then
- if [ -x /usr/bin/unix2dos ] ; then
- /usr/bin/unix2dos ${target}/build_vs71.cmd
- /usr/bin/unix2dos ${target}/build_vs80.cmd
- /usr/bin/unix2dos ${target}/build_vs90.cmd
- /usr/bin/unix2dos ${target}/build_vs100.cmd
- /usr/bin/unix2dos ${target}/build_CE_vs90.cmd
- /usr/bin/unix2dos ${target}/build_vcexpress2008.cmd
- /usr/bin/unix2dos ${target}/build_vcexpress2010.cmd
- /usr/bin/unix2dos ${target}/Makefile
- fi
+if [ "$lineEndConv" != "" ] ; then
+ $lineEndConv ${target}/build_vs71.cmd
+ $lineEndConv ${target}/build_vs80.cmd
+ $lineEndConv ${target}/build_vs90.cmd
+ $lineEndConv ${target}/build_vs100.cmd
+ $lineEndConv ${target}/build_CE_vs90.cmd
+ $lineEndConv ${target}/build_vcexpress2008.cmd
+ $lineEndConv ${target}/build_vcexpress2010.cmd
+ $lineEndConv ${target}/Makefile
+ $lineEndConv ${target}/components
fi

0 comments on commit 3d7367e

Please sign in to comment.