From 8816216a48c3cece18763f4964c040a017ad58e9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 19 Sep 2021 08:35:25 +0200 Subject: update to 1.4.1 open https://github.com/zephir-lang/php-zephir-parser/issues/132 missing and bad files in archive --- Makefile | 3 --- PHPINFO | 8 ++++---- REFLECTION | 4 ++-- php-zephir-parser.spec | 28 +++++++++++++++++++++------- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 9584397..8a6442d 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,4 @@ SRCDIR := $(shell pwd) NAME := $(shell basename $(SRCDIR)) include ../../common/Makefile -refl: - php -d extension=zephir_parser.so --ri "zephir parser" > PHPINFO - php -d extension=zephir_parser.so --re "zephir parser" > REFLECTION diff --git a/PHPINFO b/PHPINFO index 88d4c98..5c3e0ce 100644 --- a/PHPINFO +++ b/PHPINFO @@ -1,9 +1,9 @@ -Zephir Parser +zephir_parser The Zephir Parser delivered as a C extension for the PHP language. -Zephir Parser => enabled +zephir_parser => enabled Author => Zephir Team and contributors -Version => 1.4.0 -Build Date => Sep 18 2021 00:00:00 +Version => 1.4.1 +Build Date => Sep 19 2021 00:00:00 diff --git a/REFLECTION b/REFLECTION index 31daf3e..3034ff7 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,7 +1,7 @@ -Extension [ extension #124 Zephir Parser version 1.4.0 ] { +Extension [ extension #124 zephir_parser version 1.4.1 ] { - Functions { - Function [ function zephir_parse_file ] { + Function [ function zephir_parse_file ] { - Parameters [2] { Parameter #0 [ string $content ] diff --git a/php-zephir-parser.spec b/php-zephir-parser.spec index 2de72f6..8649d5d 100644 --- a/php-zephir-parser.spec +++ b/php-zephir-parser.spec @@ -20,7 +20,7 @@ %global pecl_name zephir_parser Name: %{?scl_prefix}%{gh_project} -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: Zephir code parser @@ -40,6 +40,8 @@ Requires: %{?scl_prefix}php(api) = %{php_core_api} Obsoletes: %{?scl_prefix}zephir-parser < 0.10 Provides: %{?scl_prefix}zephir-parser = %{version} # PECL +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl-zephir-parser = %{version}-%{release} Provides: %{?scl_prefix}php-pecl-zephir-parser%{?_isa} = %{version}-%{release} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} @@ -64,10 +66,7 @@ These are the files needed to compile programs using %{name}. %setup -qc mv %{pecl_name}-%{version} NTS -# Don't install/register tests -sed -e 's/role="test"/role="src"/' \ - %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ - -i package.xml +%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} pushd NTS # Sanity check, really often broken @@ -98,7 +97,10 @@ make -C NTS install INSTALL_ROOT=%{buildroot} # Install XML package description install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml -# Documentation +# Tests & Documentation +for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//') +do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i +done for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done @@ -106,8 +108,14 @@ done %check pushd NTS +echo "%{version}" > VERSION +sed -e 's/\r//' -i \ + tests/base/cblocks.phpt \ + tests/comments/comments_before.phpt \ + tests/errors/bug30.phpt + : Check extension -%{_bindir}/php -n -d extension=modules/%{pecl_name}.so -m | grep "Zephir Parser" +%{_bindir}/php -n -d extension=modules/%{pecl_name}.so -m | grep "%{pecl_name}" %if %{with_tests} : Run test suite @@ -130,10 +138,16 @@ popd %files devel +%doc %{pecl_testdir}/%{pecl_name} %{php_incldir}/ext/%{pecl_name} %changelog +* Sun Sep 19 2021 Remi Collet - 1.4.1-1 +- update to 1.4.1 +- open https://github.com/zephir-lang/php-zephir-parser/issues/132 + missing and bad files in archive + * Sat Sep 18 2021 Remi Collet - 1.4.0-1 - update to 1.4.0 - sources from pecl -- cgit