Update version for Swoole 4.3.2-rc1

Author: twose

CMakeLists.txt

@@ -1,7 +1,7 @@
 PROJECT(libswoole)
 
 ENABLE_LANGUAGE(ASM)
-SET(SWOOLE_VERSION 4.3.1)
+SET(SWOOLE_VERSION 4.3.2-rc1)
 SET(SWOOLE_CLFLAGS pthread rt dl ssl crypt crypto)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

code_stats.sh

@@ -1,2 +1,2 @@
+#!/bin/sh
 cloc . --exclude-dir=thirdparty,Debug,CMakeFiles,build,CMakeFiles,.git
-

config.m4

@@ -404,8 +404,8 @@ if test "$PHP_SWOOLE" != "no"; then
         src/coroutine/boost.cc \
         src/coroutine/channel.cc \
         src/coroutine/context.cc \
+        src/coroutine/file_lock.cc \
         src/coroutine/hook.cc \
-	src/coroutine/file_lock.cc \
         src/coroutine/socket.cc \
         src/coroutine/ucontext.cc \
         src/lock/atomic.c \

config.w32

@@ -24,6 +24,7 @@ if (PHP_SWOOLE != "no") {
         + 'src/coroutine/boost.cc '
         + 'src/coroutine/channel.cc '
         + 'src/coroutine/context.cc '
+        + 'src/coroutine/file_lock.cc '
         + 'src/coroutine/hook.cc '
         + 'src/coroutine/socket.cc '
         + 'src/coroutine/ucontext.cc '

include/swoole.h

@@ -89,8 +89,8 @@ int clock_gettime(clock_id_t which_clock, struct timespec *t);
 #define SWOOLE_MAJOR_VERSION      4
 #define SWOOLE_MINOR_VERSION      3
 #define SWOOLE_RELEASE_VERSION    2
-#define SWOOLE_EXTRA_VERSION      "alpha"
-#define SWOOLE_VERSION            "4.3.2-alpha"
+#define SWOOLE_EXTRA_VERSION      "rc1"
+#define SWOOLE_VERSION            "4.3.2-rc1"
 #define SWOOLE_VERSION_ID         40302
 #define SWOOLE_BUG_REPORT \
     "A bug occurred in Swoole-v" SWOOLE_VERSION ", please report it.\n"\

package.xml

@@ -158,7 +158,7 @@ static int swFactoryProcess_start(swFactory *factory)
         serv->workers[i].pipe_object = &object->pipes[i];
         swServer_store_pipe_fd(serv, serv->workers[i].pipe_object);
     }
-    
+
 #ifdef HAVE_KQUEUE
     serv->ipc_max_size = SW_IPC_MAX_SIZE;
 #else

src/server/process.c

@@ -26,7 +26,11 @@ function check_source_ver(string $expect_ver, $source_file)
 
     // auto fixed sub version values
     if (strpos($source_content, 'SWOOLE_MAJOR_VERSION') !== false) {
-        list($major, $minor, $release, $extra) = preg_split('/[.-]/', $source_ver, 4);
+        $version_parts = array_values(array_filter(preg_split('/(?:\b)|(?:(?<=[0-9])(?=[a-zA-Z]))/',
+            $source_ver), function (string $char) {
+            return preg_match('/[0-9a-zA-Z]/', $char);
+        }));
+        list($major, $minor, $release, $extra) = $version_parts;
         $source_content = preg_replace(
             '/^(\#define[ ]+SWOOLE_VERSION_ID[ ]+)\d+$/m',
             '${1}' . sprintf('%d%02d%02d', $major, $minor, $release),
@@ -96,7 +100,7 @@ function check_source_ver(string $expect_ver, $source_file)
 $root_dir = SWOOLE_SOURCE_ROOT;
 
 // check version definitions
-$package_ver_regex = '/<version>\s+<release>(?<release_v>\d+?\.\d+?\.\d+?)<\/release>\s+<api>(?<api_v>\d+?\.\d+?)<\/api>\s+<\/version>\s+<stability>\s+<release>(?<release_s>[a-z]+?)<\/release>\s+<api>(?<api_s>[a-z]+?)<\/api>\s+<\/stability>/';
+$package_ver_regex = '/<version>\s+<release>(?<release_v>\d+?\.\d+?\.\d+?(?:-?(?:alpine|beta|rc\d*?))?)<\/release>\s+<api>(?<api_v>\d+?\.\d+?)<\/api>\s+<\/version>\s+<stability>\s+<release>(?<release_s>[a-z]+?)<\/release>\s+<api>(?<api_s>[a-z]+?)<\/api>\s+<\/stability>/i';
 preg_match($package_ver_regex, file_get_contents(__DIR__ . '/../package.xml'), $matches);
 $package_release_ver = $matches['release_v'];
 $package_api_ver = $matches['api_v'];
@@ -186,7 +190,7 @@ function check_source_ver(string $expect_ver, $source_file)
     swoole_error('Replace time tag failed!');
 }
 if (!file_put_contents(__DIR__ . '/../package.xml', $content)) {
-    swoole_error('Output package successful!');
+    swoole_error('Output package.xml failed!');
 }
 $package = trim(`cd {$root_dir} && pecl package`);
 if (preg_match('/Warning/i', $package)) {
@@ -196,7 +200,7 @@ function check_source_ver(string $expect_ver, $source_file)
     swoole_log("{$warn}\n", SWOOLE_COLOR_MAGENTA);
 }
 // check package status
-if (!preg_match('/Package (?<filename>swoole-[\d.]+\.tgz) done/', $package, $matches)) {
+if (!preg_match('/Package (?<filename>swoole-.+?.tgz) done/', $package, $matches)) {
     swoole_error($package);
 } else {
     $file_name = $matches['filename'];