From 2f6f8517151d3fa0c186f9f42692cc5d8be8b22d Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Wed, 4 Jun 2014 02:00:48 +0200 Subject: [PATCH 1/5] Updated PHP version --- src/build/compile.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build/compile.sh b/src/build/compile.sh index 8cbb5987a..2113d2a86 100755 --- a/src/build/compile.sh +++ b/src/build/compile.sh @@ -1,5 +1,5 @@ #!/bin/bash -PHP_VERSION="5.5.12" +PHP_VERSION="5.5.13" ZEND_VM="GOTO" ZLIB_VERSION="1.2.8" @@ -9,7 +9,7 @@ READLINE_VERSION="6.3" NCURSES_VERSION="5.9" PHPNCURSES_VERSION="1.0.2" PTHREADS_VERSION="2.0.7" -PHP_POCKETMINE_VERSION="0.0.4" +PHP_POCKETMINE_VERSION="0.0.5" UOPZ_VERSION="2.0.4" WEAKREF_VERSION="0.2.4" PHPYAML_VERSION="1.1.1" From ee0ab632026fbbac97248810a7861a5f29a919ff Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Wed, 4 Jun 2014 02:02:15 +0200 Subject: [PATCH 2/5] Updated PHP version --- src/build/jenkins.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/build/jenkins.sh b/src/build/jenkins.sh index 3f6d468ae..6bd597c5f 100644 --- a/src/build/jenkins.sh +++ b/src/build/jenkins.sh @@ -1,7 +1,7 @@ #!/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.12" +PHP_VERSION="5.5.13" #Needed to use aliases shopt -s expand_aliases @@ -32,7 +32,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/linux/32bit cd $COMPILEDIR/linux/32bit - $SCRIPT -t linux32 -o -j 2 -c -f x86 + $SCRIPT -t linux32 -o -j 2 -c -f x86 $EXTRA_FLAGS 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/ @@ -46,7 +46,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/linux/64bit cd $COMPILEDIR/linux/64bit - $SCRIPT -t linux64 -o -j 2 -c -f x86_64 + $SCRIPT -t linux64 -o -j 2 -c -f x86_64 $EXTRA_FLAGS 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/ @@ -69,7 +69,7 @@ then 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 -f + $SCRIPT -t mac32 -o -j 1 -c -f $EXTRA_FLAGS 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/ @@ -92,7 +92,7 @@ then 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 -f + $SCRIPT -t mac64 -o -j 1 -c -f $EXTRA_FLAGS 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 @@ -106,7 +106,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/rpi cd $COMPILEDIR/rpi - $SCRIPT -t rpi -o -j 1 -c -f arm + $SCRIPT -t rpi -o -j 1 -c -f arm $EXTRA_FLAGS 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/ @@ -120,7 +120,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/android-armv6 cd $COMPILEDIR/crosscompile/android-armv6 - $SCRIPT -t android-armv6 -o -j 1 -c -x -s -f arm + $SCRIPT -t android-armv6 -o -j 1 -c -x -s -f arm $EXTRA_FLAGS 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/ @@ -134,7 +134,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/android-armv7 cd $COMPILEDIR/crosscompile/android-armv7 - $SCRIPT -t android-armv7 -o -j 1 -c -x -s -f arm + $SCRIPT -t android-armv7 -o -j 1 -c -x -s -f arm $EXTRA_FLAGS 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/ @@ -177,7 +177,7 @@ then 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 -f arm + PATH="/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:$PATH" $SCRIPT -t ios-armv6 -o -j 1 -c -x -f arm $EXTRA_FLAGS cp -r $COMPILEDIR/crosscompile/ios-armv7/{install.log,bin/*} $ARCHIVE/crosscompile/ios-armv7/ if [ ! -f $COMPILEDIR/crosscompile/ios-armv7/bin/php5/bin/php ]; then @@ -190,7 +190,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/rpi cd $COMPILEDIR/crosscompile/rpi - $SCRIPT -t rpi -o -j 1 -c -x -f arm + $SCRIPT -t rpi -o -j 1 -c -x -f arm $EXTRA_FLAGS 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/ @@ -204,7 +204,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/mac cd $COMPILEDIR/crosscompile/mac - $SCRIPT -t mac -o -j 1 -c -f -x + $SCRIPT -t mac -o -j 1 -c -f -x $EXTRA_FLAGS cp -r $COMPILEDIR/crosscompile/mac/{install.log,bin/*} $ARCHIVE/crosscompile/mac/ if [ ! -f $COMPILEDIR/crosscompile/mac/bin/php5/bin/php ]; then From a76f56d0a90451c78edb491ffd37b52156e20874 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Wed, 4 Jun 2014 02:04:18 +0200 Subject: [PATCH 3/5] Update compile.sh --- src/build/compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build/compile.sh b/src/build/compile.sh index 2113d2a86..73ded8ba1 100755 --- a/src/build/compile.sh +++ b/src/build/compile.sh @@ -9,7 +9,7 @@ READLINE_VERSION="6.3" NCURSES_VERSION="5.9" PHPNCURSES_VERSION="1.0.2" PTHREADS_VERSION="2.0.7" -PHP_POCKETMINE_VERSION="0.0.5" +PHP_POCKETMINE_VERSION="0.0.6" UOPZ_VERSION="2.0.4" WEAKREF_VERSION="0.2.4" PHPYAML_VERSION="1.1.1" From ea9e0b917b3ccd8d653b59622f27298af224ca3a Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Wed, 4 Jun 2014 02:07:38 +0200 Subject: [PATCH 4/5] Moved $EXTRA_FLAGS --- src/build/jenkins.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/build/jenkins.sh b/src/build/jenkins.sh index 6bd597c5f..497d1e7a1 100644 --- a/src/build/jenkins.sh +++ b/src/build/jenkins.sh @@ -32,7 +32,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/linux/32bit cd $COMPILEDIR/linux/32bit - $SCRIPT -t linux32 -o -j 2 -c -f x86 $EXTRA_FLAGS + $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/ @@ -46,7 +46,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/linux/64bit cd $COMPILEDIR/linux/64bit - $SCRIPT -t linux64 -o -j 2 -c -f x86_64 $EXTRA_FLAGS + $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/ @@ -69,7 +69,7 @@ then 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 -f $EXTRA_FLAGS + $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/ @@ -92,7 +92,7 @@ then 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 -f $EXTRA_FLAGS + $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 @@ -106,7 +106,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/rpi cd $COMPILEDIR/rpi - $SCRIPT -t rpi -o -j 1 -c -f arm $EXTRA_FLAGS + $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/ @@ -120,7 +120,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/android-armv6 cd $COMPILEDIR/crosscompile/android-armv6 - $SCRIPT -t android-armv6 -o -j 1 -c -x -s -f arm $EXTRA_FLAGS + $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/ @@ -134,7 +134,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/android-armv7 cd $COMPILEDIR/crosscompile/android-armv7 - $SCRIPT -t android-armv7 -o -j 1 -c -x -s -f arm $EXTRA_FLAGS + $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/ @@ -156,7 +156,7 @@ then 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 -f arm + 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 @@ -177,7 +177,7 @@ then 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 -f arm $EXTRA_FLAGS + 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 @@ -190,7 +190,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/rpi cd $COMPILEDIR/crosscompile/rpi - $SCRIPT -t rpi -o -j 1 -c -x -f arm $EXTRA_FLAGS + $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/ @@ -204,7 +204,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/mac cd $COMPILEDIR/crosscompile/mac - $SCRIPT -t mac -o -j 1 -c -f -x $EXTRA_FLAGS + $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 From e4cdfdf6e9ed027c43cf3ec7632faaead30571e9 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Wed, 4 Jun 2014 02:15:29 +0200 Subject: [PATCH 5/5] Update Logger --- src/pocketmine/Server.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index 8b7c9ead2..b632e8564 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -84,7 +84,6 @@ use pocketmine\tile\Sign; use pocketmine\tile\Tile; use pocketmine\utils\Binary; use pocketmine\utils\Config; -use pocketmine\utils\Logger; use pocketmine\utils\MainLogger; use pocketmine\utils\TextFormat; use pocketmine\utils\Utils; @@ -124,7 +123,7 @@ class Server{ /** @var TickScheduler */ private $tickScheduler = null; - /** @var \pocketmine\utils\Logger */ + /** @var \Logger */ private $logger; /** @var CommandReader */ @@ -1187,12 +1186,12 @@ class Server{ /** * @param \SplClassLoader $autoloader - * @param Logger $logger + * @param \Logger $logger * @param string $filePath * @param string $dataPath * @param string $pluginPath */ - public function __construct(\SplClassLoader $autoloader, Logger $logger, $filePath, $dataPath, $pluginPath){ + public function __construct(\SplClassLoader $autoloader, \Logger $logger, $filePath, $dataPath, $pluginPath){ self::$instance = $this; $this->autoloader = $autoloader;