Skip to content
Snippets Groups Projects
Commit 4832b891 authored by Jason Hiser's avatar Jason Hiser :tractor:
Browse files

Merge branch 'xeon_updated' into 'master'

xeon

See merge request allnp/peasoup_umbrella!3

Former-commit-id: 48f8ada7
parents 0a61b9a9 ad6c5930
No related branches found
No related tags found
No related merge requests found
......@@ -57,3 +57,6 @@
[submodule "zipr_install"]
path = zipr_install
url = git@git.zephyr-software.com:allnp/zipr_install.git
[submodule "zipr_xeon_plugin"]
path = zipr_xeon_plugin
url = git@git.zephyr-software.com:allnp/xeon_plugin
......@@ -115,6 +115,11 @@ if [ -d $ZIPR_SCFI_PLUGIN ]; then
scons $SCONSDEBUG || exit 1
fi
if [ -d $ZIPR_XEON_PLUGIN ]; then
cd $ZIPR_XEON_PLUGIN
scons $SCONSDEBUG || exit
fi
cd $PEASOUP_UMBRELLA_DIR/zipr_large_only_plugin/
scons $SCONSDEBUG || exit 1
......
......@@ -17,6 +17,7 @@ export ZIPR_INSTALL=$PEASOUP_UMBRELLA_DIR/zipr_install
export ZIPR_CALLBACKS=$PEASOUP_UMBRELLA_DIR/zipr_callbacks
export ZIPR_SDK=$PEASOUP_UMBRELLA_DIR/zipr_sdk
export ZIPR_SCFI_PLUGIN=$PEASOUP_UMBRELLA_DIR/zipr_scfi_plugin
export ZIPR_XEON_PLUGIN=$PEASOUP_UMBRELLA_DIR/zipr_xeon_plugin
export SECURITY_TRANSFORMS_HOME=$PEASOUP_UMBRELLA_DIR/security_transforms
export IRDB_TRANSFORMS=$PEASOUP_UMBRELLA_DIR/irdb_transforms
export ZEST_RUNTIME=$PEASOUP_UMBRELLA_DIR/zest_runtime
......
Subproject commit e1cfb5c43da48c1bfade08f4e53ed7b29f59714f
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment