Re: svn commit: r1869533 - in /httpd/httpd/trunk: .travis.yml test/travis_before_linux.sh test/travis_run_linux.sh

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1869533 - in /httpd/httpd/trunk: .travis.yml test/travis_before_linux.sh test/travis_run_linux.sh

Ruediger Pluem


On 11/08/2019 10:46 AM, [hidden email] wrote:

> Author: jorton
> Date: Fri Nov  8 09:46:50 2019
> New Revision: 1869533
>
> URL: http://svn.apache.org/viewvc?rev=1869533&view=rev
> Log:
> Add Travis support for multiple APR/APR-util versions.
> Add an APR build with --enable-pool-debug.
>
> Modified:
>     httpd/httpd/trunk/.travis.yml
>     httpd/httpd/trunk/test/travis_before_linux.sh
>     httpd/httpd/trunk/test/travis_run_linux.sh
>

> Modified: httpd/httpd/trunk/test/travis_before_linux.sh
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_before_linux.sh?rev=1869533&r1=1869532&r2=1869533&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/test/travis_before_linux.sh (original)
> +++ httpd/httpd/trunk/test/travis_before_linux.sh Fri Nov  8 09:46:50 2019
> @@ -1,5 +1,39 @@
>  #!/bin/bash -ex
> -svn export -q https://svn.apache.org/repos/asf/apr/apr/trunk srclib/apr
>  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
> +    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} ;;
> +        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
> +        popd
> +        APU_CONFIG="$APU_CONFIG --with-apr=$HOME/root/apr-${APR_VERSION}"
> +    fi
> +fi
> +if test -v APU_VERSION; then
> +    if ! test -d $HOME/root/apu-${APU_VERSION}; then
> +        case $APU_VERSION in
> +            trunk) url=https://svn.apache.org/repos/asf/apr/apr-util/trunk ;;

I thought that there is no APR-UTIL trunk any longer since all APR-UTIL trunk development now happens on APR trunk as
both got merged.

> +            *) url=https://svn.apache.org/repos/asf/apr/apr-util/tags/${APU_VERSION} ;;
> +        esac
> +        svn export -q ${url} $HOME/build/apu-${APU_VERSION}
> +        pushd $HOME/build/apu-${APU_VERSION}
> +        ./buildconf --with-apr=$HOME/build/apr-${APR_VERSION}
> +        ./configure ${APU_CONFIG} --prefix=$HOME/root/apu-${APU_VERSION}
> +        make -j2
> +        make install
> +        popd
> +    fi
> +fi
>


Regards

RĂ¼diger