Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F925586
D496.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Tue, May 20, 9:16 AM
Size
1 KB
Mime Type
text/x-diff
Expires
Wed, May 21, 9:16 AM (16 h, 52 m)
Engine
blob
Format
Raw Data
Handle
634949
Attached To
D496: INP-1885 - Consistently use PHP binary during the Build
D496.diff
View Options
Index: branches/5.2.x/tools/build/targets/common.xml
===================================================================
--- branches/5.2.x/tools/build/targets/common.xml
+++ branches/5.2.x/tools/build/targets/common.xml
@@ -168,7 +168,7 @@
code. This indicates potential refactorings.-->
<target name="phpcpd" description="Find duplicate code using PHPCPD" depends="init">
<exec command="which phpcpd" outputProperty="phpcpd_binary"/>
- <exec executable="php" passthru="true">
+ <exec executable="${php.binary}" passthru="true">
<arg value="-d memory_limit=-1"/>
<arg value="${phpcpd_binary}"/>
<arg value="--log-pmd=${build.logs.dir}/pmd-cpd.xml"/>
@@ -201,6 +201,8 @@
</target>
<target name="create-aliases" description="Creating directory aliases" hidden="true">
+ <php expression="PHP_BINARY" returnProperty="php.binary"/>
+
<property name="pdo.dsn.without.db" value="mysql:host=${db.host}"/>
<property name="pdo.dsn" value="${pdo.dsn.without.db};dbname=${db.name}"/>
Index: branches/5.2.x/tools/build/targets/deploy.xml
===================================================================
--- branches/5.2.x/tools/build/targets/deploy.xml
+++ branches/5.2.x/tools/build/targets/deploy.xml
@@ -34,7 +34,7 @@
<target name="inportal-deploy" description="Runs In-Portal deployment script">
<echo msg="Running In-Portal Deployment Script (part of 'do_update') ..."/>
- <exec executable="php" logoutput="true" checkreturn="true">
+ <exec executable="${php.binary}" logoutput="true" checkreturn="true">
<arg path="${base.dir}/tools/run_event.php"/>
<arg value="adm:OnDeploy"/>
<arg value="${cli.key}"/>
Event Timeline
Log In to Comment