Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge remote branch 'upstream/develop' into develop

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

0 notes on commit 3d7367e

Please sign in to comment.
Something went wrong with that request. Please try again.