summaryrefslogtreecommitdiff
path: root/php/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-07-11 17:20:06 +0200
committerJose <jose@zeroc.com>2018-07-11 17:21:16 +0200
commit273935d31608d39b171f33145677b5fa1b43b7a1 (patch)
treebe5fc2fa184bebdb7b190aee240b5ba9f7224f7d /php/src
parentFixed Linux build system to support building on Rhel/CentOS ARM platforms (diff)
downloadice-273935d31608d39b171f33145677b5fa1b43b7a1.tar.bz2
ice-273935d31608d39b171f33145677b5fa1b43b7a1.tar.xz
ice-273935d31608d39b171f33145677b5fa1b43b7a1.zip
Add support to build with PHP 7.2 on Windows
Diffstat (limited to 'php/src')
-rw-r--r--php/src/php7/msbuild/packages.config10
-rw-r--r--php/src/php7/msbuild/php_ice.vcxproj6
2 files changed, 11 insertions, 5 deletions
diff --git a/php/src/php7/msbuild/packages.config b/php/src/php7/msbuild/packages.config
index 02bd3a45d12..0a2afac492f 100644
--- a/php/src/php7/msbuild/packages.config
+++ b/php/src/php7/msbuild/packages.config
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="php-7.1-nts" version="7.1.17" targetFramework="native" />
- <package id="php-7.1-ts" version="7.1.17" targetFramework="native" />
-</packages>
+ <package id="php-7.1-nts" version="7.1.17" targetFramework="native" />
+ <package id="php-7.1-ts" version="7.1.17" targetFramework="native" />
+ <package id="php-7.2-nts" version="7.2.7" targetFramework="native" />
+ <package id="php-7.2-ts" version="7.2.7" 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 638148e4a41..eb7f84acce3 100644
--- a/php/src/php7/msbuild/php_ice.vcxproj
+++ b/php/src/php7/msbuild/php_ice.vcxproj
@@ -238,6 +238,8 @@
<Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" />
<Import Project="..\..\..\msbuild\packages\php-7.1-nts.7.1.17\build\native\php-7.1-nts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.1-nts.7.1.17\build\native\php-7.1-nts.targets')" />
<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.7\build\native\php-7.2-nts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.2-nts.7.2.7\build\native\php-7.2-nts.targets')" />
+ <Import Project="..\..\..\msbuild\packages\php-7.2-ts.7.2.7\build\native\php-7.2-ts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.2-ts.7.2.7\build\native\php-7.2-ts.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -247,5 +249,7 @@
<Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\php-7.1-nts.7.1.17\build\native\php-7.1-nts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.1-nts.7.1.17\build\native\php-7.1-nts.targets'))" />
<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.7\build\native\php-7.2-nts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.2-nts.7.2.7\build\native\php-7.2-nts.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.2-ts.7.2.7\build\native\php-7.2-ts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.2-ts.7.2.7\build\native\php-7.2-ts.targets'))" />
</Target>
-</Project>
+</Project> \ No newline at end of file