Skip to content

Commit 8147b94

Browse files
committed
updated notes, modified release script
release scripts modified to accept line conversion utility location on the command line
1 parent dc50873 commit 8147b94

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

doc/99100-ReleaseNotes.page

-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ AAAIntroduction
4242

4343
!!Incompatible Changes and Possible Transition Issues
4444

45-
- Poco::Net::NetworkInterface::findFirstAddress() (1.5.0) was renamed to firstAddress() (1.5.1).
46-
- typedef Poco::Net::NetworkInterface::MacAddress (1.5.0) was renamed to MACAddress (1.5.1).
47-
- introduced NetworkInterface::Type (1.5.1).
48-
- unsigned Poco::Net::NetworkInterface::hwType() (1.5.0) changed to NetworkInterface::Type type() (1.5.1)
4945
- Please note that 1.5.x releases are development releases and not considered stable. Interfaces may
5046
change, and backwards compatibility with the stable 1.4 release series
5147
is not guaranteed. There may also be some rough edges.

release/script/cpproj

-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ cp ${src}/*.sln ${dst}
3535
cp ${src}/*.vcproj ${dst}
3636
cp ${src}/*.vcxproj ${dst}
3737
cp ${src}/*.vcxproj.filters ${dst}
38-
cp ${src}/*.vcxproj.user ${dst}
3938
cp ${src}/Makefile* ${dst}
4039
cp ${src}/*.make ${dst}
4140
cp ${src}/*.progen ${dst}
@@ -72,7 +71,6 @@ if [ -d ${src}/testsuite ] ; then
7271
cp ${src}/testsuite/*.vcproj ${dst}/testsuite
7372
cp ${src}/testsuite/*.vcxproj ${dst}/testsuite
7473
cp ${src}/testsuite/*.vcxproj.filters ${dst}/testsuite
75-
cp ${src}/testsuite/*.vcxproj.user ${dst}/testsuite
7674
cp ${src}/testsuite/Makefile* ${dst}/testsuite
7775
cp ${src}/testsuite/*.make ${dst}/testsuite
7876
cp ${src}/testsuite/*.progen ${dst}/testsuite
@@ -149,7 +147,6 @@ if [ -d ${src}/samples ] ; then
149147
cp ${src}/samples/${sample}/*.vcproj ${dst}/samples/${sample}
150148
cp ${src}/samples/${sample}/*.vcxproj ${dst}/samples/${sample}
151149
cp ${src}/samples/${sample}/*.vcxproj.filters ${dst}/samples/${sample}
152-
cp ${src}/samples/${sample}/*.vcxproj.user ${dst}/samples/${sample}
153150
cp ${src}/samples/${sample}/Makefile* ${dst}/samples/${sample}
154151
cp ${src}/samples/${sample}/*.make ${dst}/samples/${sample}
155152
cp ${src}/samples/${sample}/*.progen ${dst}/samples/${sample}

release/script/mkrel

+10-1
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,17 @@ esac
3535

3636
label=""
3737
spec=""
38+
lineEndConv=""
3839
while [ "$1" != "" ] ;
3940
do
4041
if [ "$1" = "-l" ] ; then
4142
shift
4243
label=@$1
4344
shift
45+
elif [ "$1" = "-c" ] ; then
46+
shift
47+
lineEndConv=$1
48+
shift
4449
else
4550
spec=$1
4651
shift
@@ -56,6 +61,10 @@ else
5661
reltag=""
5762
fi
5863

64+
if [ "$lineEndConv" != "" ] ; then
65+
lnendcvt="-c ${lineEndConv}"
66+
fi
67+
5968
if [ $cygwin ] ; then
6069
export PWD=`cygpath -w $POCO_BASE`
6170
fi
@@ -75,5 +84,5 @@ release=$version$reltag
7584
echo "Building release $release"
7685

7786
rm -rf releases/poco-$release.*
78-
$POCO_BASE/release/script/mkrelease $release $relspec
87+
$POCO_BASE/release/script/mkrelease $release $relspec $lnendcvt
7988

release/script/mkrelease

+16-18
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,17 @@ if [ "$1" = "" ] ; then
1414
echo " -i - include internal tools"
1515
echo " -f specfile - read component list from specfile"
1616
echo " -o dir - specify output directory"
17+
echo " -c location - specify line-ending conversion utility (enables conversion)"
1718
echo " -l - include licensing"
1819
exit 1
1920
fi
2021

21-
case `uname` in
22-
CYGWIN*) cygwin=1
23-
;;
24-
*) cygwin=""
25-
;;
26-
esac
27-
2822
comps="Foundation XML JSON Util Net"
2923
internal=0
3024
specfile=""
3125
version=""
3226
output=""
27+
lineEndConv=""
3328
licensingDep=""
3429

3530
while [ "$1" != "" ] ;
@@ -45,6 +40,10 @@ do
4540
shift
4641
output=$1
4742
shift
43+
elif [ "$1" = "-c" ] ; then
44+
shift
45+
lineEndConv=$1
46+
shift
4847
elif [ "$1" = "-l" ] ; then
4948
shift
5049
licensingDep="Licensing-libexec"
@@ -426,17 +425,16 @@ ENDOFSCRIPT
426425
#
427426
# Fix line endings
428427
#
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
440438
fi
441439

442440

0 commit comments

Comments
 (0)