Author: svn-role
Date: Mon May 27 04:01:46 2013
New Revision: 1486509
URL: http://svn.apache.org/r1486509
Log:
Merge the r1485447 group from trunk:
* r1485447, r1485449
Make 'SQLITE_VERSION=3.7.15.1 ./get-deps.sh' work.
Justification:
Allow downloading another version without editing the script, for example
if upstream break the URL to the tarball after a newer version has been
released.
Votes:
+1: danielsh, cmpilato, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/get-deps.sh
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1485447,1485449
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1486509&r1=1486508&r2=1486509&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon May 27 04:01:46 2013
@@ -105,12 +105,3 @@ Approved changes:
# blocking issues. If in doubt see this link for details:
#
http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
- * r1485447, r1485449
- Make 'SQLITE_VERSION=3.7.15.1 ./get-deps.sh' work.
- Justification:
- Allow downloading another version without editing the script, for example
- if upstream break the URL to the tarball after a newer version has been
- released.
- Votes:
- +1: danielsh, cmpilato, stefan2
-
Modified: subversion/branches/1.8.x/get-deps.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/get-deps.sh?rev=1486509&r1=1486508&r2=1486509&view=diff
==============================================================================
--- subversion/branches/1.8.x/get-deps.sh (original)
+++ subversion/branches/1.8.x/get-deps.sh Mon May 27 04:01:46 2013
@@ -31,19 +31,26 @@
# features already used in the file. Reviewing the history of changes
# may be useful as well.
-APR=apr-1.4.6
-APR_UTIL=apr-util-1.5.1
-SERF=serf-1.2.0
-ZLIB=zlib-1.2.8
-SQLITE_VERSION=3.7.15.1
+APR_VERSION=${APR_VERSION:-"1.4.6"}
+APU_VERSION=${APU_VERSION:-"1.5.1"}
+SERF_VERSION=${SERF_VERSION:-"1.2.0"}
+ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"}
+SQLITE_VERSION=${SQLITE_VERSION:-"3.7.15.1"}
+GTEST_VERSION=${GTEST_VERSION:-"1.6.0"}
+HTTPD_VERSION=${HTTPD_VERSION:-"2.4.3"}
+APR_ICONV_VERSION=${APR_ICONV_VERSION:-"1.2.1"}
+
+APR=apr-${APR_VERSION}
+APR_UTIL=apr-util-${APU_VERSION}
+SERF=serf-${SERF_VERSION}
+ZLIB=zlib-${ZLIB_VERSION}
SQLITE_VERSION_LIST=`echo $SQLITE_VERSION | sed -e 's/\./ /g'`
SQLITE=sqlite-amalgamation-`printf %d%02d%02d%02d $SQLITE_VERSION_LIST`
-GTEST_VERSION=1.6.0
GTEST=gtest-${GTEST_VERSION}
GTEST_URL=http://googletest.googlecode.com/files/
-HTTPD=httpd-2.4.3
-APR_ICONV=apr-iconv-1.2.1
+HTTPD=httpd-${HTTPD_VERSION}
+APR_ICONV=apr-iconv-${APR_ICONV_VERSION}
BASEDIR=`pwd`
TEMPDIR=$BASEDIR/temp
