You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/03/25 20:16:06 UTC
svn commit: r1304315 - /subversion/trunk/tools/dist/make-deps-tarball.sh

Author: stsp
Date: Fri Mar 23 12:33:37 2012
New Revision: 1304315

URL: http://svn.apache.org/viewvc?rev=1304315&view=rev
Log:
* tools/dist/make-deps-tarball.sh: New script that downloads build dependencies
   for 1.6.x releases. Resurrected from an old version of the deleted
   construct-rolling-environment.sh. Dependencies were updated to their
   current stable releases deemed compatible with the 1.6.x code base.

Added:
    subversion/trunk/tools/dist/make-deps-tarball.sh   (contents, props changed)
      - copied, changed from r945372, subversion/trunk/tools/dist/construct-rolling-environment.sh

Copied: subversion/trunk/tools/dist/make-deps-tarball.sh (from r945372, subversion/trunk/tools/dist/construct-rolling-environment.sh)
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/make-deps-tarball.sh?p2=subversion/trunk/tools/dist/make-deps-tarball.sh&p1=subversion/trunk/tools/dist/construct-rolling-environment.sh&r1=945372&r2=1304315&rev=1304315&view=diff
==============================================================================
--- subversion/trunk/tools/dist/construct-rolling-environment.sh (original)
+++ subversion/trunk/tools/dist/make-deps-tarball.sh Fri Mar 23 12:33:37 2012
@@ -21,106 +21,29 @@
 #
 set -e
 
-AUTOCONF=autoconf-2.64
-LIBTOOL=libtool-1.5.26
-SWIG=swig-1.3.36
-
-APR=apr-1.3.8
-APR_UTIL=apr-util-1.3.9
-NEON=neon-0.29.0
-SERF=serf-0.3.0
-ZLIB=zlib-1.2.5
-SQLITE_VERSION=3.6.20
+APR=apr-1.4.6
+APR_UTIL=apr-util-1.4.1
+NEON=neon-0.29.6
+SERF=serf-0.3.1
+ZLIB=zlib-1.2.6
+SQLITE_VERSION=3071100
 SQLITE=sqlite-amalgamation-$SQLITE_VERSION
 
-HTTPD=httpd-2.2.14
+HTTPD=httpd-2.2.22
 HTTPD_OOPS=
 APR_ICONV=apr-iconv-1.2.1
 APR_ICONV_OOPS=
 
 WIN32_APR_VIA_HTTPD=1
 
-LOCATION=${LOCATION-US}
-
-usage() {
-    echo >&2 "
-Welcome, this is Subversion's construct-rolling-environment.sh.
-
-Change to a directory in which you would like to create a Subversion
-rolling environment, and run:
-  construct-rolling-environment.sh prefix
-to download, build, and install autoconf, libtool, and swig into a prefix
-subdirectory. Run:
-  construct-rolling-environment.sh deps
-to download and extract the various bundled dependencies needed to build
-tarballs and zipfiles into unix-dependencies and win32-dependencies
-subdirectories.
-
-Downloaded files and temporary build directories will be located within
-a temp subdirectory.
-
-The environment variable LOCATION provides a crude mirror selection tool
-- examine the script source for details.
-"
-    exit 1
-}
-
 BASEDIR=`pwd`
-PREFIX=$BASEDIR/prefix
 TEMPDIR=$BASEDIR/temp
 
-case $LOCATION in
-    US)
-    APACHE_MIRROR=http://www.pangex.com/pub/apache
-    SOURCEFORGE_MIRROR=http://internap.dl.sourceforge.net/sourceforge
-    ;;
-    UK)
-    APACHE_MIRROR=http://apache.rmplc.co.uk
-    SOURCEFORGE_MIRROR=http://kent.dl.sourceforge.net/sourceforge
-    ;;
-    *)
-    echo "Unknown LOCATION" >&2
-    exit 1
-    ;;
-esac
-
-# Need this uncommented if any of the specific versions of the ASF tarballs to
-# be downloaded are no longer available on the general mirrors.
 APACHE_MIRROR=http://archive.apache.org/dist
 
-setup() {
+create_deps() {
     mkdir -p $TEMPDIR
     cd $TEMPDIR
-}
-
-create_prefix() {
-    wget -nc http://ftp.gnu.org/gnu/autoconf/$AUTOCONF.tar.bz2
-    wget -nc http://ftp.gnu.org/gnu/libtool/$LIBTOOL.tar.gz
-    wget -nc $SOURCEFORGE_MIRROR/swig/$SWIG.tar.gz
-
-    tar jxvf $AUTOCONF.tar.bz2
-    cd $AUTOCONF
-    ./configure --prefix=$PREFIX
-    make
-    make install
-    cd ..
-
-    tar zxvf $LIBTOOL.tar.gz
-    cd $LIBTOOL
-    ./configure --prefix=$PREFIX
-    make
-    make install
-    cd ..
-
-    tar zxvf $SWIG.tar.gz
-    cd $SWIG
-    ./configure --prefix=$PREFIX
-    make
-    make install
-    cd ..
-}
-
-create_deps() {
     wget -nc $APACHE_MIRROR/apr/$APR.tar.bz2
     wget -nc $APACHE_MIRROR/apr/$APR_UTIL.tar.bz2
     if [ -n "$WIN32_APR_VIA_HTTPD" ]; then
@@ -133,18 +56,18 @@ create_deps() {
     wget -nc http://webdav.org/neon/$NEON.tar.gz
     wget -nc http://serf.googlecode.com/files/$SERF.tar.bz2
     wget -nc http://www.zlib.net/$ZLIB.tar.bz2
-    wget -nc http://www.sqlite.org/$SQLITE.tar.gz
+    wget -nc http://www.sqlite.org/$SQLITE.zip
 
     mkdir $BASEDIR/unix-dependencies
     cd $BASEDIR/unix-dependencies
     tar zxvf $TEMPDIR/$NEON.tar.gz
     tar jxvf $TEMPDIR/$ZLIB.tar.bz2
     tar jxvf $TEMPDIR/$SERF.tar.bz2
-    tar zxvf $TEMPDIR/$SQLITE.tar.gz
+    unzip $TEMPDIR/$SQLITE.zip
     mv $NEON neon
     mv $ZLIB zlib
     mv $SERF serf
-    mv sqlite-$SQLITE_VERSION sqlite-amalgamation
+    mv $SQLITE sqlite-amalgamation
     tar jxvf $TEMPDIR/$APR.tar.bz2
     tar jxvf $TEMPDIR/$APR_UTIL.tar.bz2
     mv $APR apr
@@ -156,11 +79,11 @@ create_deps() {
     tar zxvf $TEMPDIR/$NEON.tar.gz
     tar jxvf $TEMPDIR/$ZLIB.tar.bz2
     tar jxvf $TEMPDIR/$SERF.tar.bz2
-    tar zxvf $TEMPDIR/$SQLITE.tar.gz
+    unzip $TEMPDIR/$SQLITE.zip
     mv $NEON neon
     mv $ZLIB zlib
     mv $SERF serf
-    mv sqlite-$SQLITE_VERSION sqlite-amalgamation
+    mv $SQLITE sqlite-amalgamation
     if [ -n "$WIN32_APR_VIA_HTTPD" ]; then
       unzip $TEMPDIR/$HTTPD-win32-src$HTTPD_OOPS.zip
       for i in apr apr-util apr-iconv; do
@@ -178,11 +101,4 @@ create_deps() {
     cd $TEMPDIR
 }
 
-if [ "$#" -ne 1 ]; then
-    usage
-fi
-case $1 in
-    prefix) setup; create_prefix ;;
-    deps) setup; create_deps ;;
-    *) usage ;;
-esac
+create_deps

Propchange: subversion/trunk/tools/dist/make-deps-tarball.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/trunk/tools/dist/make-deps-tarball.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: subversion/trunk/tools/dist/make-deps-tarball.sh
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Mar 23 12:33:37 2012
@@ -0,0 +1,36 @@
+/subversion/branches/1.5.x-r30215/tools/dist/construct-rolling-environment.sh:870312
+/subversion/branches/bdb-reverse-deltas/tools/dist/construct-rolling-environment.sh:872050-872529
+/subversion/branches/diff-callbacks3/tools/dist/construct-rolling-environment.sh:870059-870761
+/subversion/branches/dont-save-plaintext-passwords-by-default/tools/dist/construct-rolling-environment.sh:870728-871118
+/subversion/branches/double-delete/tools/dist/construct-rolling-environment.sh:870511-872970
+/subversion/branches/explore-wc/tools/dist/construct-rolling-environment.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/tools/dist/construct-rolling-environment.sh:871779-873302
+/subversion/branches/fs-rep-sharing/tools/dist/construct-rolling-environment.sh:869036-873803
+/subversion/branches/fsfs-pack/tools/dist/construct-rolling-environment.sh:873717-874575
+/subversion/branches/gnome-keyring/tools/dist/construct-rolling-environment.sh:870558-871410
+/subversion/branches/http-protocol-v2/tools/dist/construct-rolling-environment.sh:874395-876041
+/subversion/branches/in-memory-cache/tools/dist/construct-rolling-environment.sh:869829-871452
+/subversion/branches/issue-2843-dev/tools/dist/construct-rolling-environment.sh:871432-874179
+/subversion/branches/issue-3000/tools/dist/construct-rolling-environment.sh:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/tools/dist/construct-rolling-environment.sh:873375-874084
+/subversion/branches/issue-3148-dev/tools/dist/construct-rolling-environment.sh:875193-875204
+/subversion/branches/issue-3220-dev/tools/dist/construct-rolling-environment.sh:872210-872226
+/subversion/branches/issue-3242-dev/tools/dist/construct-rolling-environment.sh:879653-896436
+/subversion/branches/issue-3334-dirs/tools/dist/construct-rolling-environment.sh:875156-875867
+/subversion/branches/kwallet/tools/dist/construct-rolling-environment.sh:870785-871314
+/subversion/branches/log-g-performance/tools/dist/construct-rolling-environment.sh:870941-871032
+/subversion/branches/merge-skips-obstructions/tools/dist/construct-rolling-environment.sh:874525-874615
+/subversion/branches/ra_serf-digest-authn/tools/dist/construct-rolling-environment.sh:875693-876404
+/subversion/branches/reintegrate-improvements/tools/dist/construct-rolling-environment.sh:873853-874164
+/subversion/branches/subtree-mergeinfo/tools/dist/construct-rolling-environment.sh:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/tools/dist/construct-rolling-environment.sh:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/tools/dist/construct-rolling-environment.sh:918519-934609
+/subversion/branches/svnpatch-diff/tools/dist/construct-rolling-environment.sh:865738-876477
+/subversion/branches/svnraisetc/tools/dist/construct-rolling-environment.sh:874709-875149
+/subversion/branches/svnserve-logging/tools/dist/construct-rolling-environment.sh:869828-870893
+/subversion/branches/tc-issue-3334/tools/dist/construct-rolling-environment.sh:874697-874773
+/subversion/branches/tc-merge-notify/tools/dist/construct-rolling-environment.sh:874017-874062
+/subversion/branches/tc-resolve/tools/dist/construct-rolling-environment.sh:874191-874239
+/subversion/branches/tc_url_rev/tools/dist/construct-rolling-environment.sh:874351-874483
+/subversion/branches/tree-conflicts/tools/dist/construct-rolling-environment.sh:868291-873154
+/subversion/branches/tree-conflicts-notify/tools/dist/construct-rolling-environment.sh:873926-874008