summaryrefslogtreecommitdiff
path: root/php
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-12-13 13:55:27 +0100
committerJose <jose@zeroc.com>2018-12-13 13:55:27 +0100
commit60d6ad8f72e1a6a8c5ff36f3f2a0bb78a8f7f7a8 (patch)
treefaa0c57d373f1d15fe14c3c3defcc43afebaaab3 /php
parentUdate OpenSSL version used in Windows builds (diff)
downloadice-60d6ad8f72e1a6a8c5ff36f3f2a0bb78a8f7f7a8.tar.bz2
ice-60d6ad8f72e1a6a8c5ff36f3f2a0bb78a8f7f7a8.tar.xz
ice-60d6ad8f72e1a6a8c5ff36f3f2a0bb78a8f7f7a8.zip
Add support to build with PHP 7.3 on Windows
Diffstat (limited to 'php')
-rw-r--r--php/README.md6
-rw-r--r--php/msbuild/ice.props4
-rw-r--r--php/src/php7/msbuild/packages.config2
-rw-r--r--php/src/php7/msbuild/php_ice.vcxproj8
4 files changed, 14 insertions, 6 deletions
diff --git a/php/README.md b/php/README.md
index 7b5cdc4c33e..1ae1b937359 100644
--- a/php/README.md
+++ b/php/README.md
@@ -94,8 +94,10 @@ extension with namespaces disabled by setting the MSBuild property
msbuild msbuild\ice.proj /p:PhpUseNamespaces=no
```
-The PHP extension is build by default using PHP 7.1, you can build with 7.2 by set
-MSBuildProperty `BuildWithPhpVersion` to `7.2`:
+The PHP extension is build by default using PHP 7.1, the extension can be build with
+PHP 7.1, 7.2 or 7.3 by setting MSBuildProperty `BuildWithPhpVersion` to the desired
+version for example you can use the following command to build the extension with PHP
+7.2:
```
msbuild msbuild\ice.proj /p:BuildWithPhpVersion=7.2
diff --git a/php/msbuild/ice.props b/php/msbuild/ice.props
index b876ceec906..2c527e9dae5 100644
--- a/php/msbuild/ice.props
+++ b/php/msbuild/ice.props
@@ -7,10 +7,10 @@
<PropertyGroup Label="UserMacros">
- <!-- The PHP version used to build the extension. The only supported values are 7.0 and 7.1. -->
+ <!-- The PHP version used to build the extension. The supported values are 7.1, 7.2 and 7.3. -->
<BuildWithPhpVersion>7.1</BuildWithPhpVersion>
- <!-- Determines whether the extension uses PHP namespaces (requires PHP 5.3 or later). -->
+ <!-- Determines whether the extension uses PHP namespaces -->
<PhpUseNamespaces Condition="'$(PhpUseNamespaces)' == ''">yes</PhpUseNamespaces>
</PropertyGroup>
diff --git a/php/src/php7/msbuild/packages.config b/php/src/php7/msbuild/packages.config
index 92d1138bece..df9579323a9 100644
--- a/php/src/php7/msbuild/packages.config
+++ b/php/src/php7/msbuild/packages.config
@@ -4,4 +4,6 @@
<package id="php-7.1-ts" version="7.1.17" targetFramework="native" />
<package id="php-7.2-nts" version="7.2.8" targetFramework="native" />
<package id="php-7.2-ts" version="7.2.8" targetFramework="native" />
+ <package id="php-7.3-nts" version="7.3.0" targetFramework="native" />
+ <package id="php-7.3-ts" version="7.3.0" targetFramework="native" />
</packages> \ No newline at end of file
diff --git a/php/src/php7/msbuild/php_ice.vcxproj b/php/src/php7/msbuild/php_ice.vcxproj
index 22d481753ae..f7a43593014 100644
--- a/php/src/php7/msbuild/php_ice.vcxproj
+++ b/php/src/php7/msbuild/php_ice.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" />
<ItemGroup Label="ProjectConfigurations">
@@ -240,6 +240,8 @@
<Import Project="..\..\..\msbuild\packages\php-7.1-ts.7.1.17\build\native\php-7.1-ts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.1-ts.7.1.17\build\native\php-7.1-ts.targets')" />
<Import Project="..\..\..\msbuild\packages\php-7.2-nts.7.2.8\build\native\php-7.2-nts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.2-nts.7.2.8\build\native\php-7.2-nts.targets')" />
<Import Project="..\..\..\msbuild\packages\php-7.2-ts.7.2.8\build\native\php-7.2-ts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.2-ts.7.2.8\build\native\php-7.2-ts.targets')" />
+ <Import Project="..\..\..\msbuild\packages\php-7.3-nts.7.3.0\build\native\php-7.3-nts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.3-nts.7.3.0\build\native\php-7.3-nts.targets')" />
+ <Import Project="..\..\..\msbuild\packages\php-7.3-ts.7.3.0\build\native\php-7.3-ts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.3-ts.7.3.0\build\native\php-7.3-ts.targets')" />
</ImportGroup>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\cpp\msbuild\ice.sign.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -252,5 +254,7 @@
<Error Condition="!Exists('..\..\..\msbuild\packages\php-7.1-ts.7.1.17\build\native\php-7.1-ts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.1-ts.7.1.17\build\native\php-7.1-ts.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\php-7.2-nts.7.2.8\build\native\php-7.2-nts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.2-nts.7.2.8\build\native\php-7.2-nts.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\php-7.2-ts.7.2.8\build\native\php-7.2-ts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.2-ts.7.2.8\build\native\php-7.2-ts.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.3-nts.7.3.0\build\native\php-7.3-nts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.3-nts.7.3.0\build\native\php-7.3-nts.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.3-ts.7.3.0\build\native\php-7.3-ts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.3-ts.7.3.0\build\native\php-7.3-ts.targets'))" />
</Target>
-</Project>
+</Project> \ No newline at end of file