Skip to content

Build.sh now has --disable-labview and allows comments in *.opt files #2584

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.

Sign up for GitHub

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

Closed
mwinkel-dev wants to merge 1 commit into from
Closed

Build.sh now has --disable-labview and allows comments in *.opt files #2584

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion deploy/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ OPTIONS
--disable-java
Do not compile java programs (passes --disable-java to configure)

--disable-labview
Do not compile LabVIEW programs (passes --without-labview to configure)

--docker-srcdir=dir
Specify the directory to use inside the docker containers used to build
the code. If not specified the docker containers will use the
Expand Down Expand Up @@ -386,6 +389,9 @@ parsecmd() {
--disable-java)
CONFIGURE_PARAMS="$CONFIGURE_PARAMS --disable-java"
;;
--disable-labview)
CONFIGURE_PARAMS="$CONFIGURE_PARAMS --without-labview"
;;
--docker-srcdir=*)
eval "DOCKER_SRCDIR=${i#*=}"
;;
Expand Down Expand Up @@ -417,7 +423,7 @@ fi
#
if [ -r "${SRCDIR}/deploy/os/${OS}.opts" ]
then
os_opts=$(cat ${SRCDIR}/deploy/os/${OS}.opts)
os_opts=$(grep -v "#" ${SRCDIR}/deploy/os/${OS}.opts)
fi
#
# See if this build was triggered by a trigger job and use
Expand Down