Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit c6287ed

Browse files
author
user
committed
fix build
1 parent 69ff754 commit c6287ed

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

dist/phing/build-pydio.xml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,6 @@
589589
</fileset>
590590
</copy>
591591

592-
<property name="grunt-target" value=""/>
593592
<if>
594593
<and>
595594
<isset property="js-required"/>
@@ -598,22 +597,25 @@
598597
</and>
599598
<then>
600599
<echo message=" --> Target type:js only"/>
601-
<property name="grunt-target" value="type:js"/>
600+
<property name="grunttarget" value="type:js"/>
602601
</then>
603602
<elseif>
604-
<isset property="css-required"/>
605-
<isset property="has-js-path"/>
606-
<not><isset property="js-required"/></not>
603+
<and>
604+
<isset property="css-required"/>
605+
<isset property="has-js-path"/>
606+
<not><isset property="js-required"/></not>
607+
</and>
607608
<then>
608609
<echo message=" --> Target type:css only"/>
609-
<property name="grunt-target" value="type:css"/>
610+
<property name="grunttarget" value="type:css"/>
610611
</then>
611612
</elseif>
612613
</if>
613614

615+
<echo message=" --> Grunt Target Value is ${grunttarget}"/>
614616
<phingcall target="grunt">
615617
<property name="plugin_abs_dir" override="true" value="${upgrade_export}/plugins/${plugin}"/>
616-
<property name="grunt_target" value="${grunt-target}"/>
618+
<property name="grunt_target" override="true" value="${grunttarget}"/>
617619
</phingcall>
618620
</then>
619621
</if>
@@ -646,21 +648,12 @@
646648
</target>
647649

648650
<target name="grunt">
649-
<if>
650-
<isset property="grunt_target"/>
651-
<then>
652-
<property name="command" value="grunt ${grunt_target}"/>
653-
</then>
654-
<else>
655-
<property name="command" value="grunt"/>
656-
</else>
657-
</if>
658651
<if>
659652
<available file="${plugin_abs_dir}/package.json"/>
660653
<then>
661654
<!-- BUILD JAVASCRIPT -->
662655
<exec command="npm install" dir="${plugin_abs_dir}" passthru="true"/>
663-
<exec command="${command}" dir="${plugin_abs_dir}" passthru="true"/>
656+
<exec command="grunt ${grunt_target}" dir="${plugin_abs_dir}" passthru="true"/>
664657
<delete dir="${plugin_abs_dir}/node_modules"/>
665658
</then>
666659
</if>

0 commit comments

Comments
 (0)