Feature ext xlswriter

.github/workflows/linux-aarch64.yml

@@ -4,7 +4,7 @@ on: [ push, pull_request ]
 
 jobs:
   linux-aarch64:
-    if: 0
+    if: 1
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -43,7 +43,7 @@ jobs:
             set -eux
             # export PATH=/work/bin/runtime:$PATH  # 容器已经内置 php 和 composer 容器
             composer update --no-dev  --optimize-autoloader
-            php prepare.php  +inotify +apcu +ds
+            php prepare.php  +inotify +apcu +ds +xlswriter
             chmod a+x make.sh
             head -n 20 make.sh
       - name: Build

.github/workflows/linux-x86_64.yml

@@ -4,7 +4,7 @@ on: [ push, pull_request ]
 
 jobs:
   linux-x86_64:
-    if: 0
+    if: 1
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -46,7 +46,7 @@ jobs:
             set -eux
             # export PATH=/work/bin/runtime:$PATH  # 容器已经内置 php 和 composer 容器
             composer update --no-dev  --optimize-autoloader
-            php prepare.php  +inotify +apcu +ds
+            php prepare.php  +inotify +apcu +ds +xlswriter
             chmod a+x make.sh
             head -n 20 make.sh
       - name: Build

.github/workflows/macos-x86_64.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   macos-x86_64:
-    if: 0
+    if: 1
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
@@ -13,20 +13,25 @@ jobs:
           env
           echo $HOME
           brew install  wget curl  libtool automake gettext coreutils re2c binutils
+          brew uninstall --ignore-dependencies oniguruma
+          brew uninstall --ignore-dependencies brotli
+          brew uninstall --ignore-dependencies freetype
+          brew uninstall --ignore-dependencies zstd
+          brew uninstall --ignore-dependencies capstone
           which glibtool
           ln -sf /usr/local/bin/glibtool /usr/local/bin/libtool
           ln -sf /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
+          sudo  xcode-select --switch /Applications/Xcode.app
+          # export MACOSX_DEPLOYMENT_TARGET=12.6
           sudo mkdir -p pool/lib
           sudo mkdir -p pool/ext
           git submodule update --init
+
       - name: Cache
         uses: actions/cache@v3
         id: all-archive-cache
         with:
-          path: |
-            ${GITHUB_WORKSPACE}/var/all-archive.zip
-            ${GITHUB_WORKSPACE}/bin/runtime/php
-            ${GITHUB_WORKSPACE}/bin/runtime/composer
+          path: ${GITHUB_WORKSPACE}/var/all-archive.zip
           key: all-archive
       - name: Prepare runtime
         if: ${{ steps.all-archive-cache.outputs.cache-hit != 'true' }}
@@ -47,14 +52,13 @@ jobs:
           sudo sh sapi/download-box/download-box-get-archive-from-server.sh
 
           sudo composer update --no-dev  --optimize-autoloader
-          sudo php prepare.php --without-docker=1  --with-build-type=release  +ds +apcu
+          sudo php prepare.php --without-docker=1  --with-build-type=release  +ds +apcu +xlswriter
       - name: Cache all-library
         uses: actions/cache@v3
         id: all-library-cache
         with:
-          path: |
-            ${HOME}/.swoole-cli
-          key: all-library-cache
+          path: ~/.swoole-cli
+          key: ${{ runner.os }}-build-all-library
       - name: Build all-library
         if: ${{ steps.all-library-cache.outputs.cache-hit != 'true' }}
         run: |
@@ -68,6 +72,7 @@ jobs:
           sudo ./make.sh build
           sudo ./make.sh archive
           file ./bin/swoole-cli
+          otool -L ./bin/swoole-cli
           ./bin/swoole-cli -r "echo PHP_VERSION;"
 
       - name: Archive production artifacts

.gitignore

@@ -314,4 +314,6 @@ tmp-php.ini
 /.phpunit.result.cache
 /samples/sfx/*.phar
 composer.lock
-.php-cs-fixer.cache
+.php-cs-fixer.cache
+ldflags.log
+cppflags.log

conf.d/imagick.php

@@ -19,31 +19,13 @@
             ->withConfigure(
                 <<<EOF
             ./configure --help
-
-            package_names="libjpeg  libturbojpeg libwebp  libwebpdecoder  libwebpdemux  libwebpmux  "
-            package_names="\${package_names} libbrotlicommon libbrotlidec    libbrotlienc libcrypto libssl   openssl"
-
-            ZIP_CFLAGS=$(pkg-config  --cflags --static libzip ) \
-            ZIP_LIBS=$(pkg-config    --libs   --static libzip ) \
-            ZLIB_CFLAGS=$(pkg-config  --cflags --static zlib ) \
-            ZLIB_LIBS=$(pkg-config    --libs   --static zlib ) \
-            LIBZSTD_CFLAGS=$(pkg-config  --cflags --static libzstd ) \
-            LIBZSTD_LIBS=$(pkg-config    --libs   --static libzstd ) \
-            FREETYPE_CFLAGS=$(pkg-config  --cflags --static freetype2 ) \
-            FREETYPE_LIBS=$(pkg-config    --libs   --static freetype2 ) \
-            LZMA_CFLAGS=$(pkg-config  --cflags --static liblzma ) \
-            LZMA_LIBS=$(pkg-config    --libs   --static liblzma ) \
-            PNG_CFLAGS=$(pkg-config  --cflags --static libpng ) \
-            PNG_LIBS=$(pkg-config    --libs   --static libpng ) \
-            WEBP_CFLAGS=$(pkg-config  --cflags --static libwebp ) \
-            WEBP_LIBS=$(pkg-config    --libs   --static libwebp )  \
-            WEBPMUX_CFLAGS=$(pkg-config --cflags --static libwebpmux ) \
-            WEBPMUX_LIBS=$(pkg-config   --libs   --static libwebpmux ) \
-            XML_CFLAGS=$(pkg-config  --cflags --static libxml-2.0 ) \
-            XML_LIBS=$(pkg-config    --libs   --static libxml-2.0 ) \
-            CPPFLAGS="\$(pkg-config --cflags-only-I --static \$package_names ) -I{$bzip2_prefix}/include" \
-            LDFLAGS="\$(pkg-config  --libs-only-L   --static \$package_names ) -L{$bzip2_prefix}/lib"  \
-            LIBS="\$(pkg-config     --libs-only-l   --static \$package_names ) -lbz2" \
+            PACKAGES_NAMES="libjpeg  libturbojpeg libwebp  libwebpdecoder  libwebpdemux  libwebpmux  libpng freetype2"
+            PACKAGES_NAMES="\${PACKAGES_NAMES} libbrotlicommon libbrotlidec libbrotlienc libzip  zlib  libzstd  liblzma"
+            PACKAGES_NAMES="\${PACKAGES_NAMES} libcrypto libssl   openssl"
+            PACKAGES_NAMES="\${PACKAGES_NAMES} libxml-2.0"
+            CPPFLAGS="\$(pkg-config --cflags-only-I --static \$PACKAGES_NAMES ) -I{$bzip2_prefix}/include" \
+            LDFLAGS="\$(pkg-config  --libs-only-L   --static \$PACKAGES_NAMES ) -L{$bzip2_prefix}/lib"  \
+            LIBS="\$(pkg-config     --libs-only-l   --static \$PACKAGES_NAMES ) -lbz2" \
             ./configure \
             --prefix={$imagemagick_prefix} \
             --enable-shared=no \
@@ -78,11 +60,22 @@
             --without-lqr \
             --without-openexr \
             --without-pango \
-            --without-jbig \
             --without-x \
             --without-modules \
             --without-magick-plus-plus \
-            --without-utilities
+            --without-utilities \
+            --without-gvc \
+            --without-autotrace \
+            --without-dps \
+            --without-fftw \
+            --without-flif \
+            --without-fpx \
+            --without-gslib \
+            --without-ltdl \
+            --without-perl \
+            --without-raqm \
+            --without-wmf
+
 EOF
             )
             ->withPkgName('ImageMagick-7.Q16HDRI')
@@ -96,6 +89,7 @@
                 'libxml2',
                 'libzip',
                 'zlib',
+                'liblzma',
                 'libjpeg',
                 'freetype',
                 'libwebp',

conf.d/protobuf.php

@@ -13,12 +13,20 @@
     );
 
     $p->setExtCallback('protobuf', function (Preprocessor $p) {
+        $work_dir=$p->getWorkDir();
+
+        $cmd=" cd {$work_dir}/ext/xlswriter " . PHP_EOL;
+
         // compatible with redis
         if ($p->getOsType() === 'macos') {
-            echo `sed -i '.bak' 's/arginfo_void,/arginfo_void_protobuf,/g' ext/protobuf/*.c ext/protobuf/*.h ext/protobuf/*.inc`;
-            echo `find ext/protobuf/ -name \*.bak | xargs rm -f`;
+            $cmd .="sed -i '.bak' 's/arginfo_void,/arginfo_void_protobuf,/g' ext/protobuf/*.c ext/protobuf/*.h ext/protobuf/*.inc " . PHP_EOL ;
+            $cmd .="find ext/protobuf/ -name \*.bak | xargs rm -f " . PHP_EOL ;
         } else {
-            echo `sed -i 's/arginfo_void,/arginfo_void_protobuf,/g' ext/protobuf/*.c ext/protobuf/*.h ext/protobuf/*.inc`;
+            $cmd .="sed -i 's/arginfo_void,/arginfo_void_protobuf,/g' ext/protobuf/*.c ext/protobuf/*.h ext/protobuf/*.inc " . PHP_EOL ;
         }
+
+        $cmd .= $cmd . PHP_EOL . "cd {$work_dir}/" .PHP_EOL;
+
+        return $cmd;
     });
 };

conf.d/xlswriter.php

@@ -0,0 +1,46 @@
+<?php
+
+use SwooleCli\Library;
+use SwooleCli\Preprocessor;
+use SwooleCli\Extension;
+
+return function (Preprocessor $p) {
+    $p->addExtension(
+        (new Extension('xlswriter'))
+            ->withHomePage('https://github.com/viest/php-ext-xlswriter')
+            ->withLicense('https://github.com/viest/php-ext-xlswriter/blob/master/LICENSE', Extension::LICENSE_BSD)
+            ->withPeclVersion('1.5.4')
+            ->withDownloadScript(
+                'xlswriter',
+                <<<EOF
+                    test -d php-ext-xlswriter && rm -rf php-ext-xlswriter
+
+                    # git clone -b v1.5.4 --depth=1 --recursive https://github.com/viest/php-ext-xlswriter.git
+                    # git clone -b feature_openssl_dir --depth=1 --recursive https://github.com/jingjingxyk/php-ext-xlswriter.git
+                    # git clone -b main_static_built --depth=1 --recursive https://github.com/viest/php-ext-xlswriter.git
+
+                    git clone -b dev --depth=1 --recursive https://github.com/viest/php-ext-xlswriter.git
+                    mv php-ext-xlswriter xlswriter
+EOF
+            )
+            ->withOptions(' --with-xlswriter --enable-reader --with-openssl=' . OPENSSL_PREFIX)
+    );
+
+    $p->setExtCallback('xlswriter', function (Preprocessor $p) {
+        $work_dir=$p->getWorkDir();
+        $cmd=<<<EOF
+          cd {$work_dir}/ext/xlswriter
+          if [[ ! -f config.m4.backup ]] ;then
+                # 替换为空行
+                sed -i.backup "42s/.*//" config.m4
+                sed -i.backup "187s/.*//" config.m4
+                # 删除行
+                # sed -i '42,187d' config.m4
+          fi
+          cd {$work_dir}/
+EOF;
+        //停用 hook
+        $cmd='';
+        return $cmd;
+    });
+};

conf.d/xml.php

@@ -16,7 +16,19 @@
             ->withPrefix($libxml2_prefix)
             ->withConfigure(
                 <<<EOF
-./autogen.sh && ./configure --prefix=$libxml2_prefix --with-iconv=$iconv_prefix --enable-static=yes --enable-shared=no --without-python
+                    ./autogen.sh
+                    ./configure --help
+                    ./configure \
+                    --prefix=$libxml2_prefix \
+                    --with-iconv=$iconv_prefix \
+                    --enable-static=yes \
+                    --enable-shared=no \
+                    --without-python \
+                    --without-zlib \
+                    --without-lzma \
+                    --without-debug \
+                    --without-icu
+
 EOF
             )
             ->withPkgName('libxml-2.0')

docs/macOS.md

@@ -15,6 +15,8 @@ brew uninstall --ignore-dependencies oniguruma
 brew uninstall --ignore-dependencies brotli
 brew uninstall --ignore-dependencies freetype
 brew uninstall --ignore-dependencies zstd
+brew uninstall --ignore-dependencies capstone
+
 ```
 
 # 问题

sapi/quickstart/linux/run-alpine-3.16-container.sh

@@ -20,5 +20,7 @@ cd ${__DIR__}
 cd ${__DIR__}
 IMAGE=alpine:3.16
 
+IMAGE=docker.io/jingjingxyk/build-swoole-cli:all-dependencies-alpine-swoole-cli-x86_64-20230505T120137Z
+
 cd ${__DIR__}
 docker run --rm --name swoole-cli-dev -d -v ${__PROJECT__}:/work -w /work $IMAGE tail -f /dev/null

sapi/quickstart/prepare.sh

@@ -25,4 +25,5 @@ composer update
 php prepare.php --with-build-type=release +apcu +ds @macos
 
 # linux
-php prepare.php --with-build-type=release +apcu +ds
+php prepare.php --with-build-type=release +apcu +ds -zip -swoole -curl -gd -imagick -mongodb -redis
+php prepare.php --with-build-type=release  -zip -swoole -curl -gd -imagick -mongodb -redis -sqlite3 -pdo_sqlite -mysqli -pdo_mysql -soap -xsl -gmp -yaml  +xlswriter

sapi/quickstart/setup-php-runtime.sh

@@ -42,9 +42,7 @@ case $ARCH in
 esac
 
 VERSION='v5.0.3'
-if [[ $OS = 'macos' ]]; then
-  VERSION='v5.0.1'
-fi
+
 mkdir -p bin/runtime
 mkdir -p var/runtime
 
@@ -53,9 +51,7 @@ cd ${__PROJECT__}/var/runtime
 SWOOLE_CLI_DOWNLOAD_URL="https://github.com/swoole/swoole-src/releases/download/${VERSION}/swoole-cli-${VERSION}-${OS}-${ARCH}.tar.xz"
 COMPOSER_DOWNLOAD_URL="https://getcomposer.org/download/latest-stable/composer.phar"
 
-if [[ $ARCH = 'arm64'  ]] && [[ $OS = 'linux' ]]; then
-  SWOOLE_CLI_DOWNLOAD_URL='https://github.com/jingjingxyk/swoole-cli/releases/download/build-native-php-v0.1.1/swoole-cli-v5.0.3-linux-arm64.tar.xz'
-fi
+
 
 mirror=''
 while [ $# -gt 0 ]; do

sapi/scripts/download-dependencies-use-git.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -exu
+__DIR__=$(
+  cd "$(dirname "$0")"
+  pwd
+)
+__PROJECT__=$(
+  cd ${__DIR__}/../../
+  pwd
+)
+cd ${__PROJECT__}
+
+
+mkdir -p ${__PROJECT__}/var/
+
+cd ${__PROJECT__}/var/
+
+
+test -f download_library_use_git.sh && bash download_library_use_git.sh
+test -f download_extension_use_git.sh && bash download_extension_use_git.sh
+
+
+cd ${__PROJECT__}
+
+mkdir -p pool/lib
+mkdir -p pool/ext
+
+# cp -rf ${__PROJECT__}/var/download/* ${__PROJECT__}/pool/lib
+
+awk 'BEGIN { cmd="cp -ri var/libraries/* pool/lib"  ; print "n" |cmd; }'
+awk 'BEGIN { cmd="cp -ri var/extensions/* pool/ext"; print "n" |cmd; }'
+
+cd ${__PROJECT__}