|
589 | 589 | </fileset>
|
590 | 590 | </copy>
|
591 | 591 |
|
592 |
| - <property name="grunt-target" value=""/> |
593 | 592 | <if>
|
594 | 593 | <and>
|
595 | 594 | <isset property="js-required"/>
|
|
598 | 597 | </and>
|
599 | 598 | <then>
|
600 | 599 | <echo message=" --> Target type:js only"/>
|
601 |
| - <property name="grunt-target" value="type:js"/> |
| 600 | + <property name="grunttarget" value="type:js"/> |
602 | 601 | </then>
|
603 | 602 | <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> |
607 | 608 | <then>
|
608 | 609 | <echo message=" --> Target type:css only"/>
|
609 |
| - <property name="grunt-target" value="type:css"/> |
| 610 | + <property name="grunttarget" value="type:css"/> |
610 | 611 | </then>
|
611 | 612 | </elseif>
|
612 | 613 | </if>
|
613 | 614 |
|
| 615 | + <echo message=" --> Grunt Target Value is ${grunttarget}"/> |
614 | 616 | <phingcall target="grunt">
|
615 | 617 | <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}"/> |
617 | 619 | </phingcall>
|
618 | 620 | </then>
|
619 | 621 | </if>
|
|
646 | 648 | </target>
|
647 | 649 |
|
648 | 650 | <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> |
658 | 651 | <if>
|
659 | 652 | <available file="${plugin_abs_dir}/package.json"/>
|
660 | 653 | <then>
|
661 | 654 | <!-- BUILD JAVASCRIPT -->
|
662 | 655 | <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"/> |
664 | 657 | <delete dir="${plugin_abs_dir}/node_modules"/>
|
665 | 658 | </then>
|
666 | 659 | </if>
|
|
0 commit comments