Iterate plugins for composer task

pydio · May 27, 2016 · 4af8467 · 4af8467
1 parent d74696f
commit 4af8467
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/dist/phing/build-pydio.xml b/dist/phing/build-pydio.xml
@@ -142,13 +142,10 @@
         </phingcall>
 
         <!-- RUN COMPOSER IF NECESSARY -->
-        <if>
-            <available type="file" file="${INNER_DIRECTORY}/core/composer.json"/>
-            <then>
-		<exec command="composer install --optimize-autoloader"
-		      dir="${INNER_DIRECTORY}/core" />
-            </then>
-        </if>
+        <phingcall target="iterate-plugins">
+            <property name="plugins_dir" value="${INNER_DIRECTORY}/plugins"/>
+            <property name="target" value="composer"/>
+        </phingcall>
 
     	<!-- BUILD JAVASCRIPT -->
         <phingcall target="iterate-plugins">
@@ -551,6 +548,18 @@
         </if>
     </target>
 
+    <target name="composer">
+        <if>
+            <available type="file" file="${plugin_abs_dir}/composer.json"/>
+            <then>
+                <exec command="composer install --optimize-autoloader"
+                      dir="${plugin_abs_dir}"
+                      passthru="true"
+                />
+            </then>
+        </if>
+    </target>
+
     <target name="clean" description="Clean all working folders">
         <foreach list="${build.source_folder},${git.local_repository},${build.working_folder}/build,${build.working_folder}/ext_plugins,${build.working_folder}/upgrade,${build.working_folder}/dist,${build.working_folder}/deb,${build.working_folder}/rpm" param="filename" absparam="absfilename" target="delete_me">
         </foreach>