VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-20 16:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add shared-mpms build, add build against APR trunk (httpd trunk only).

Browse Source 
Fix handling and ensure safe caching of APR trunk build.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1869564 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2019-11-08 14:29:17 +00:00
parent a740f191a8
commit 53ec69f3ca
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/travis_before_linux.sh
View File

@ -3,21 +3,32 @@ if ! test -v SKIP_TESTING; then
svn export -q https://svn.apache.org/repos/asf/httpd/test/framework/trunk test/perl-framework
fi
if test -v APR_VERSION; then
# For APR trunk the cached version at ~/root/apr-trunk will be
# stale if the current trunk revision is different from that of
# the cached build. Here, cache and check the rev number of the
# build accordingly.
trunk_url=https://svn.apache.org/repos/asf/apr/apr/trunk
if test $APR_VERSION = trunk; then
trunk_rev=`svn info --show-item last-changed-revision ${trunk_url}`
# Blow away the cached trunk install if the revision does not
# match.
test -f $HOME/root/apr-trunk/.revision-is-${trunk_rev} || rm -rf $HOME/root/apr-trunk
fi
if ! test -d $HOME/root/apr-${APR_VERSION}; then
case $APR_VERSION in
trunk) url=https://svn.apache.org/repos/asf/apr/apr/trunk ;;
*) url=https://svn.apache.org/repos/asf/apr/apr/tags/${APR_VERSION} ;;
trunk) svn export -q -r ${trunk_rev} ${trunk_url} $HOME/build/apr-trunk ;;
*) svn export -q https://svn.apache.org/repos/asf/apr/apr/tags/${APR_VERSION} \
$HOME/build/apr-${APR_VERSION} ;;
esac
svn export -q ${url} $HOME/build/apr-${APR_VERSION}
pushd $HOME/build/apr-${APR_VERSION}
if [ $APR_VERSION = 1.4.1 ]; then
# 1.4.1 doesn't build with current libtool
svn cat https://svn.apache.org/repos/asf/apr/apr/tags/1.5.1/buildconf > buildconf
fi
./buildconf
./configure ${APR_CONFIG} --prefix=$HOME/root/apr-${APR_VERSION}
make -j2
make install
if test -v trunk_rev; then
# Record the revision built in the cache.
touch $HOME/root/apr-${APR_VERSION}/.revision-is-${trunk_rev}
fi
popd
APU_CONFIG="$APU_CONFIG --with-apr=$HOME/root/apr-${APR_VERSION}"
fi