From 073fbfc8efa1fd579acfd08026e820fb527e3582 Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Wed, 20 Oct 2021 20:00:22 +1300 Subject: Include lox/xhprof in the Matomo build release (#18143) * Include lox/xhprof in the Matomo build release * fix xhprof wrong path * remove no longer needed scripts --- misc/composer/build-xhprof.sh | 53 ------------------------------------------- misc/composer/clean-xhprof.sh | 12 ---------- 2 files changed, 65 deletions(-) delete mode 100755 misc/composer/build-xhprof.sh delete mode 100755 misc/composer/clean-xhprof.sh (limited to 'misc') diff --git a/misc/composer/build-xhprof.sh b/misc/composer/build-xhprof.sh deleted file mode 100755 index 88864db8eb..0000000000 --- a/misc/composer/build-xhprof.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -if ! type phpize &> /dev/null; then - echo "phpize missing, skipping build" - echo "If you installed PHP via Aptitude, you can install phpize w/ 'sudo apt-get install php7-dev'" - exit -fi - -if ! type make &> /dev/null; then - echo "make missing, skipping build" - exit -fi - -if ! [ -d "vendor/facebook/xhprof/extension" ]; then - echo "xhprof missing, skipping build" - exit -fi - -mkdir -p tmp/xhprof-logs - -cd vendor/facebook/xhprof/extension - -echo "Building xhprof..." - -if ! phpize &> ../../../../tmp/xhprof-logs/phpize.log; then - echo "Fatal error: phpize failed! View tmp/xhprof-logs/phpize.log for more info." - exit 1 -fi - -# Execute aclocal and autoconf only if Gentoo is used. -if [[ -x /usr/bin/emerge ]]; then - if ! aclocal &> ../../../../tmp/xhprof-logs/aclocal.log; then - echo "Fatal error: aclocal failed! View tmp/xhprof-logs/aclocal.log for more info." - exit 1 - fi - - if ! autoconf &> ../../../../tmp/xhprof-logs/autoconf.log; then - echo "Fatal error: autoconf failed! View tmp/xhprof-logs/autoconf.log for more info." - exit 1 - fi -fi - -if ! ./configure &> ../../../../tmp/xhprof-logs/configure.log; then - echo "Fatal error: configure script failed! View tmp/xhprof-logs/configure.log for more info." - exit 2 -fi - -if ! make &> ../../../../tmp/xhprof-logs/make.log; then - echo "Fatal error: could not build extension (make failed)! View tmp/xhprof-logs/make.log for more info." - exit 3 -fi - -echo "Done." \ No newline at end of file diff --git a/misc/composer/clean-xhprof.sh b/misc/composer/clean-xhprof.sh deleted file mode 100755 index d20c17dd48..0000000000 --- a/misc/composer/clean-xhprof.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# if xhprof exists but points to a non-master branch, checkout master so composer won't fail - -if [ -d "vendor/facebook/xhprof/extension" ]; then - cd vendor/facebook/xhprof/extension - - GIT_BRANCH=$(git symbolic-ref HEAD 2>/dev/null) - - git reset --hard &> /dev/null - git checkout master &> /dev/null -fi \ No newline at end of file -- cgit v1.2.3