Skip to content
Permalink
Browse files

Add composer install to the phing build

Merge remote-tracking branch 'origin/pr/14484' into 3.x

* origin/pr/14484:
  Added --no-dev option to composer install command
  Added copying of build core transport
  Make working distrib building of 3.x branch
  • Loading branch information...
opengeek committed Jul 17, 2019
2 parents 565a3d5 + f8abfff commit a2624858ff58b71604bd92fce56844b2de1d72a9
Showing with 13 additions and 0 deletions.
  1. +3 −0 _build/build.sample.properties
  2. +10 −0 _build/build.xml
@@ -7,6 +7,9 @@ php.command = /opt/local/bin/php
# Git related properties (set you local path here)
git.command = git

# Composer related properties (set you local path here)
composer.command = composer

# override the project name used to generate the distribution filename
#project.name.fs = modx

@@ -46,12 +46,15 @@
<target name="complete" description="--> Complete Build">
<phingcall target="prepare-build-image" />
<phingcall target="git-export-build-image" />
<phingcall target="composer-install-dependencies" />
<!--<phingcall target="copy-core-transport" />-->
<phingcall target="prepare-build-distrib" />
<!--<phingcall target="generate-phpdocs" />-->
<phingcall target="generate-core-transport" />
<phingcall target="copy-core-transport" />
<phingcall target="build-sdk" />
<phingcall target="generate-core-transport" />
<phingcall target="copy-core-transport" />
<phingcall target="build-traditional" />
<phingcall target="build-advanced" />
</target>
@@ -77,6 +80,11 @@
<unzip file="${build.image.dir}.zip" todir="${build.image.basedir}" />
</target>

<!-- Install all core dependencies via composer -->
<target name="composer-install-dependencies" description="" if="build.distrib">
<exec dir="${build.image.dir}" command="${composer.command} install --no-dev" escape="false" />
</target>

<!-- Run the core data generation script -->
<target name="generate-core-data" description="generate core data for MODX from a reference database">
<exec dir="${project.basedir}" command="${php.command} transport.data.php" />
@@ -294,6 +302,7 @@
<include name="core/model/**" />
<include name="core/src/**" />
<include name="core/xpdo/**" />
<include name="core/vendor/**" />
<include name="core/packages/core.transport.zip" />
<include name="core/packages/core/manifest.php" />
<include name="core/packages/core/*/*.vehicle" />
@@ -363,6 +372,7 @@
<include name="core/model/**" />
<include name="core/src/**" />
<include name="core/xpdo/**" />
<include name="core/vendor/**" />
<include name="core/packages/core.transport.zip" />
</fileset>
</zip>

0 comments on commit a262485

Please sign in to comment.
You can’t perform that action at this time.