Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt at pipeline changes #148

Open
wants to merge 2 commits into
base: v3.x/staging
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion build_ng2.xml
Original file line number Diff line number Diff line change
@@ -55,9 +55,11 @@
</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"/>
<copy file="${capstone}/zlux-app-manager/virtual-desktop-v2/node_modules/requirejs/require.js" tofile="${capstone}/zlux-app-manager/virtual-desktop-v2/web/require.js" unless:set="isZos"/>

<exec if:set="isZos" executable="sh">
<arg line="-c 'cp -p ${capstone}/zlux-app-manager/virtual-desktop/node_modules/requirejs/require.js ${capstone}/zlux-app-manager/virtual-desktop/web/require.js'"/>
<arg line="-c 'cp -p ${capstone}/zlux-app-manager/virtual-desktop-v2/node_modules/requirejs/require.js ${capstone}/zlux-app-manager/virtual-desktop-v2/web/require.js'"/>
</exec>

</target>
@@ -83,6 +85,7 @@
<include name="**/webClient"/>
<exclude name="**/zssServer/**"/>
<exclude name="zlux-app-manager/virtual-desktop/**"/>
<exclude name="zlux-app-manager/virtual-desktop-v2/**"/>
<exclude name="zlux-platform/interface/**"/>
<exclude name="zlux-app-server/node_modules/**"/>
<exclude name="zlux-server-framework/node_modules/**"/>
@@ -103,6 +106,7 @@
<exclude name="zlux-build/**"/>
<exclude name="**/node_modules/**"/>
<exclude name="zlux-app-manager/virtual-desktop/**"/>
<exclude name="zlux-app-manager/virtual-desktop-v2/**"/>
<exclude name="zlux-platform/interface/**"/>
<exclude name="zlux-shared/src/**"/>
</fileset>
@@ -157,6 +161,7 @@
<or>
<equals arg1="${plugin}" arg2="../../zlux-app-manager/bootstrap"/>
<equals arg1="${plugin}" arg2="../../zlux-app-manager/virtual-desktop"/>
<equals arg1="${plugin}" arg2="../../zlux-app-manager/virtual-desktop-v2"/>
</or>
</not>
<then>
@@ -218,12 +223,23 @@
</antcall>
<antcall target="npmBuild">
<param name="packagejson.Location" value="${capstone}/zlux-app-manager/virtual-desktop"/>
<param name="buildType" value="build:externals"/>
<param name="buildType" value="build:externals"/> <!-- might not be needed -->
</antcall>
<antcall target="npmBuild">
<param name="packagejson.Location" value="${capstone}/zlux-app-manager/virtual-desktop"/>
<param name="buildType" value="build"/>
</antcall>
<antcall target="npmInstall" unless:set="noInstall">
<param name="packagejson.Location" value="${capstone}/zlux-app-manager/virtual-desktop-v2"/>
</antcall>
<antcall target="npmBuild">
<param name="packagejson.Location" value="${capstone}/zlux-app-manager/virtual-desktop-v2"/>
<param name="buildType" value="build:externals"/>
</antcall>
<antcall target="npmBuild">
<param name="packagejson.Location" value="${capstone}/zlux-app-manager/virtual-desktop-v2"/>
<param name="buildType" value="build"/>
</antcall>
</target>

<target name="npmInstall" depends="package.jsonExists" if="package.jsonPresent">
2 changes: 2 additions & 0 deletions core-plugins.properties
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@ CORE_PLUGINS=zlux-shared/src/logging/package.json,\
zlux-app-manager/bootstrap/pluginDefinition.json,\
zlux-app-manager/virtual-desktop/package.json,\
zlux-app-manager/virtual-desktop/pluginDefinition.json,\
zlux-app-manager/virtual-desktop-v2/package.json,\
zlux-app-manager/virtual-desktop-v2/pluginDefinition.json,\
zlux-server-framework/package.json,\
zlux-server-framework/plugins/config/pluginDefinition.json,\
zlux-server-framework/plugins/terminal-proxy/pluginDefinition.json
Loading