Skip to content

Commit

Permalink
Merge pull request #38 from zowe/rc
Browse files Browse the repository at this point in the history
Rc
  • Loading branch information
1000TurquoisePogs authored Oct 4, 2019
2 parents 3b5f24a + dee00bf commit ce57c3b
Showing 1 changed file with 37 additions and 1 deletion.
38 changes: 37 additions & 1 deletion build_ng2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,16 @@
<antcall target="npmBuild">
<param name="packagejson.Location" value="${capstone}/zlux-shared/src/obfuscator"/>
<param name="buildType" value="build"/>
</antcall>
</antcall>
<antcall target="npmRunI18n">
<param name="packagejson.Location" value="${capstone}/zlux-app-manager/virtual-desktop"/>
</antcall>
<antcall target="npmRunI18n">
<param name="packagejson.Location" value="${capstone}/zlux-app-manager/system-settings-preferences/webClient"/>
</antcall>
<antcall target="npmRunI18n">
<param name="packagejson.Location" value="${capstone}/zlux-app-manager/app-prop-viewer/webClient"/>
</antcall>

<copy file="${capstone}/zlux-app-manager/virtual-desktop/node_modules/requirejs/require.js" tofile="${capstone}/zlux-app-manager/virtual-desktop/web/require.js" unless:set="isZos"/>

Expand Down Expand Up @@ -196,6 +205,33 @@
</then>
</if>
</target>

<target name="npmRunI18n" depends="package.jsonExists" if="package.jsonPresent">
<exec executable="cmd"
dir="${packagejson.Location}"
osfamily="windows"
resultproperty="rc"
searchpath="true">
<arg line="/c npm run i18n"/>
</exec>
<exec executable="npm"
dir="${packagejson.Location}"
osfamily="unix"
resultproperty="rc"
searchpath="true">
<arg line="run i18n"/>
</exec>

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

<target name="npmBuild" depends="package.jsonExists" if="package.jsonPresent">
<exec executable="cmd"
Expand Down

0 comments on commit ce57c3b

Please sign in to comment.