Author: rhuijben
Date: Fri Aug 26 11:59:26 2016
New Revision: 1757825
URL: http://svn.apache.org/viewvc?rev=1757825&view=rev
Log:
Merge r1699613 from trunk.
* dist.sh: Remove now obsolete buildconf step and related configuration.
Modified:
serf/branches/1.3.x/ (props changed)
serf/branches/1.3.x/dist.sh
Propchange: serf/branches/1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 26 11:59:26 2016
@@ -1,4 +1,4 @@
/serf/branches/1.3.x:1699925,1699931
/serf/branches/multiple_ssl_impls:1699382
/serf/branches/windows-sspi:1698866-1698877
-/serf/trunk:1699516-1699518,1699520-1699522,1699528,1699530-1699535,1699537,1699539-1699543,1699548-1699549,1699553,1699555-1699556,1699559-1699560,1699563-1699565,1699567-1699570,1699572-1699573,1699578-1699580,1699582-1699597,1699599-1699602,1699607,1699610,1699615-1699618,1699622-1699623,1699626-1699627,1699633,1699637,1699642,1699645,1699647,1699649-1699650,1699652,1699654-1699655,1699659-1699665,1699671,1699674,1699680-1699683,1699687-1699688,1699690,1699692-1699694,1699698-1699700,1699702,1699707-1699708,1699712-1699716,1699720,1699724,1699728,1699730,1699733,1699762,1699770,1699773,1699777,1699780-1699781,1699791,1699798,1699800-1699801,1699817,1699819,1699838,1699843,1699846,1699850,1699852,1699858-1699859,1699861,1699873,1699881,1699884,1699902-1699903,1699906,1699924,1699926-1699927,1699930,1699932,1699936-1699937,1699941,1699944,1699948-1699950,1699954,1699957,1699964,1699973,1699975,1699985-1699987,1699993-1699994,1700062,1700128,1700149,1700234,1700236,1700246,1700270,1
700650,1700830,1702096,1702221,1702264,1704725,1708849,1748673
+/serf/trunk:1699516-1699518,1699520-1699522,1699528,1699530-1699535,1699537,1699539-1699543,1699548-1699549,1699553,1699555-1699556,1699559-1699560,1699563-1699565,1699567-1699570,1699572-1699573,1699578-1699580,1699582-1699597,1699599-1699602,1699607,1699610,1699613,1699615-1699618,1699622-1699623,1699626-1699627,1699633,1699637,1699642,1699645,1699647,1699649-1699650,1699652,1699654-1699655,1699659-1699665,1699671,1699674,1699680-1699683,1699687-1699688,1699690,1699692-1699694,1699698-1699700,1699702,1699707-1699708,1699712-1699716,1699720,1699724,1699728,1699730,1699733,1699762,1699770,1699773,1699777,1699780-1699781,1699791,1699798,1699800-1699801,1699817,1699819,1699838,1699843,1699846,1699850,1699852,1699858-1699859,1699861,1699873,1699881,1699884,1699902-1699903,1699906,1699924,1699926-1699927,1699930,1699932,1699936-1699937,1699941,1699944,1699948-1699950,1699954,1699957,1699964,1699973,1699975,1699985-1699987,1699993-1699994,1700062,1700128,1700149,1700234,1700236,1700246,1
700270,1700650,1700830,1702096,1702221,1702264,1704725,1708849,1748673
Modified: serf/branches/1.3.x/dist.sh
URL:
http://svn.apache.org/viewvc/serf/branches/1.3.x/dist.sh?rev=1757825&r1=1757824&r2=1757825&view=diff
==============================================================================
--- serf/branches/1.3.x/dist.sh (original)
+++ serf/branches/1.3.x/dist.sh Fri Aug 26 11:59:26 2016
@@ -2,16 +2,13 @@
REPOS="https://svn.apache.org/repos/asf/serf";
-if test $# != 2; then
- echo "USAGE: $0 TAG APR-SOURCE-PARENT"
+if test $# != 1; then
+ echo "USAGE: $0 TAG"
exit 1
fi
version=$1
-# Convert to absolute path.
-srcdir=`(cd $2 ; pwd)`
-
# provide for examining dist.sh output before creating a tag
if test "${version}" = "trunk"; then
url="${REPOS}/trunk"
@@ -38,12 +35,6 @@ prepare_directory()
{
cd "${release}"
-echo "Running buildconf ..."
-if ! ./buildconf --with-apr="${srcdir}/apr"
--with-apr-util="${srcdir}/apr-util" ; then
- echo "Exiting..."
- exit 1
-fi
-
# Remove anything that should not be in the distribution
echo "Removing from release: dist.sh"
rm dist.sh
@@ -79,7 +70,6 @@ echo "Exporting latest serf using CRLF .
svn export --native-eol=CRLF --quiet "${url}" "${release}" || exit 1
echo "`find ${release} -type f | wc -l` files exported"
-### generated files have wrong line-ending. is that an issue?
prepare_directory
if ! diff -brq "${release}.unix" "${release}"; then
