From 6d6059b61f10f1cd0e704a32ee58bce32ffbaa3d Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Mon, 30 Jun 2014 21:07:27 +0200 Subject: [PATCH] Updated for new build --- src/build/compile.sh | 839 ------------------ src/build/installer.sh | 276 ------ src/build/jenkins.sh | 213 ----- src/pocketmine/PocketMine.php | 2 +- .../format/generic/EmptyChunkSection.php | 2 +- 5 files changed, 2 insertions(+), 1330 deletions(-) delete mode 100755 src/build/compile.sh delete mode 100644 src/build/installer.sh delete mode 100644 src/build/jenkins.sh diff --git a/src/build/compile.sh b/src/build/compile.sh deleted file mode 100755 index bb918a9d3..000000000 --- a/src/build/compile.sh +++ /dev/null @@ -1,839 +0,0 @@ -#!/bin/bash -PHP_VERSION="5.5.14" -ZEND_VM="GOTO" - -ZLIB_VERSION="1.2.8" -OPENSSL_VERSION="1.0.1h" -LIBMCRYPT_VERSION="2.5.8" -GMP_VERSION="6.0.0a" -GMP_VERSION_DIR="6.0.0" -CURL_VERSION="curl-7_37_0" -READLINE_VERSION="6.3" -NCURSES_VERSION="5.9" -PHPNCURSES_VERSION="1.0.2" -PTHREADS_VERSION="2.0.7" -PHP_POCKETMINE_VERSION="0.0.6" -UOPZ_VERSION="2.0.4" -WEAKREF_VERSION="0.2.4" -PHPYAML_VERSION="1.1.1" -YAML_VERSION="0.1.4" -LIBXML_VERSION="2.9.1" -BCOMPILER_VERSION="1.0.2" - -echo "[PocketMine] PHP compiler for Linux, MacOS and Android" -DIR="$(pwd)" -date > "$DIR/install.log" 2>&1 -trap "echo \"# \$(eval echo \$BASH_COMMAND)\" >> \"$DIR/install.log\" 2>&1" DEBUG -uname -a >> "$DIR/install.log" 2>&1 -echo "[INFO] Checking dependecies" -type make >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"make\""; read -p "Press [Enter] to continue..."; exit 1; } -type autoconf >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"autoconf\""; read -p "Press [Enter] to continue..."; exit 1; } -type automake >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"automake\""; read -p "Press [Enter] to continue..."; exit 1; } -type libtool >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"libtool\""; read -p "Press [Enter] to continue..."; exit 1; } -type m4 >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"m4\""; read -p "Press [Enter] to continue..."; exit 1; } -type wget >> "$DIR/install.log" 2>&1 || type curl >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"wget\" or \"curl\""; read -p "Press [Enter] to continue..."; exit 1; } -type getconf >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"getconf\""; read -p "Press [Enter] to continue..."; exit 1; } - -#Needed to use aliases -shopt -s expand_aliases -type wget >> "$DIR/install.log" 2>&1 -if [ $? -eq 0 ]; then - alias download_file="wget --no-check-certificate -q -O -" -else - type curl >> "$DIR/install.log" 2>&1 - if [ $? -eq 0 ]; then - alias download_file="curl --insecure --silent --location" - else - echo "error, curl or wget not found" - fi -fi - -export CC="gcc" -COMPILE_FOR_ANDROID=no -RANLIB=ranlib -HAVE_MYSQLI="--enable-embedded-mysqli --enable-mysqlnd --with-mysqli=mysqlnd" -COMPILE_TARGET="" -COMPILE_OPENSSL="no" -COMPILE_CURL="default" -COMPILE_FANCY="no" -HAS_ZEPHIR="no" -IS_CROSSCOMPILE="no" -IS_WINDOWS="no" -DO_OPTIMIZE="no" -DO_STATIC="no" -while getopts "::t:oj:srcxzff:" OPTION; do - - case $OPTION in - t) - echo "[opt] Set target to $OPTARG" - COMPILE_TARGET="$OPTARG" - ;; - j) - echo "[opt] Set make threads to $OPTARG" - THREADS="$OPTARG" - ;; - o) - echo "[opt] Will compile OpenSSL" - COMPILE_OPENSSL="yes" - ;; - r) - echo "[opt] Will compile readline and ncurses" - COMPILE_FANCY="yes" - ;; - c) - echo "[opt] Will force compile cURL" - COMPILE_CURL="yes" - ;; - x) - echo "[opt] Doing cross-compile" - IS_CROSSCOMPILE="yes" - ;; - s) - echo "[opt] Will compile everything statically" - DO_STATIC="yes" - ;; - z) - echo "[opt] Will add PocketMine C PHP extension" - HAS_ZEPHIR="yes" - ;; - f) - echo "[opt] Enabling abusive optimizations..." - DO_OPTIMIZE="yes" - ffast_math="-fno-math-errno -funsafe-math-optimizations -fno-signed-zeros -fno-trapping-math -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fcx-limited-range" #workaround SQLite3 fail - CFLAGS="$CFLAGS -O2 -DSQLITE_HAVE_ISNAN $ffast_math -funsafe-loop-optimizations -fomit-frame-pointer -frename-registers -funswitch-loops -fpredictive-commoning -ftree-vectorize -ftracer -ftree-loop-im -fivopts" - if [ "$OPTARG" == "arm" ]; then - CFLAGS="$CFLAGS -mfloat-abi=softfp -mfpu=vfp" - elif [ "$OPTARG" == "x86_64" ]; then - CFLAGS="$CFLAGS -mmx -msse -msse2 -msse3 -mfpmath=sse -free -msahf -ftree-parallelize-loops=4" - elif [ "$OPTARG" == "x86" ]; then - CFLAGS="$CFLAGS -mmx -msse -msse2 -mfpmath=sse -m128bit-long-double -malign-double -ftree-parallelize-loops=4" - fi - ;; - \?) - echo "Invalid option: -$OPTION$OPTARG" >&2 - exit 1 - ;; - esac -done - -GMP_ABI="" - -if [ "$IS_CROSSCOMPILE" == "yes" ]; then - if [ "$COMPILE_TARGET" == "win" ] || [ "$COMPILE_TARGET" == "win32" ]; then - TOOLCHAIN_PREFIX="i686-w64-mingw32" - [ -z "$march" ] && march=i686; - [ -z "$mtune" ] && mtune=pentium4; - CFLAGS="$CFLAGS -mconsole" - export CC="$TOOLCHAIN_PREFIX-gcc" - CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --target=$TOOLCHAIN_PREFIX --build=$TOOLCHAIN_PREFIX" - OPENSSL_TARGET="mingw" - IS_WINDOWS="yes" - GMP_ABI="32" - echo "[INFO] Cross-compiling for Windows 32-bit" - elif [ "$COMPILE_TARGET" == "win64" ]; then - TOOLCHAIN_PREFIX="x86_64-w64-mingw32" - [ -z "$march" ] && march=x86_64; - [ -z "$mtune" ] && mtune=nocona; - CFLAGS="$CFLAGS -mconsole" - export CC="$TOOLCHAIN_PREFIX-gcc" - CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --target=$TOOLCHAIN_PREFIX --build=$TOOLCHAIN_PREFIX" - OPENSSL_TARGET="mingw" - IS_WINDOWS="yes" - GMP_ABI="64" - echo "[INFO] Cross-compiling for Windows 64-bit" - elif [ "$COMPILE_TARGET" == "android" ] || [ "$COMPILE_TARGET" == "android-armv6" ]; then - COMPILE_FOR_ANDROID=yes - [ -z "$march" ] && march=armv6; - [ -z "$mtune" ] && mtune=arm1136jf-s; - TOOLCHAIN_PREFIX="arm-unknown-linux-uclibcgnueabi" - export CC="$TOOLCHAIN_PREFIX-gcc" - CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --enable-static-link --disable-ipv6" - CFLAGS="-uclibc -static $CFLAGS" - LDFLAGS="-static" - echo "[INFO] Cross-compiling for Android ARMv6" - OPENSSL_TARGET="android" - elif [ "$COMPILE_TARGET" == "android-armv7" ]; then - COMPILE_FOR_ANDROID=yes - [ -z "$march" ] && march=armv7-a; - [ -z "$mtune" ] && mtune=cortex-a8; - TOOLCHAIN_PREFIX="arm-unknown-linux-uclibcgnueabi" - export CC="$TOOLCHAIN_PREFIX-gcc" - CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --enable-static-link --disable-ipv6" - CFLAGS="-uclibc -static $CFLAGS" - LDFLAGS="-static" - echo "[INFO] Cross-compiling for Android ARMv7" - OPENSSL_TARGET="android-armv7" - elif [ "$COMPILE_TARGET" == "rpi" ]; then - TOOLCHAIN_PREFIX="arm-linux-gnueabihf" - [ -z "$march" ] && march=armv6zk; - [ -z "$mtune" ] && mtune=arm1176jzf-s; - CFLAGS="$CFLAGS -mfloat-abi=hard -mfpu=vfp"; - if [ "$DO_OPTIMIZE" == "yes" ]; then - CFLAGS="$CFLAGS -mfloat-abi=hard -mfpu=vfp" - fi - export CC="$TOOLCHAIN_PREFIX-gcc" - CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX" - [ -z "$CFLAGS" ] && CFLAGS="-uclibc"; - OPENSSL_TARGET="linux-armv4" - echo "[INFO] Cross-compiling for Raspberry Pi ARMv6zk hard float" - elif [ "$COMPILE_TARGET" == "mac" ]; then - [ -z "$march" ] && march=prescott; - [ -z "$mtune" ] && mtune=generic; - CFLAGS="$CFLAGS -fomit-frame-pointer"; - TOOLCHAIN_PREFIX="i686-apple-darwin10" - export CC="$TOOLCHAIN_PREFIX-gcc" - CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX" - #zlib doesn't use the correct ranlib - RANLIB=$TOOLCHAIN_PREFIX-ranlib - OPENSSL_TARGET="darwin64-x86_64-cc" - CFLAGS="$CFLAGS -Qunused-arguments -Wno-error=unused-command-line-argument-hard-error-in-future" - ARCHFLAGS="-Wno-error=unused-command-line-argument-hard-error-in-future" - GMP_ABI="32" - echo "[INFO] Cross-compiling for Intel MacOS" - elif [ "$COMPILE_TARGET" == "ios" ] || [ "$COMPILE_TARGET" == "ios-armv6" ]; then - [ -z "$march" ] && march=armv6; - [ -z "$mtune" ] && mtune=arm1176jzf-s; - TOOLCHAIN_PREFIX="arm-apple-darwin10" - export CC="$TOOLCHAIN_PREFIX-gcc" - CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --target=$TOOLCHAIN_PREFIX -miphoneos-version-min=4.2" - OPENSSL_TARGET="BSD-generic32" - elif [ "$COMPILE_TARGET" == "ios-armv7" ]; then - [ -z "$march" ] && march=armv7-a; - [ -z "$mtune" ] && mtune=cortex-a8; - TOOLCHAIN_PREFIX="arm-apple-darwin10" - export CC="$TOOLCHAIN_PREFIX-gcc" - CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --target=$TOOLCHAIN_PREFIX -miphoneos-version-min=4.2" - OPENSSL_TARGET="BSD-generic32" - if [ "$DO_OPTIMIZE" == "yes" ]; then - CFLAGS="$CFLAGS -mfpu=neon" - fi - else - echo "Please supply a proper platform [android android-armv6 android-armv7 rpi mac ios ios-armv6 ios-armv7 win win32 win64] to cross-compile" - exit 1 - fi -elif [ "$COMPILE_TARGET" == "linux" ] || [ "$COMPILE_TARGET" == "linux32" ]; then - [ -z "$march" ] && march=i686; - [ -z "$mtune" ] && mtune=pentium4; - CFLAGS="$CFLAGS -m32"; - OPENSSL_TARGET="linux-generic32" - GMP_ABI="32" - echo "[INFO] Compiling for Linux x86" -elif [ "$COMPILE_TARGET" == "linux64" ]; then - [ -z "$march" ] && march=x86-64; - [ -z "$mtune" ] && mtune=nocona; - CFLAGS="$CFLAGS -m64" - OPENSSL_TARGET="linux-x86_64" - GMP_ABI="64" - echo "[INFO] Compiling for Linux x86_64" -elif [ "$COMPILE_TARGET" == "rpi" ]; then - [ -z "$march" ] && march=armv6zk; - [ -z "$mtune" ] && mtune=arm1176jzf-s; - CFLAGS="$CFLAGS -mfloat-abi=hard -mfpu=vfp"; - OPENSSL_TARGET="linux-armv4" - echo "[INFO] Compiling for Raspberry Pi ARMv6zk hard float" -elif [ "$COMPILE_TARGET" == "mac" ] || [ "$COMPILE_TARGET" == "mac32" ]; then - [ -z "$march" ] && march=prescott; - [ -z "$mtune" ] && mtune=generic; - CFLAGS="$CFLAGS -m32 -arch i386 -fomit-frame-pointer -mmacosx-version-min=10.5"; - LDFLAGS="$LDFLAGS -Wl,-rpath,@loader_path/../lib"; - export DYLD_LIBRARY_PATH="@loader_path/../lib" - OPENSSL_TARGET="darwin-i386-cc" - CFLAGS="$CFLAGS -Qunused-arguments -Wno-error=unused-command-line-argument-hard-error-in-future" - ARCHFLAGS="-Wno-error=unused-command-line-argument-hard-error-in-future" - GMP_ABI="32" - echo "[INFO] Compiling for Intel MacOS x86" -elif [ "$COMPILE_TARGET" == "mac64" ]; then - [ -z "$march" ] && march=core2; - [ -z "$mtune" ] && mtune=generic; - CFLAGS="$CFLAGS -m64 -arch x86_64 -fomit-frame-pointer -mmacosx-version-min=10.5"; - LDFLAGS="$LDFLAGS -Wl,-rpath,@loader_path/../lib"; - export DYLD_LIBRARY_PATH="@loader_path/../lib" - OPENSSL_TARGET="darwin64-x86_64-cc" - CFLAGS="$CFLAGS -Qunused-arguments -Wno-error=unused-command-line-argument-hard-error-in-future" - ARCHFLAGS="-Wno-error=unused-command-line-argument-hard-error-in-future" - GMP_ABI="64" - echo "[INFO] Compiling for Intel MacOS x86_64" -elif [ "$COMPILE_TARGET" == "ios" ]; then - [ -z "$march" ] && march=armv7-a; - [ -z "$mtune" ] && mtune=cortex-a8; - echo "[INFO] Compiling for iOS ARMv7" - OPENSSL_TARGET="linux-armv4" -elif [ -z "$CFLAGS" ]; then - if [ `getconf LONG_BIT` == "64" ]; then - echo "[INFO] Compiling for current machine using 64-bit" - CFLAGS="-m64 $CFLAGS" - OPENSSL_TARGET="linux-x86_64" - GMP_ABI="64" - else - echo "[INFO] Compiling for current machine using 32-bit" - CFLAGS="-m32 $CFLAGS" - OPENSSL_TARGET="linux-generic32" - GMP_ABI="32" - fi -fi - -echo "#include \ -int main(void){ \ - printf("Hello world\n"); \ - return 0; \ -}" > test.c - - -type $CC >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"$CC\""; read -p "Press [Enter] to continue..."; exit 1; } - -[ -z "$THREADS" ] && THREADS=1; -[ -z "$march" ] && march=native; -[ -z "$mtune" ] && mtune=native; -[ -z "$CFLAGS" ] && CFLAGS=""; -[ -z "$LDFLAGS" ] && LDFLAGS="-Wl,-rpath='\$\$ORIGIN/../lib'"; -[ -z "$CONFIGURE_FLAGS" ] && CONFIGURE_FLAGS=""; - - -if [ "$mtune" != "none" ]; then - $CC -march=$march -mtune=$mtune $CFLAGS -o test test.c >> "$DIR/install.log" 2>&1 - if [ $? -eq 0 ]; then - CFLAGS="-march=$march -mtune=$mtune -fno-gcse $CFLAGS" - fi -else - $CC -march=$march $CFLAGS -o test test.c >> "$DIR/install.log" 2>&1 - if [ $? -eq 0 ]; then - CFLAGS="-march=$march -fno-gcse $CFLAGS" - fi -fi - -rm test.* >> "$DIR/install.log" 2>&1 -rm test >> "$DIR/install.log" 2>&1 - -export CFLAGS="-O2 -fPIC $CFLAGS" -export LDFLAGS="$LDFLAGS" - -rm -r -f install_data/ >> "$DIR/install.log" 2>&1 -rm -r -f bin/ >> "$DIR/install.log" 2>&1 -mkdir -m 0755 install_data >> "$DIR/install.log" 2>&1 -mkdir -m 0755 bin >> "$DIR/install.log" 2>&1 -mkdir -m 0755 bin/php5 >> "$DIR/install.log" 2>&1 -cd install_data -set -e - -#PHP 5 -echo -n "[PHP] downloading $PHP_VERSION..." -download_file "http://php.net/get/php-$PHP_VERSION.tar.gz/from/this/mirror" | tar -zx >> "$DIR/install.log" 2>&1 -mv php-$PHP_VERSION php -echo " done!" - -if [ "$COMPILE_FANCY" == "yes" ]; then - if [ "$DO_STATIC" == "yes" ]; then - EXTRA_FLAGS="--without-shared --with-static" - else - EXTRA_FLAGS="--with-shared --without-static" - fi - #ncurses - echo -n "[ncurses] downloading $NCURSES_VERSION..." - download_file "http://ftp.gnu.org/gnu/ncurses/ncurses-$NCURSES_VERSION.tar.gz" | tar -zx >> "$DIR/install.log" 2>&1 - mv ncurses-$NCURSES_VERSION ncurses - echo -n " checking..." - cd ncurses - ./configure --prefix="$DIR/bin/php5" \ - --without-ada \ - --without-manpages \ - --without-progs \ - --without-tests \ - --with-normal \ - --with-pthread \ - --without-debug \ - $EXTRA_FLAGS \ - $CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1 - echo -n " compiling..." - make -j $THREADS >> "$DIR/install.log" 2>&1 - echo -n " installing..." - make install >> "$DIR/install.log" 2>&1 - echo -n " cleaning..." - cd .. - rm -r -f ./ncurses - echo " done!" - HAVE_NCURSES="--with-ncurses=$DIR/bin/php5" - - if [ "$DO_STATIC" == "yes" ]; then - EXTRA_FLAGS="--enable-shared=no --enable-static=yes" - else - EXTRA_FLAGS="--enable-shared=yes --enable-static=no" - fi - #readline - set +e - echo -n "[readline] downloading $READLINE_VERSION..." - download_file "http://ftp.gnu.org/gnu/readline/readline-$READLINE_VERSION.tar.gz" | tar -zx >> "$DIR/install.log" 2>&1 - mv readline-$READLINE_VERSION readline - echo -n " checking..." - cd readline - ./configure --prefix="$DIR/bin/php5" \ - --with-curses="$DIR/bin/php5" \ - --enable-multibyte \ - $EXTRA_FLAGS \ - $CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1 - echo -n " compiling..." - if make -j $THREADS >> "$DIR/install.log" 2>&1; then - echo -n " installing..." - make install >> "$DIR/install.log" 2>&1 - HAVE_READLINE="--with-readline=$DIR/bin/php5" - else - echo -n " disabling..." - HAVE_READLINE="--without-readline" - fi - echo -n " cleaning..." - cd .. - rm -r -f ./readline - echo " done!" - set -e -else - HAVE_NCURSES="--without-ncurses" - HAVE_READLINE="--without-readline" -fi - - -if [ "$DO_STATIC" == "yes" ]; then - EXTRA_FLAGS="--static" -else - EXTRA_FLAGS="--shared" -fi - -#zlib -echo -n "[zlib] downloading $ZLIB_VERSION..." -download_file "https://github.com/madler/zlib/archive/v$ZLIB_VERSION.tar.gz" | tar -zx >> "$DIR/install.log" 2>&1 -mv zlib-$ZLIB_VERSION zlib -echo -n " checking..." -cd zlib -RANLIB=$RANLIB ./configure --prefix="$DIR/bin/php5" \ -$EXTRA_FLAGS >> "$DIR/install.log" 2>&1 -echo -n " compiling..." -make -j $THREADS >> "$DIR/install.log" 2>&1 -echo -n " installing..." -make install >> "$DIR/install.log" 2>&1 -echo -n " cleaning..." -cd .. -rm -r -f ./zlib - if [ "$DO_STATIC" != "yes" ]; then - rm -f "$DIR/bin/php5/lib/libz.a" - fi -echo " done!" - -export jm_cv_func_working_malloc=yes -export ac_cv_func_malloc_0_nonnull=yes -export jm_cv_func_working_realloc=yes -export ac_cv_func_realloc_0_nonnull=yes - -#mcrypt -echo -n "[mcrypt] downloading $LIBMCRYPT_VERSION..." -download_file "http://sourceforge.net/projects/mcrypt/files/Libmcrypt/$LIBMCRYPT_VERSION/libmcrypt-$LIBMCRYPT_VERSION.tar.gz" | tar -zx >> "$DIR/install.log" 2>&1 -mv libmcrypt-$LIBMCRYPT_VERSION libmcrypt -echo -n " checking..." -cd libmcrypt -rm -f config.guess -download_file "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" > config.guess -rm -f config.sub -download_file "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" > config.sub -RANLIB=$RANLIB ./configure --prefix="$DIR/bin/php5" \ ---disable-posix-threads \ ---enable-static \ ---disable-shared \ -$CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1 -sed -i=".backup" 's,/* #undef malloc */,#undef malloc,' config.h -sed -i=".backup" 's,/* #undef realloc */,#undef realloc,' config.h -echo -n " compiling..." -make -j $THREADS >> "$DIR/install.log" 2>&1 -echo -n " installing..." -make install >> "$DIR/install.log" 2>&1 -echo -n " cleaning..." -cd .. -rm -r -f ./libmcrypt -echo " done!" - -if [ "$IS_CROSSCOMPILE" == "yes" ]; then - EXTRA_FLAGS="" -else - EXTRA_FLAGS="--disable-assembly" -fi - -#GMP -echo -n "[GMP] downloading $GMP_VERSION..." -download_file "https://gmplib.org/download/gmp/gmp-$GMP_VERSION.tar.bz2" | tar -jx >> "$DIR/install.log" 2>&1 -mv gmp-$GMP_VERSION_DIR gmp -echo -n " checking..." -cd gmp -RANLIB=$RANLIB ./configure --prefix="$DIR/bin/php5" \ -$EXTRA_FLAGS \ ---disable-posix-threads \ ---enable-static \ ---disable-shared \ -$CONFIGURE_FLAGS ABI="$GMP_ABI" >> "$DIR/install.log" 2>&1 -echo -n " compiling..." -make -j $THREADS >> "$DIR/install.log" 2>&1 -echo -n " installing..." -make install >> "$DIR/install.log" 2>&1 -echo -n " cleaning..." -cd .. -rm -r -f ./gmp -echo " done!" - -if [ "$COMPILE_OPENSSL" == "yes" ] || [ "$COMPILE_CURL" != "no" ] && [ "$IS_CROSSCOMPILE" != "yes" ]; then - #if [ "$DO_STATIC" == "yes" ]; then - # EXTRA_FLAGS="" - #else - # EXTRA_FLAGS="shared no-static" - #fi - EXTRA_FLAGS="shared no-static" - - - #OpenSSL - WITH_SSL="--with-ssl=$DIR/bin/php5" - WITH_OPENSSL="--with-openssl=$DIR/bin/php5" - echo -n "[OpenSSL] downloading $OPENSSL_VERSION..." - download_file "http://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz" | tar -zx >> "$DIR/install.log" 2>&1 - mv openssl-$OPENSSL_VERSION openssl - echo -n " checking..." - cd openssl - RANLIB=$RANLIB ./Configure \ - $OPENSSL_TARGET \ - --prefix="$DIR/bin/php5" \ - --openssldir="$DIR/bin/php5" \ - zlib \ - zlib-dynamic \ - --with-zlib-lib="$DIR/bin/php5/lib" \ - --with-zlib-include="$DIR/bin/php5/include" \ - $EXTRA_FLAGS \ - no-ssl2 \ - no-asm \ - no-hw \ - no-engines \ - $CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1 - echo -n " compiling..." - make depend >> "$DIR/install.log" 2>&1 - make >> "$DIR/install.log" 2>&1 - echo -n " installing..." - make install >> "$DIR/install.log" 2>&1 - echo -n " cleaning..." - cd .. - rm -r -f ./openssh - if [ "$DO_STATIC" != "yes" ]; then - rm -f "$DIR/bin/php5/lib/libcrypto.a" "$DIR/bin/php5/lib/libssl.a" - fi - echo " done!" -else - WITH_SSL="--with-ssl" - WITH_OPENSSL="--without-ssl" - if [ "$(uname -s)" == "Darwin" ] && [ "$COMPILE_TARGET" != "crosscompile" ]; then - WITH_SSL="--with-darwinssl" - fi -fi - -if [ "$(uname -s)" == "Darwin" ] && [ "$IS_CROSSCOMPILE" != "yes" ] && [ "$COMPILE_CURL" != "yes" ]; then - HAVE_CURL="shared,/usr" -else - if [ "$DO_STATIC" == "yes" ]; then - EXTRA_FLAGS="--enable-static --disable-shared" - else - EXTRA_FLAGS="--disable-static --enable-shared" - fi - - #curl - echo -n "[cURL] downloading $CURL_VERSION..." - download_file "https://github.com/bagder/curl/archive/$CURL_VERSION.tar.gz" | tar -zx >> "$DIR/install.log" 2>&1 - mv curl-$CURL_VERSION curl - echo -n " checking..." - cd curl - if [ ! -f ./configure ]; then - ./buildconf --force >> "$DIR/install.log" 2>&1 - fi - RANLIB=$RANLIB ./configure --disable-dependency-tracking \ - --enable-ipv6 \ - --enable-optimize \ - --enable-http \ - --enable-ftp \ - --disable-dict \ - --enable-file \ - --without-librtmp \ - --disable-gopher \ - --disable-imap \ - --disable-pop3 \ - --disable-rtsp \ - --disable-smtp \ - --disable-telnet \ - --disable-tftp \ - --disable-ldap \ - --disable-ldaps \ - --without-libidn \ - --with-zlib="$DIR/bin/php5" \ - $WITH_SSL \ - --enable-threaded-resolver \ - --prefix="$DIR/bin/php5" \ - $EXTRA_FLAGS \ - $CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1 - echo -n " compiling..." - make -j $THREADS >> "$DIR/install.log" 2>&1 - echo -n " installing..." - make install >> "$DIR/install.log" 2>&1 - echo -n " cleaning..." - cd .. - rm -r -f ./curl - echo " done!" - HAVE_CURL="$DIR/bin/php5" -fi - -# PECL libraries - -#pthreads -echo -n "[PHP pthreads] downloading $PTHREADS_VERSION..." -download_file "http://pecl.php.net/get/pthreads-$PTHREADS_VERSION.tgz" | tar -zx >> "$DIR/install.log" 2>&1 -mv pthreads-$PTHREADS_VERSION "$DIR/install_data/php/ext/pthreads" -echo " done!" - -HAS_POCKETMINE="" -if [ "$HAS_ZEPHIR" == "yes" ]; then - echo -n "[C PocketMine extension] downloading $PHP_POCKETMINE_VERSION..." - download_file https://github.com/PocketMine/PocketMine-MP-Zephir/archive/$PHP_POCKETMINE_VERSION.tar.gz | tar -zx >> "$DIR/install.log" 2>&1 - mv PocketMine-MP-Zephir-$PHP_POCKETMINE_VERSION/pocketmine/ext "$DIR/install_data/php/ext/pocketmine" - rm -r PocketMine-MP-Zephir-$PHP_POCKETMINE_VERSION/ - HAS_POCKETMINE="--enable-pocketmine" - echo " done!" -fi - -#uopz -#echo -n "[PHP uopz] downloading $UOPZ_VERSION..." -#download_file "http://pecl.php.net/get/uopz-$UOPZ_VERSION.tgz" | tar -zx >> "$DIR/install.log" 2>&1 -#mv uopz-$UOPZ_VERSION "$DIR/install_data/php/ext/uopz" -#echo " done!" - -#WeakRef -echo -n "[PHP Weakref] downloading $WEAKREF_VERSION..." -download_file "http://pecl.php.net/get/Weakref-$WEAKREF_VERSION.tgz" | tar -zx >> "$DIR/install.log" 2>&1 -mv Weakref-$WEAKREF_VERSION "$DIR/install_data/php/ext/weakref" -echo " done!" - -#PHP YAML -echo -n "[PHP YAML] downloading $PHPYAML_VERSION..." -download_file "http://pecl.php.net/get/yaml-$PHPYAML_VERSION.tgz" | tar -zx >> "$DIR/install.log" 2>&1 -mv yaml-$PHPYAML_VERSION "$DIR/install_data/php/ext/yaml" -echo " done!" - -#bcompiler -#echo -n "[bcompiler] downloading $BCOMPILER_VERSION..." -#download_file "http://pecl.php.net/get/bcompiler-$BCOMPILER_VERSION.tgz" | tar -zx >> "$DIR/install.log" 2>&1 -#mv bcompiler-$BCOMPILER_VERSION "$DIR/install_data/php/ext/bcompiler" -#echo " done!" - -#PHP ncurses -#echo -n "[PHP ncurses] downloading $PHPNCURSES_VERSION..." -#download_file "http://pecl.php.net/get/ncurses-$PHPNCURSES_VERSION.tgz" | tar -zx >> "$DIR/install.log" 2>&1 -#mv ncurses-$PHPNCURSES_VERSION "$DIR/install_data/php/ext/ncurses" -#echo " done!" - - -if [ "$DO_STATIC" == "yes" ]; then - EXTRA_FLAGS="--disable-shared --enable-static" -else - EXTRA_FLAGS="--enable-shared --disable-static" -fi -#YAML -echo -n "[YAML] downloading $YAML_VERSION..." -download_file "http://pyyaml.org/download/libyaml/yaml-$YAML_VERSION.tar.gz" | tar -zx >> "$DIR/install.log" 2>&1 -mv yaml-$YAML_VERSION yaml -echo -n " checking..." -cd yaml -RANLIB=$RANLIB ./configure \ ---prefix="$DIR/bin/php5" \ -$EXTRA_FLAGS \ -$CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1 -sed -i=".backup" 's/ tests win32/ win32/g' Makefile -echo -n " compiling..." -make -j $THREADS >> "$DIR/install.log" 2>&1 -echo -n " installing..." -make install >> "$DIR/install.log" 2>&1 -echo -n " cleaning..." -cd .. -rm -r -f ./yaml -echo " done!" - -if [ "$DO_STATIC" == "yes" ]; then - EXTRA_FLAGS="--enable-shared=no --enable-static=yes" -else - EXTRA_FLAGS="--enable-shared=yes --enable-static=no" -fi - -#libxml2 -#echo -n "[libxml2] downloading $LIBXML_VERSION..." -#download_file "ftp://xmlsoft.org/libxml2/libxml2-$LIBXML_VERSION.tar.gz" | tar -zx >> "$DIR/install.log" 2>&1 -#mv libxml2-$LIBXML_VERSION yaml -#echo -n " checking..." -#cd libxml2 -#RANLIB=$RANLIB ./configure \ -#--disable-ipv6 \ -#--with-libz="$DIR/bin/php5" \ -#--prefix="$DIR/bin/php5" \ -#$EXTRA_FLAGS \ -#$CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1 -#echo -n " compiling..." -#make -j $THREADS >> "$DIR/install.log" 2>&1 -#echo -n " installing..." -#make install >> "$DIR/install.log" 2>&1 -#echo -n " cleaning..." -#cd .. -#rm -r -f ./libxml2 -#echo " done!" - -echo -n "[PHP]" - -if [ "$DO_OPTIMIZE" != "no" ]; then - echo -n " enabling optimizations..." - PHP_OPTIMIZATION="--enable-inline-optimization " -else - PHP_OPTIMIZATION="--disable-inline-optimization " -fi -echo -n " checking..." -cd php -rm -f ./aclocal.m4 >> "$DIR/install.log" 2>&1 -rm -rf ./autom4te.cache/ >> "$DIR/install.log" 2>&1 -rm -f ./configure >> "$DIR/install.log" 2>&1 -./buildconf --force >> "$DIR/install.log" 2>&1 -if [ "$IS_CROSSCOMPILE" == "yes" ]; then - sed -i=".backup" 's/pthreads_working=no/pthreads_working=yes/' ./configure - if [ "$IS_WINDOWS" != "yes" ]; then - export LIBS="$LIBS -lpthread -ldl -lresolv" - else - export LIBS="$LIBS -lpthread" - fi - - mv ext/mysqlnd/config9.m4 ext/mysqlnd/config.m4 - sed -i=".backup" "s{ext/mysqlnd/php_mysqlnd_config.h{config.h{" ext/mysqlnd/mysqlnd_portability.h - CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-opcache=no" -fi - -if [ "$IS_WINDOWS" != "yes" ]; then - HAVE_PCNTL="--enable-pcntl" -else - HAVE_PCNTL="--disable-pcntl" - cp -f ./win32/build/config.* ./main >> "$DIR/install.log" 2>&1 - sed 's:@PREFIX@:$DIR/bin/php5:' ./main/config.w32.h.in > ./wmain/config.w32.h 2>> "$DIR/install.log" -fi - -if [ "$(uname -s)" == "Darwin" ] && [ "$IS_CROSSCOMPILE" != "yes" ]; then - sed -i=".backup" 's/flock_type=unknown/flock_type=bsd/' ./configure - export EXTRA_CFLAGS=-lresolv -fi - -RANLIB=$RANLIB ./configure $PHP_OPTIMIZATION --prefix="$DIR/bin/php5" \ ---exec-prefix="$DIR/bin/php5" \ ---with-curl="$HAVE_CURL" \ ---with-zlib="$DIR/bin/php5" \ ---with-zlib-dir="$DIR/bin/php5" \ ---with-yaml="$DIR/bin/php5" \ ---with-mcrypt="$DIR/bin/php5" \ ---with-gmp="$DIR/bin/php5" \ -$HAVE_NCURSES \ -$HAVE_READLINE \ -$HAS_POCKETMINE \ ---enable-mbstring \ ---enable-calendar \ ---enable-weakref \ ---enable-pthreads \ ---enable-pthreads-pedantic \ ---disable-libxml \ ---disable-xml \ ---disable-dom \ ---disable-simplexml \ ---disable-xmlreader \ ---disable-xmlwriter \ ---disable-cgi \ ---disable-session \ ---disable-debug \ ---disable-pdo \ ---without-pear \ ---without-iconv \ ---without-pdo-sqlite \ ---with-pic \ ---enable-phar \ ---enable-ctype \ ---enable-sockets \ ---enable-shared=no \ ---enable-static=yes \ ---enable-shmop \ ---enable-maintainer-zts \ ---disable-short-tags \ ---enable-zend-signals \ -$HAVE_PCNTL \ -$HAVE_MYSQLI \ ---enable-bcmath \ ---enable-cli \ ---enable-zip \ ---enable-ftp \ ---with-zend-vm=$ZEND_VM \ -$CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1 -echo -n " compiling..." -if [ "$COMPILE_FOR_ANDROID" == "yes" ]; then - sed -i=".backup" 's/-export-dynamic/-all-static/g' Makefile -fi -sed -i=".backup" 's/PHP_BINARIES. pharcmd$/PHP_BINARIES)/g' Makefile -sed -i=".backup" 's/install-programs install-pharcmd$/install-programs/g' Makefile -make -j $THREADS >> "$DIR/install.log" 2>&1 -echo -n " installing..." -make install >> "$DIR/install.log" 2>&1 - -if [ "$(uname -s)" == "Darwin" ] && [ "$IS_CROSSCOMPILE" != "yes" ]; then - set +e - install_name_tool -delete_rpath "$DIR/bin/php5/lib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1 - install_name_tool -change "$DIR/bin/php5/lib/libz.1.dylib" "@loader_path/../lib/libz.1.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1 - install_name_tool -change "$DIR/bin/php5/lib/libcurl.4.dylib" "@loader_path/../lib/libcurl.4.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1 - install_name_tool -change "$DIR/bin/php5/lib/libyaml-0.2.dylib" "@loader_path/../lib/libyaml-0.2.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1 - install_name_tool -change "$DIR/bin/php5/lib/libreadline.$READLINE_VERSION.dylib" "@loader_path/../lib/libreadline.$READLINE_VERSION.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1 - install_name_tool -change "$DIR/bin/php5/lib/libhistory.$READLINE_VERSION.dylib" "@loader_path/../lib/libhistory.$READLINE_VERSION.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1 - install_name_tool -change "$DIR/bin/php5/lib/libform.6.0.dylib" "@loader_path/../lib/libform.6.0.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1 - install_name_tool -change "$DIR/bin/php5/lib/libmenu.6.0.dylib" "@loader_path/../lib/libmenu.6.0.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1 - install_name_tool -change "$DIR/bin/php5/lib/libncurses.6.0.dylib" "@loader_path/../lib/libncurses.6.0.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1 - install_name_tool -change "$DIR/bin/php5/lib/libpanel.6.0.dylib" "@loader_path/../lib/libpanel.6.0.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1 - install_name_tool -change "$DIR/bin/php5/lib/libssl.1.0.0.dylib" "@loader_path/../lib/libssl.1.0.0.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1 - install_name_tool -change "$DIR/bin/php5/lib/libssl.1.0.0.dylib" "@loader_path/../lib/libssl.1.0.0.dylib" "$DIR/bin/php5/lib/libcurl.4.dylib" >> "$DIR/install.log" 2>&1 - install_name_tool -change "$DIR/bin/php5/lib/libcrypto.1.0.0.dylib" "@loader_path/../lib/libcrypto.1.0.0.dylib" "$DIR/bin/php5/bin/php" >> "$DIR/install.log" 2>&1 - install_name_tool -change "$DIR/bin/php5/lib/libcrypto.1.0.0.dylib" "@loader_path/../lib/libcrypto.1.0.0.dylib" "$DIR/bin/php5/lib/libcurl.4.dylib" >> "$DIR/install.log" 2>&1 - chmod 0777 "$DIR/bin/php5/lib/libssl.1.0.0.dylib" >> "$DIR/install.log" 2>&1 - install_name_tool -change "$DIR/bin/php5/lib/libcrypto.1.0.0.dylib" "@loader_path/libcrypto.1.0.0.dylib" "$DIR/bin/php5/lib/libssl.1.0.0.dylib" >> "$DIR/install.log" 2>&1 - chmod 0755 "$DIR/bin/php5/lib/libssl.1.0.0.dylib" >> "$DIR/install.log" 2>&1 - set -e -fi - -echo -n " generating php.ini..." -trap - DEBUG -TIMEZONE=$(date +%Z) -echo "date.timezone=$TIMEZONE" > "$DIR/bin/php5/bin/php.ini" -echo "short_open_tag=0" >> "$DIR/bin/php5/bin/php.ini" -echo "asp_tags=0" >> "$DIR/bin/php5/bin/php.ini" -echo "phar.readonly=0" >> "$DIR/bin/php5/bin/php.ini" -echo "phar.require_hash=1" >> "$DIR/bin/php5/bin/php.ini" -#echo "zend_extension=uopz.so" >> "$DIR/bin/php5/bin/php.ini" -if [ "$IS_CROSSCOMPILE" != "crosscompile" ]; then - echo "zend_extension=opcache.so" >> "$DIR/bin/php5/bin/php.ini" - echo "opcache.enable=1" >> "$DIR/bin/php5/bin/php.ini" - echo "opcache.enable_cli=1" >> "$DIR/bin/php5/bin/php.ini" - echo "opcache.save_comments=0" >> "$DIR/bin/php5/bin/php.ini" - echo "opcache.fast_shutdown=1" >> "$DIR/bin/php5/bin/php.ini" - echo "opcache.max_accelerated_files=4096" >> "$DIR/bin/php5/bin/php.ini" - echo "opcache.interned_strings_buffer=8" >> "$DIR/bin/php5/bin/php.ini" - echo "opcache.memory_consumption=128" >> "$DIR/bin/php5/bin/php.ini" - echo "opcache.optimization_level=0xffffffff" >> "$DIR/bin/php5/bin/php.ini" -fi -if [ "$HAVE_CURL" == "shared,/usr" ]; then - echo "extension=curl.so" >> "$DIR/bin/php5/bin/php.ini" -fi - -echo " done!" -cd "$DIR" -echo -n "[INFO] Cleaning up..." -rm -r -f install_data/ >> "$DIR/install.log" 2>&1 -rm -f bin/php5/bin/curl* >> "$DIR/install.log" 2>&1 -rm -f bin/php5/bin/curl-config* >> "$DIR/install.log" 2>&1 -rm -f bin/php5/bin/c_rehash* >> "$DIR/install.log" 2>&1 -rm -f bin/php5/bin/openssl* >> "$DIR/install.log" 2>&1 -rm -r -f bin/php5/man >> "$DIR/install.log" 2>&1 -rm -r -f bin/php5/php >> "$DIR/install.log" 2>&1 -rm -r -f bin/php5/misc >> "$DIR/install.log" 2>&1 -date >> "$DIR/install.log" 2>&1 -echo " done!" -echo "[PocketMine] You should start the server now using \"./start.sh.\"" -echo "[PocketMine] If it doesn't work, please send the \"install.log\" file to the Bug Tracker." diff --git a/src/build/installer.sh b/src/build/installer.sh deleted file mode 100644 index bb911badf..000000000 --- a/src/build/installer.sh +++ /dev/null @@ -1,276 +0,0 @@ -#!/bin/bash -PMMP_VERSION="" -LINUX_32_BUILD="PHP_5.5.14_x86_Linux" -LINUX_64_BUILD="PHP_5.5.14_x86-64_Linux" -MAC_32_BUILD="PHP_5.5.14_x86_MacOS" -MAC_64_BUILD="PHP_5.5.14_x86-64_MacOS" -RPI_BUILD="PHP_5.5.14_ARM_Raspbian_hard" -# Temporal build -ODROID_BUILD="PHP_5.5.14_ARM_Raspbian_hard" -AND_BUILD="PHP_5.5.13_ARMv7_Android" -IOS_BUILD="PHP_5.5.13_ARMv6_iOS" -update=off -forcecompile=off -alldone=no - -#Needed to use aliases -shopt -s expand_aliases -type wget > /dev/null 2>&1 -if [ $? -eq 0 ]; then - alias download_file="wget --no-check-certificate -q -O -" -else - type curl >> /dev/null 2>&1 - if [ $? -eq 0 ]; then - alias download_file="curl --insecure --silent --location" - else - echo "error, curl or wget not found" - fi -fi - - -while getopts "ucdv:" opt; do - case $opt in - u) - update=on - ;; - c) - forcecompile=on - ;; - d) - PMMP_VERSION="master" - ;; - v) - PMMP_VERSION="$OPTARG" - ;; - \?) - echo "Invalid option: -$OPTARG" >&2 - exit 1 - ;; - esac -done - -if [ "$PMMP_VERSION" == "" ]; then - PMMP_VERSION=$(download_file "https://api.github.com/repos/PocketMine/PocketMine-MP/tags" | grep '"name": "[A-Za-z0-9_\.]*",' | head -1 | sed -r 's/[ ]*"name": "([A-Za-z0-9_\.]*)",[ ]*/\1/') - if [ "$PMMP_VERSION" == "" ]; then - echo "[ERROR] Couldn't get the latest PocketMine-MP version" - exit 1 - fi -fi - -echo "[INFO] PocketMine-MP $PMMP_VERSION downloader & installer for Linux & Mac" - -echo "[1/3] Cleaning..." -rm -r -f src/ -rm -f PocketMine-MP.php -rm -f README.md -rm -f CONTRIBUTING.md -rm -f LICENSE -rm -f start.sh -rm -f start.bat -echo "[2/3] Downloading PocketMine-MP $PMMP_VERSION..." -set +e -download_file "https://github.com/PocketMine/PocketMine-MP/releases/download/$PMMP_VERSION/PocketMine-MP.phar" > PocketMine-MP.phar -if ! [ -s "PocketMine-MP.phar" ] || [ "$(head -n 1 PocketMine-MP.phar)" == '' ]; then - rm "PocketMine-MP.phar" > /dev/null - download_file "https://github.com/PocketMine/PocketMine-MP/archive/$PMMP_VERSION.tar.gz" | tar -zx > /dev/null - COMPILE_SCRIPT="./src/build/compile.sh" - mv -f PocketMine-MP-$PMMP_VERSION/* ./ - rm -f -r PocketMine-MP-$PMMP_VERSION/ - rm -f ./start.cmd -else - download_file "https://raw.githubusercontent.com/PocketMine/PocketMine-MP/$PMMP_VERSION/start.sh" > start.sh - download_file "https://raw.githubusercontent.com/PocketMine/PocketMine-MP/$PMMP_VERSION/src/build/compile.sh" > compile.sh - COMPILE_SCRIPT="./compile.sh" -fi - -chmod +x "$COMPILE_SCRIPT" -chmod +x ./start.sh -if [ "$update" == "on" ]; then - echo "[3/3] Skipping PHP recompilation due to user request" -else - echo -n "[3/3] Obtaining PHP:" - echo " detecting if build is available..." - if [ "$forcecompile" == "off" ] && [ "$(uname -s)" == "Darwin" ]; then - set +e - UNAME_M=$(uname -m) - IS_IOS=$(expr match $UNAME_M 'iP[a-zA-Z0-9,]*' 2> /dev/null) - set -e - if [[ "$IS_IOS" -gt 0 ]]; then - rm -r -f bin/ >> /dev/null 2>&1 - echo -n "[3/3] iOS PHP build available, downloading $IOS_BUILD.tar.gz..." - download_file "http://sourceforge.net/projects/pocketmine/files/builds/$IOS_BUILD.tar.gz" | tar -zx > /dev/null 2>&1 - chmod +x ./bin/php5/bin/* - echo -n " checking..." - if [ $(./bin/php5/bin/php -r 'echo "yes";' 2>/dev/null) == "yes" ]; then - echo -n " regenerating php.ini..." - TIMEZONE=$(date +%Z) - echo "" > "./bin/php5/bin/php.ini" - #UOPZ_PATH="$(find $(pwd) -name uopz.so)" - #echo "zend_extension=\"$UOPZ_PATH\"" >> "./bin/php5/bin/php.ini" - echo "date.timezone=$TIMEZONE" >> "./bin/php5/bin/php.ini" - echo "short_open_tag=0" >> "./bin/php5/bin/php.ini" - echo "asp_tags=0" >> "./bin/php5/bin/php.ini" - echo "phar.readonly=0" >> "./bin/php5/bin/php.ini" - echo "phar.require_hash=1" >> "./bin/php5/bin/php.ini" - echo " done" - alldone=yes - else - echo " invalid build detected" - fi - else - rm -r -f bin/ >> /dev/null 2>&1 - if [ `getconf LONG_BIT` == "64" ]; then - echo -n "[3/3] MacOS 64-bit PHP build available, downloading $MAC_64_BUILD.tar.gz..." - MAC_BUILD="$MAC_64_BUILD" - else - echo -n "[3/3] MacOS 32-bit PHP build available, downloading $MAC_32_BUILD.tar.gz..." - MAC_BUILD="$MAC_32_BUILD" - fi - download_file "http://sourceforge.net/projects/pocketmine/files/builds/$MAC_BUILD.tar.gz" | tar -zx > /dev/null 2>&1 - chmod +x ./bin/php5/bin/* - echo -n " checking..." - if [ $(./bin/php5/bin/php -r 'echo "yes";' 2>/dev/null) == "yes" ]; then - echo -n " regenerating php.ini..." - TIMEZONE=$(date +%Z) - OPCACHE_PATH="$(find $(pwd) -name opcache.so)" - echo "" > "./bin/php5/bin/php.ini" - #UOPZ_PATH="$(find $(pwd) -name uopz.so)" - #echo "zend_extension=\"$UOPZ_PATH\"" >> "./bin/php5/bin/php.ini" - echo "zend_extension=\"$OPCACHE_PATH\"" >> "./bin/php5/bin/php.ini" - echo "opcache.enable=1" >> "./bin/php5/bin/php.ini" - echo "opcache.enable_cli=1" >> "./bin/php5/bin/php.ini" - echo "opcache.save_comments=0" >> "./bin/php5/bin/php.ini" - echo "opcache.fast_shutdown=1" >> "./bin/php5/bin/php.ini" - echo "opcache.max_accelerated_files=4096" >> "./bin/php5/bin/php.ini" - echo "opcache.interned_strings_buffer=8" >> "./bin/php5/bin/php.ini" - echo "opcache.memory_consumption=128" >> "./bin/php5/bin/php.ini" - echo "opcache.optimization_level=0xffffffff" >> "./bin/php5/bin/php.ini" - echo "date.timezone=$TIMEZONE" >> "./bin/php5/bin/php.ini" - echo "short_open_tag=0" >> "./bin/php5/bin/php.ini" - echo "asp_tags=0" >> "./bin/php5/bin/php.ini" - echo "phar.readonly=0" >> "./bin/php5/bin/php.ini" - echo "phar.require_hash=1" >> "./bin/php5/bin/php.ini" - echo " done" - alldone=yes - else - echo " invalid build detected" - fi - fi - else - grep -q BCM2708 /proc/cpuinfo > /dev/null 2>&1 - IS_RPI=$? - grep -q ODROID /proc/cpuinfo > /dev/null 2>&1 - IS_ODROID=$? - if [ "$IS_RPI" -eq 0 ] && [ "$forcecompile" == "off" ]; then - rm -r -f bin/ >> /dev/null 2>&1 - echo -n "[3/3] Raspberry Pi PHP build available, downloading $RPI_BUILD.tar.gz..." - download_file "http://sourceforge.net/projects/pocketmine/files/builds/$RPI_BUILD.tar.gz" | tar -zx > /dev/null 2>&1 - chmod +x ./bin/php5/bin/* - echo -n " checking..." - if [ $(./bin/php5/bin/php -r 'echo "yes";' 2>/dev/null) == "yes" ]; then - echo -n " regenerating php.ini..." - TIMEZONE=$(date +%Z) - OPCACHE_PATH="$(find $(pwd) -name opcache.so)" - echo "" > "./bin/php5/bin/php.ini" - #UOPZ_PATH="$(find $(pwd) -name uopz.so)" - #echo "zend_extension=\"$UOPZ_PATH\"" >> "./bin/php5/bin/php.ini" - echo "zend_extension=\"$OPCACHE_PATH\"" >> "./bin/php5/bin/php.ini" - echo "opcache.enable=1" >> "./bin/php5/bin/php.ini" - echo "opcache.enable_cli=1" >> "./bin/php5/bin/php.ini" - echo "opcache.save_comments=0" >> "./bin/php5/bin/php.ini" - echo "opcache.fast_shutdown=1" >> "./bin/php5/bin/php.ini" - echo "opcache.max_accelerated_files=4096" >> "./bin/php5/bin/php.ini" - echo "opcache.interned_strings_buffer=8" >> "./bin/php5/bin/php.ini" - echo "opcache.memory_consumption=128" >> "./bin/php5/bin/php.ini" - echo "opcache.optimization_level=0xffffffff" >> "./bin/php5/bin/php.ini" - echo "date.timezone=$TIMEZONE" >> "./bin/php5/bin/php.ini" - echo "short_open_tag=0" >> "./bin/php5/bin/php.ini" - echo "asp_tags=0" >> "./bin/php5/bin/php.ini" - echo "phar.readonly=0" >> "./bin/php5/bin/php.ini" - echo "phar.require_hash=1" >> "./bin/php5/bin/php.ini" - echo " done" - alldone=yes - else - echo " invalid build detected" - fi - elif [ "$IS_ODROID" -eq 0 ] && [ "$forcecompile" == "off" ]; then - rm -r -f bin/ >> /dev/null 2>&1 - echo -n "[3/3] ODROID PHP build available, downloading $ODROID_BUILD.tar.gz..." - download_file "http://sourceforge.net/projects/pocketmine/files/builds/$ODROID_BUILD.tar.gz" | tar -zx > /dev/null 2>&1 - chmod +x ./bin/php5/bin/* - echo -n " checking..." - if [ $(./bin/php5/bin/php -r 'echo "yes";' 2>/dev/null) == "yes" ]; then - echo -n " regenerating php.ini..." - OPCACHE_PATH="$(find $(pwd) -name opcache.so)" - echo "" > "./bin/php5/bin/php.ini" - #UOPZ_PATH="$(find $(pwd) -name uopz.so)" - #echo "zend_extension=\"$UOPZ_PATH\"" >> "./bin/php5/bin/php.ini" - echo "zend_extension=\"$OPCACHE_PATH\"" >> "./bin/php5/bin/php.ini" - echo "opcache.enable=1" >> "./bin/php5/bin/php.ini" - echo "opcache.enable_cli=1" >> "./bin/php5/bin/php.ini" - echo "opcache.save_comments=0" >> "./bin/php5/bin/php.ini" - echo "opcache.fast_shutdown=1" >> "./bin/php5/bin/php.ini" - echo "opcache.max_accelerated_files=4096" >> "./bin/php5/bin/php.ini" - echo "opcache.interned_strings_buffer=8" >> "./bin/php5/bin/php.ini" - echo "opcache.memory_consumption=128" >> "./bin/php5/bin/php.ini" - echo "opcache.optimization_level=0xffffffff" >> "./bin/php5/bin/php.ini" - echo "date.timezone=$TIMEZONE" >> "./bin/php5/bin/php.ini" - echo "short_open_tag=0" >> "./bin/php5/bin/php.ini" - echo "asp_tags=0" >> "./bin/php5/bin/php.ini" - echo "phar.readonly=0" >> "./bin/php5/bin/php.ini" - echo "phar.require_hash=1" >> "./bin/php5/bin/php.ini" - echo " done" - alldone=yes - else - echo " invalid build detected" - fi - elif [ "$forcecompile" == "off" ] && [ "$(uname -s)" == "Linux" ]; then - rm -r -f bin/ >> /dev/null 2>&1 - if [ `getconf LONG_BIT` = "64" ]; then - echo -n "[3/3] Linux 64-bit PHP build available, downloading $LINUX_64_BUILD.tar.gz..." - LINUX_BUILD="$LINUX_64_BUILD" - else - echo -n "[3/3] Linux 32-bit PHP build available, downloading $LINUX_32_BUILD.tar.gz..." - LINUX_BUILD="$LINUX_32_BUILD" - fi - download_file "http://sourceforge.net/projects/pocketmine/files/builds/$LINUX_BUILD.tar.gz" | tar -zx > /dev/null 2>&1 - chmod +x ./bin/php5/bin/* - echo -n " checking..." - if [ $(./bin/php5/bin/php -r 'echo "yes";' 2>/dev/null) == "yes" ]; then - echo -n " regenerating php.ini..." - OPCACHE_PATH="$(find $(pwd) -name opcache.so)" - echo "" > "./bin/php5/bin/php.ini" - #UOPZ_PATH="$(find $(pwd) -name uopz.so)" - #echo "zend_extension=\"$UOPZ_PATH\"" >> "./bin/php5/bin/php.ini" - echo "zend_extension=\"$OPCACHE_PATH\"" >> "./bin/php5/bin/php.ini" - echo "opcache.enable=1" >> "./bin/php5/bin/php.ini" - echo "opcache.enable_cli=1" >> "./bin/php5/bin/php.ini" - echo "opcache.save_comments=0" >> "./bin/php5/bin/php.ini" - echo "opcache.fast_shutdown=1" >> "./bin/php5/bin/php.ini" - echo "opcache.max_accelerated_files=4096" >> "./bin/php5/bin/php.ini" - echo "opcache.interned_strings_buffer=8" >> "./bin/php5/bin/php.ini" - echo "opcache.memory_consumption=128" >> "./bin/php5/bin/php.ini" - echo "opcache.optimization_level=0xffffffff" >> "./bin/php5/bin/php.ini" - echo "date.timezone=$TIMEZONE" >> "./bin/php5/bin/php.ini" - echo "short_open_tag=0" >> "./bin/php5/bin/php.ini" - echo "asp_tags=0" >> "./bin/php5/bin/php.ini" - echo "phar.readonly=0" >> "./bin/php5/bin/php.ini" - echo "phar.require_hash=1" >> "./bin/php5/bin/php.ini" - echo " done" - alldone=yes - else - echo " invalid build detected" - fi - fi - if [ "$alldone" == "no" ]; then - set -e - echo "[3/3] no build found, compiling PHP" - exec "$COMPILE_SCRIPT" - fi - fi -fi -if [ "$COMPILE_SCRIPT" == "./compile.sh" ]; then - rm "$COMPILE_SCRIPT" -fi -echo "[INFO] Everything done! Run ./start.sh to start PocketMine-MP" -exit 0 diff --git a/src/build/jenkins.sh b/src/build/jenkins.sh deleted file mode 100644 index adf9b698b..000000000 --- a/src/build/jenkins.sh +++ /dev/null @@ -1,213 +0,0 @@ -#!/bin/bash -x -export PATH="/opt/arm-2013.05/bin:/opt/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin:/opt/arm-unknown-linux-uclibcgnueabi/bin:$PATH" -export THREADS=2 -PHP_VERSION="5.5.14" - -#Needed to use aliases -shopt -s expand_aliases -type wget > /dev/null 2>&1 -if [ $? -eq 0 ]; then - alias download_file="wget --no-check-certificate -q -O -" -else - type curl >> /dev/null 2>&1 - if [ $? -eq 0 ]; then - alias download_file="curl --insecure --silent --location" - else - echo "error, curl or wget not found" - fi -fi - -rm -rf $WORKSPACE/compile.sh -download_file "https://github.com/PocketMine/PocketMine-MP/raw/$BRANCH/src/build/compile.sh" > $WORKSPACE/compile.sh -chmod +x $WORKSPACE/compile.sh -SCRIPT="$WORKSPACE/compile.sh" -ARCHIVE="$WORKSPACE/archive" -COMPILEDIR="$WORKSPACE/compile" -rm -rf "$ARCHIVE" "$COMPILEDIR" -mkdir -p "$ARCHIVE" -mkdir -p "$COMPILEDIR" - -if [ "$COMPILE_LINUX_32BIT" = "true" ]; -then - mkdir -p {$COMPILEDIR,$ARCHIVE}/linux/32bit - cd $COMPILEDIR/linux/32bit - - $SCRIPT -t linux32 -o -j 2 -c $EXTRA_FLAGS -f x86 - - tar -czf PHP_${PHP_VERSION}_x86_Linux.tar.gz bin/ - cp -r $COMPILEDIR/linux/32bit/{install.log,PHP_${PHP_VERSION}_x86_Linux.tar.gz} $ARCHIVE/linux/32bit/ - if [ ! -f $COMPILEDIR/linux/32bit/bin/php5/bin/php ]; then - exit 1 - fi -fi - -if [ "$COMPILE_LINUX_64BIT" = "true" ]; -then - mkdir -p {$COMPILEDIR,$ARCHIVE}/linux/64bit - cd $COMPILEDIR/linux/64bit - - $SCRIPT -t linux64 -o -j 2 -c $EXTRA_FLAGS -f x86_64 - - tar -czf PHP_${PHP_VERSION}_x86-64_Linux.tar.gz bin/ - cp -r $COMPILEDIR/linux/64bit/{install.log,PHP_${PHP_VERSION}_x86-64_Linux.tar.gz} $ARCHIVE/linux/64bit/ - if [ ! -f $COMPILEDIR/linux/64bit/bin/php5/bin/php ]; then - exit 1 - fi -fi - -if [ "$COMPILE_MAC_32" = "true" ]; -then - mkdir -p {$COMPILEDIR,$ARCHIVE}/mac32 - cd $COMPILEDIR/mac32 - - curl -L http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz | tar -xz > /dev/null - cd libtool-2.4.2 - ./configure --prefix="$COMPILEDIR/mac/libtool" > /dev/null - make > /dev/null - make install - cd ../ - rm -rf libtool-2.4.2 - export LIBTOOL="$COMPILEDIR/mac/libtool/bin/libtool" - export LIBTOOLIZE="$COMPILEDIR/mac/libtool/bin/libtoolize" - $SCRIPT -t mac32 -o -j 1 -c $EXTRA_FLAGS -f - - tar -czf PHP_${PHP_VERSION}_x86_MacOS.tar.gz bin/ - cp -r $COMPILEDIR/mac32/{install.log,PHP_${PHP_VERSION}_x86_MacOS.tar.gz} $ARCHIVE/mac32/ - if [ ! -f $COMPILEDIR/mac32/bin/php5/bin/php ]; then - exit 1 - fi -fi - -if [ "$COMPILE_MAC_64" = "true" ]; -then - mkdir -p {$COMPILEDIR,$ARCHIVE}/mac64 - cd $COMPILEDIR/mac64 - - curl -L http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz | tar -xz > /dev/null - cd libtool-2.4.2 - ./configure --prefix="$COMPILEDIR/mac/libtool" > /dev/null - make > /dev/null - make install - cd ../ - rm -rf libtool-2.4.2 - export LIBTOOL="$COMPILEDIR/mac/libtool/bin/libtool" - export LIBTOOLIZE="$COMPILEDIR/mac/libtool/bin/libtoolize" - $SCRIPT -t mac64 -o -j 1 -c $EXTRA_FLAGS -f - - tar -czf PHP_${PHP_VERSION}_x86-64_MacOS.tar.gz bin/ - cp -r $COMPILEDIR/mac64/{install.log,PHP_${PHP_VERSION}_x86-64_MacOS.tar.gz} $ARCHIVE/mac64 - if [ ! -f $COMPILEDIR/mac64/bin/php5/bin/php ]; then - exit 1 - fi -fi - -if [ "$COMPILE_RPI" = "true" ]; -then - mkdir -p {$COMPILEDIR,$ARCHIVE}/rpi - cd $COMPILEDIR/rpi - - $SCRIPT -t rpi -o -j 1 -c $EXTRA_FLAGS -f arm - - tar -czf PHP_${PHP_VERSION}_ARM_Raspbian_hard.tar.gz bin/ - cp -r $COMPILEDIR/rpi/{install.log,PHP_${PHP_VERSION}_ARM_Raspbian_hard.tar.gz} $ARCHIVE/rpi/ - if [ ! -f $COMPILEDIR/rpi/bin/php5/bin/php ]; then - exit 1 - fi -fi - -if [ "$CROSSCOMPILE_ANDROID_ARMV6" = "true" ]; -then - mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/android-armv6 - cd $COMPILEDIR/crosscompile/android-armv6 - - $SCRIPT -t android-armv6 -o -j 1 -c -x -s $EXTRA_FLAGS -f arm - - tar -czf PHP_${PHP_VERSION}_ARMv6_Android.tar.gz bin/ - cp -r $COMPILEDIR/crosscompile/android-armv6/{install.log,PHP_${PHP_VERSION}_ARMv6_Android.tar.gz} $ARCHIVE/crosscompile/android-armv6/ - if [ ! -f $COMPILEDIR/crosscompile/android-armv6/bin/php5/bin/php ]; then - exit 1 - fi -fi - -if [ "$CROSSCOMPILE_ANDROID_ARMV7" = "true" ]; -then - mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/android-armv7 - cd $COMPILEDIR/crosscompile/android-armv7 - - $SCRIPT -t android-armv7 -o -j 1 -c -x -s $EXTRA_FLAGS -f arm - - tar -czf PHP_${PHP_VERSION}_ARMv7_Android.tar.gz bin/ - cp -r $COMPILEDIR/crosscompile/android-armv7/{install.log,PHP_${PHP_VERSION}_ARMv7_Android.tar.gz} $ARCHIVE/crosscompile/android-armv7/ - if [ ! -f $COMPILEDIR/crosscompile/android-armv7/bin/php5/bin/php ]; then - exit 1 - fi -fi - -if [ "$CROSSCOMPILE_IOS_ARMV6" = "true" ]; -then - mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/ios-armv6 - cd $COMPILEDIR/crosscompile/ios-armv6 - curl -L http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz | tar -xz > /dev/null - cd libtool-2.4.2 - ./configure --prefix="$COMPILEDIR/crosscompile/ios-armv6/libtool" > /dev/null - make > /dev/null - make install - cd ../ - rm -rf libtool-2.4.2 - export LIBTOOL="$COMPILEDIR/crosscompile/ios-armv6/libtool/bin/libtool" - export LIBTOOLIZE="$COMPILEDIR/crosscompile/ios-armv6/libtool/bin/libtoolize" - PATH="/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:$PATH" $SCRIPT -t ios-armv6 -o -j 1 -c -x $EXTRA_FLAGS -f arm - - cp -r $COMPILEDIR/crosscompile/ios-armv6/{install.log,bin/*} $ARCHIVE/crosscompile/ios-armv6/ - if [ ! -f $COMPILEDIR/crosscompile/ios-armv6/bin/php5/bin/php ]; then - exit 1 - fi -fi - -if [ "$CROSSCOMPILE_IOS_ARMV7" = "true" ]; -then - mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/ios-armv7 - cd $COMPILEDIR/crosscompile/ios-armv7 - curl -L http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz | tar -xz > /dev/null - cd libtool-2.4.2 - ./configure --prefix="$COMPILEDIR/crosscompile/ios-armv7/libtool" > /dev/null - make > /dev/null - make install - cd ../ - rm -rf libtool-2.4.2 - export LIBTOOL="$COMPILEDIR/crosscompile/ios-armv7/libtool/bin/libtool" - export LIBTOOLIZE="$COMPILEDIR/crosscompile/ios-armv7/libtool/bin/libtoolize" - PATH="/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:$PATH" $SCRIPT -t ios-armv6 -o -j 1 -c -x $EXTRA_FLAGS -f arm - - cp -r $COMPILEDIR/crosscompile/ios-armv7/{install.log,bin/*} $ARCHIVE/crosscompile/ios-armv7/ - if [ ! -f $COMPILEDIR/crosscompile/ios-armv7/bin/php5/bin/php ]; then - exit 1 - fi -fi - -if [ "$CROSSCOMPILE_RPI" = "true" ]; -then - mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/rpi - cd $COMPILEDIR/crosscompile/rpi - - $SCRIPT -t rpi -o -j 1 -c -x $EXTRA_FLAGS -f arm - - tar -czf PHP_${PHP_VERSION}_ARM_Raspbian_hard.tar.gz bin/ - cp -r $COMPILEDIR/crosscompile/rpi/{install.log,PHP_${PHP_VERSION}_ARM_Raspbian_hard.tar.gz} $ARCHIVE/crosscompile/rpi/ - if [ ! -f $COMPILEDIR/crosscompile/rpi/bin/php5/bin/php ]; then - exit 1 - fi -fi - -if [ "$CROSSCOMPILE_MAC" = "true" ]; -then - mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/mac - cd $COMPILEDIR/crosscompile/mac - - $SCRIPT -t mac -o -j 1 -c $EXTRA_FLAGS -f -x - - cp -r $COMPILEDIR/crosscompile/mac/{install.log,bin/*} $ARCHIVE/crosscompile/mac/ - if [ ! -f $COMPILEDIR/crosscompile/mac/bin/php5/bin/php ]; then - exit 1 - fi -fi diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 7a095cf65..888d55374 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -76,7 +76,7 @@ namespace pocketmine { const VERSION = "Alpha_1.4dev"; const API_VERSION = "1.0.0"; const CODENAME = "絶好(Zekkou)ケーキ(Cake)"; - const MINECRAFT_VERSION = "v0.9.0 alpha build 9"; + const MINECRAFT_VERSION = "v0.9.0 alpha"; const PHP_VERSION = "5.5"; if(\Phar::running(true) !== ""){ diff --git a/src/pocketmine/level/format/generic/EmptyChunkSection.php b/src/pocketmine/level/format/generic/EmptyChunkSection.php index 87f770c33..df757b689 100644 --- a/src/pocketmine/level/format/generic/EmptyChunkSection.php +++ b/src/pocketmine/level/format/generic/EmptyChunkSection.php @@ -51,7 +51,7 @@ class EmptyChunkSection implements ChunkSection{ } final public function getBlockSkyLightColumn($x, $z){ - return "\x00\x00\x00\x00\x00\x00\x00\x00"; + return "\xff\xff\xff\xff\xff\xff\xff\xff"; } final public function getBlockLightColumn($x, $z){