svn commit: r1104117 - in /subversion/branches/1.6.x: STATUS get-deps.sh

[hw...@apache.org]

Author: hwright
Date: Tue May 17 10:34:54 2011
New Revision: 1104117

URL: http://svn.apache.org/viewvc?rev=1104117&view=rev
Log:
Copy get-deps.sh from trunk, and change it's versions to the things I currently
use to roll 1.6.x.

 * ^/subversion/trunk/get-deps.sh
   Backport the get-deps.sh script from trunk.
   Justification:
     Another (easier) way to build the branch.  Consistency with trunk
     (e.g., for the buildslaves).
   Note:
     While backporting, please replace the hard-coded dependency versions with
     those from the 1.6.16-deps tarball:
     expat-1.95, apr-1.3.9, apr-util 1.3.9, sqlite-3.7.3, serf-0.7.0, zlib-1.2.4
   Votes:
     +1: danielsh, cmpilato, hwright

Added:
    subversion/branches/1.6.x/get-deps.sh   (contents, props changed)
      - copied, changed from r1104114, subversion/trunk/get-deps.sh
Modified:
    subversion/branches/1.6.x/STATUS

Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1104117&r1=1104116&r2=1104117&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue May 17 10:34:54 2011
@@ -328,15 +328,3 @@ Approved changes:
            justifications don't seem to refer to issue #3445. Please can we
            separate these changes and clearly describe each one? And update
            the r878607 log msg.)
-
- * ^/subversion/trunk/get-deps.sh
-   Backport the get-deps.sh script from trunk.
-   Justification:
-     Another (easier) way to build the branch.  Consistency with trunk
-     (e.g., for the buildslaves).
-   Note:
-     While backporting, please replace the hard-coded dependency versions with
-     those from the 1.6.16-deps tarball:
-     expat-1.95, apr-1.3.9, apr-util 1.3.9, sqlite-3.7.3, serf-0.7.0, zlib-1.2.4
-   Votes:
-     +1: danielsh, cmpilato, hwright

Copied: subversion/branches/1.6.x/get-deps.sh (from r1104114, subversion/trunk/get-deps.sh)
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/get-deps.sh?p2=subversion/branches/1.6.x/get-deps.sh&p1=subversion/trunk/get-deps.sh&r1=1104114&r2=1104117&rev=1104117&view=diff
==============================================================================
--- subversion/trunk/get-deps.sh (original)
+++ subversion/branches/1.6.x/get-deps.sh Tue May 17 10:34:54 2011
@@ -23,15 +23,15 @@
 # get-deps.sh -- download the dependencies useful for building Subversion
 #
 
-APR=apr-1.3.9
-APR_UTIL=apr-util-1.3.10
-NEON=neon-0.29.5
-SERF=serf-0.7.1
+APR=apr-1.4.4
+APR_UTIL=apr-util-1.3.11
+NEON=neon-0.28.3
+SERF=serf-0.7.0
 ZLIB=zlib-1.2.5
-SQLITE_VERSION=3.7.3
+SQLITE_VERSION=3.7.5
 SQLITE=sqlite-amalgamation-$SQLITE_VERSION
 
-HTTPD=httpd-2.2.17
+HTTPD=httpd-2.2.18
 APR_ICONV=apr-iconv-1.2.1
 
 BASEDIR=`pwd`

Propchange: subversion/branches/1.6.x/get-deps.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: subversion/branches/1.6.x/get-deps.sh
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May 17 10:34:54 2011
@@ -0,0 +1,54 @@
+/subversion/branches/1.5.x-r30215/get-deps.sh:870312
+/subversion/branches/atomic-revprop/get-deps.sh:965046-1000689
+/subversion/branches/bdb-reverse-deltas/get-deps.sh:872050-872529
+/subversion/branches/diff-callbacks3/get-deps.sh:870059-870761
+/subversion/branches/diff-optimizations/get-deps.sh:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/get-deps.sh:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/get-deps.sh:870728-871118
+/subversion/branches/double-delete/get-deps.sh:870511-872970
+/subversion/branches/explore-wc/get-deps.sh:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/get-deps.sh:871779-873302
+/subversion/branches/fs-rep-sharing/get-deps.sh:869036-873803
+/subversion/branches/fsfs-pack/get-deps.sh:873717-874575
+/subversion/branches/gnome-keyring/get-deps.sh:870558-871410
+/subversion/branches/http-protocol-v2/get-deps.sh:874395-876041
+/subversion/branches/in-memory-cache/get-deps.sh:869829-871452
+/subversion/branches/integrate-cache-item-serialization/get-deps.sh:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/get-deps.sh:998649-998852
+/subversion/branches/integrate-compression-level/get-deps.sh:1068651-1072287
+/subversion/branches/integrate-io-improvements/get-deps.sh:1068684-1072297
+/subversion/branches/integrate-is-cachable/get-deps.sh:1072568-1074082
+/subversion/branches/integrate-partial-getter/get-deps.sh:1072558-1076552
+/subversion/branches/integrate-readline-speedup/get-deps.sh:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/get-deps.sh:1068695-1072516
+/subversion/branches/integrate-txdelta-caching/get-deps.sh:1072541-1078213
+/subversion/branches/issue-2779-dev/get-deps.sh:965496-984198
+/subversion/branches/issue-2843-dev/get-deps.sh:871432-874179
+/subversion/branches/issue-3000/get-deps.sh:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/get-deps.sh:873375-874084
+/subversion/branches/issue-3148-dev/get-deps.sh:875193-875204
+/subversion/branches/issue-3220-dev/get-deps.sh:872210-872226
+/subversion/branches/issue-3242-dev/get-deps.sh:879653-896436
+/subversion/branches/issue-3334-dirs/get-deps.sh:875156-875867
+/subversion/branches/issue-3668-3669/get-deps.sh:1031000-1035744
+/subversion/branches/kwallet/get-deps.sh:870785-871314
+/subversion/branches/log-g-performance/get-deps.sh:870941-871032
+/subversion/branches/merge-skips-obstructions/get-deps.sh:874525-874615
+/subversion/branches/nfc-nfd-aware-client/get-deps.sh:870276,870376
+/subversion/branches/performance/get-deps.sh:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985695,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-1029340,1029
 342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/get-deps.sh:956579-1033052
+/subversion/branches/ra_serf-digest-authn/get-deps.sh:875693-876404
+/subversion/branches/reintegrate-improvements/get-deps.sh:873853-874164
+/subversion/branches/subtree-mergeinfo/get-deps.sh:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/get-deps.sh:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/get-deps.sh:918519-934609
+/subversion/branches/svnpatch-diff/get-deps.sh:865738-876477
+/subversion/branches/svnraisetc/get-deps.sh:874709-875149
+/subversion/branches/svnserve-logging/get-deps.sh:869828-870893
+/subversion/branches/tc-issue-3334/get-deps.sh:874697-874773
+/subversion/branches/tc-merge-notify/get-deps.sh:874017-874062
+/subversion/branches/tc-resolve/get-deps.sh:874191-874239
+/subversion/branches/tc_url_rev/get-deps.sh:874351-874483
+/subversion/branches/tree-conflicts/get-deps.sh:868291-873154
+/subversion/branches/tree-conflicts-notify/get-deps.sh:873926-874008
+/subversion/branches/uris-as-urls/get-deps.sh:1060426-1064427