From 94ef6123de380e0e57a511fe93845d11664e6cc2 Mon Sep 17 00:00:00 2001 From: heyanlong Date: Thu, 30 Jun 2022 17:57:29 +0800 Subject: [PATCH] 5.0.1 --- config.m4 | 9 ++++---- docs/BUILDING.md | 6 +++--- package.xml | 51 ++++++++++++++++++++++++++++++++++++++++++---- php_skywalking.h | 2 +- scripts/package.py | 27 +++++++++++++++++++++--- scripts/version.sh | 2 +- skywalking.c | 2 +- 7 files changed, 82 insertions(+), 17 deletions(-) diff --git a/config.m4 b/config.m4 index f5b9b054..bc7e362a 100644 --- a/config.m4 +++ b/config.m4 @@ -18,7 +18,7 @@ if test "$PHP_SKYWALKING" != "no"; then AC_MSG_ERROR([rustfmt command missing, please reinstall the cargo distribution]) fi - EXTRA_LDFLAGS="$EXTRA_LDFLAGS target/release/libsky_core_report.a" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $srcdir/target/release/libsky_core_report.a" LIBS="-lpthread $LIBS" SKYWALKING_SHARED_LIBADD="-lpthread $SKYWALKING_SHARED_LIBADD" @@ -54,18 +54,19 @@ if test "$PHP_SKYWALKING" != "no"; then src/sky_util_php.c \ src/sky_utils.c \ , $ext_shared) + PHP_ADD_BUILD_DIR($ext_builddir/src) fi if test -r $phpincludedir/ext/mysqli/mysqli_mysqlnd.h; then AC_DEFINE([MYSQLI_USE_MYSQLND], 1, [Whether mysqlnd is enabled]) fi -shared_objects_skywalking="target/release/libsky_core_report.a $shared_objects_skywalking" +shared_objects_skywalking="$srcdir/target/release/libsky_core_report.a $shared_objects_skywalking" dnl PHP_SUBST(shared_objects_skywalking) case $host in *darwin*) - echo "target/release/libsky_core_report.a:\n cargo build --release" >> Makefile.objects + echo "$srcdir/target/release/libsky_core_report.a:\n cargo build --release --manifest-path=$srcdir/Cargo.toml" >> Makefile.objects ;; *) - echo -e "target/release/libsky_core_report.a:\n cargo build --release" >> Makefile.objects + echo -e "$srcdir/target/release/libsky_core_report.a:\n cargo build --release --manifest-path=$srcdir/Cargo.toml" >> Makefile.objects ;; esac \ No newline at end of file diff --git a/docs/BUILDING.md b/docs/BUILDING.md index 29a223a5..cb85bd60 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -34,9 +34,9 @@ On a Mac, you will first need to install Xcode or Command Line Tools for Xcode a ## Build from source (PHP Extension) ```shell script -curl -Lo v5.0.0.tar.gz https://github.com/SkyAPM/SkyAPM-php-sdk/archive/v5.0.0.tar.gz -tar zxvf v5.0.0.tar.gz -cd SkyAPM-php-sdk-5.0.0 +curl -Lo v5.0.1.tar.gz https://github.com/SkyAPM/SkyAPM-php-sdk/archive/v5.0.1.tar.gz +tar zxvf v5.0.1.tar.gz +cd SkyAPM-php-sdk-5.0.1 phpize ./configure make diff --git a/package.xml b/package.xml index 98b67ec1..003303e6 100644 --- a/package.xml +++ b/package.xml @@ -26,10 +26,10 @@ yanlong@php.net yes - 2022-06-27 + 2022-06-30 - 5.0.0 - 5.0.0 + 5.0.1 + 5.0.1 stable @@ -82,7 +82,6 @@ - @@ -142,6 +141,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -157,6 +189,17 @@ skywalking + + + 5.0.1 + 5.0.1 + + + stable + stable + + Support Skywalking 9.0.0 + 5.0.0 diff --git a/php_skywalking.h b/php_skywalking.h index bff1af8c..ff3720df 100644 --- a/php_skywalking.h +++ b/php_skywalking.h @@ -38,7 +38,7 @@ extern zend_module_entry skywalking_module_entry; # define phpext_skywalking_ptr &skywalking_module_entry -#define PHP_SKYWALKING_VERSION "5.0.0" +#define PHP_SKYWALKING_VERSION "5.0.1" #define SKY_STRCMP(s1, s2) ((s1) != nullptr && strcmp(s1, s2) == 0) diff --git a/scripts/package.py b/scripts/package.py index 7d58f3fb..b325dd1a 100644 --- a/scripts/package.py +++ b/scripts/package.py @@ -16,16 +16,23 @@ import xml.dom.minidom import time, os -version = '5.0.0' +version = '5.0.1' git = os.popen('git ls-files') res = git.read() child = [] -for line in res.splitlines(): +git_files = res.splitlines() + +for root, dirs, files in os.walk("./src/protocol"): + for file in files: + git_files.append((root + "/" + file)[2:]) + +for line in git_files: if line == "": continue - + if line == "src/protocol": + continue if line == "package.xml" or line[0:1] == '.': continue @@ -98,6 +105,20 @@ {'key': 'providesextension', 'value': 'skywalking'}, {'key': 'extsrcrelease'}, {'key': 'changelog', 'child': [ + {'key': 'release', 'child': [ + {'key': 'version', 'child': [ + {'key': 'release', 'value': '5.0.1'}, + {'key': 'api', 'value': '5.0.1'} + ] + }, + {'key': 'stability', 'child': [ + {'key': 'release', 'value': 'stable'}, + {'key': 'api', 'value': 'stable'} + ] + }, + {'key': 'notes', 'value': 'Support Skywalking 9.0.0'} + ] + }, {'key': 'release', 'child': [ {'key': 'version', 'child': [ {'key': 'release', 'value': '5.0.0'}, diff --git a/scripts/version.sh b/scripts/version.sh index 88024876..fe5886d1 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -15,7 +15,7 @@ # limitations under the License. # -VERSION=5.0.0 +VERSION=5.0.1 OS=`uname` echo "OS: $OS" diff --git a/skywalking.c b/skywalking.c index a765b42c..32d28d66 100644 --- a/skywalking.c +++ b/skywalking.c @@ -39,7 +39,7 @@ #include "ext/standard/info.h" #include "php_skywalking.h" -#include "sky_core_module.h" +#include "src/sky_core_module.h" #ifdef MYSQLI_USE_MYSQLND #include "ext/mysqli/php_mysqli_structs.h"