Skip to content

Commit

Permalink
Zowe Suite v2.16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zowe-robot authored May 1, 2024
2 parents 42396d7 + 3ba7cda commit 9b1794d
Showing 1 changed file with 29 additions and 1 deletion.
30 changes: 29 additions & 1 deletion build_ng2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
<param name="buildType" value="build"/>
</antcall>

<antcall target="npmInstall">
<!-- TODO: Update component's dependencies such that install passes with npmInstall -->
<antcall target="npmInstallLegacy">
<param name="packagejson.Location" value="${capstone}/zlux-app-manager/system-apps/admin-notification-app/webClient"/>
</antcall>
<antcall target="npmBuild">
Expand Down Expand Up @@ -238,6 +239,33 @@
</if>
</target>

<target name="npmInstallLegacy" depends="package.jsonExists" if="package.jsonPresent">
<exec executable="cmd"
dir="${packagejson.Location}"
osfamily="windows"
resultproperty="rc"
searchpath="true">
<arg line="/c npm install --legacy-peer-deps"/>
</exec>
<exec executable="npm"
dir="${packagejson.Location}"
osfamily="unix"
resultproperty="rc"
searchpath="true">
<arg line="install"/>
</exec>

<echo message="Result of install in ${packagejson.Location} is: ${rc}"/>
<if>
<not>
<equals arg1="${rc}" arg2="0"/>
</not>
<then>
<fail message="Error with npm install in ${packagejson.Location}" />
</then>
</if>
</target>

<target name="npmRunI18n" depends="package.jsonExists" if="package.jsonPresent">
<exec executable="cmd"
dir="${packagejson.Location}"
Expand Down

0 comments on commit 9b1794d

Please sign in to comment.