This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3271
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-3271 by this push:
new 4bc4c67f88 ISIS-3271: adds -K option to build.sh, renames -A to -a
4bc4c67f88 is described below
commit 4bc4c67f88cf2651f7ddea3a76aee6fb0a43c997
Author: Dan Haywood <[email protected]>
AuthorDate: Fri Nov 4 09:13:00 2022 +0000
ISIS-3271: adds -K option to build.sh, renames -A to -a
---
build.sh | 32 ++++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/build.sh b/build.sh
index 8438e420d1..3f0f233b82 100644
--- a/build.sh
+++ b/build.sh
@@ -51,8 +51,9 @@ usage() {
echo " -k use 'package' rather than 'install'. Does not run integ tests.
Cannot combine with '-y'" >&2
echo " -y use 'verify' rather than 'install'. Cannot combine with '-k'"
>&2
echo " -O do NOT add '-o' (offline) flag, ie bring down any new
dependencies" >&2
- echo " -A append '-Dmodule-all. Cannot combine with '-I'"
>&2
- echo " -I append '-Dmodule-all-except-incubator. Cannot combine with '-A'"
>&2
+ echo " -A append '-Dmodule-all'. Cannot combine with '-I' or '-K'"
>&2
+ echo " -K append '-Dmodule-all-except-kroviz'. Cannot combine with '-a' or
'-I'" >&2
+ echo " -I append '-Dmodule-all-except-incubator'. Cannot combine with '-a'
or '-K'" >&2
echo " -F do NOT search for Failures and Errors at the end"
>&2
echo " -S do NOT print summary or last 50 lines at the end"
>&2
echo " -w whatif - don't run the command but do print it out. Implies -v
(verbose)" >&2
@@ -73,13 +74,14 @@ SINGLE_THREADED=false
SKIP_SEARCH_FOR_FAILURES=false
SKIP_SUMMARY=false
ALL=false
+ALL_EXCEPT_KROVIZ=false
ALL_EXCEPT_INCUBATOR=false
EDIT=false
VERBOSE=false
MVN_LOG=/tmp/$BASENAME_0.$$.log
-while getopts 'prcntlkyAIOFSwveh' opt
+while getopts 'prcntlkyaIKOFSwveh' opt
do
case $opt in
p) export GIT_PULL=true ;;
@@ -90,8 +92,9 @@ do
l) export SINGLE_THREADED=true ;;
k) export PACKAGE_ONLY=true ;;
y) export VERIFY_ONLY=true ;;
- A) export ALL=true ;;
+ a) export ALL=true ;;
I) export ALL_EXCEPT_INCUBATOR=true ;;
+ K) export ALL_EXCEPT_KROVIZ=true ;;
F) export SKIP_SEARCH_FOR_FAILURES=true ;;
S) export SKIP_SUMMARY=true ;;
w) export WHATIF=true ;;
@@ -120,8 +123,9 @@ if [ "$VERBOSE" = "true" ]; then
echo "-k PACKAGE_ONLY : $PACKAGE_ONLY"
echo "-y VERIFY_ONLY : $VERIFY_ONLY"
echo "-O SKIP_OFFLINE : $SKIP_OFFLINE"
- echo "-A ALL : $ALL"
+ echo "-a ALL : $ALL"
echo "-I ALL_EXCEPT_INCUBATOR : $ALL_EXCEPT_INCUBATOR"
+ echo "-K ALL_EXCEPT_KROVIZ : $ALL_EXCEPT_ALL_EXCEPT_KROVIZ"
echo "-F SKIP_SEARCH_FOR_FAILURES : $SKIP_SEARCH_FOR_FAILURES"
echo "-S SKIP_SUMMARY : $SKIP_SUMMARY"
echo "-w WHATIF : $WHATIF"
@@ -136,7 +140,19 @@ if [ "$PACKAGE_ONLY" = "true" ] && [ "$VERIFY_ONLY" =
"true" ]; then
fi
if [ "$ALL" = "true" ] && [ "$ALL_EXCEPT_INCUBATOR" = "true" ]; then
- echo "$BASENAME_0 : cannot use '-A' and '-I' flags together" >&2
+ echo "$BASENAME_0 : cannot use '-a' and '-I' flags together" >&2
+ usage
+ exit 1
+fi
+
+if [ "$ALL" = "true" ] && [ "$ALL_EXCEPT_KROVIZ" = "true" ]; then
+ echo "$BASENAME_0 : cannot use '-a' and '-K' flags together" >&2
+ usage
+ exit 1
+fi
+
+if [ "$ALL_EXCEPT_INCUBATOR" = "true" ] && [ "$ALL_EXCEPT_KROVIZ" = "true" ];
then
+ echo "$BASENAME_0 : cannot use '-I' and '-K' flags together" >&2
usage
exit 1
fi
@@ -170,6 +186,10 @@ if [ "$ALL_EXCEPT_INCUBATOR" = "true" ]; then
OPTS="$OPTS -Dmodule-all-except-incubator"
fi
+if [ "$ALL_EXCEPT_KROVIZ" = "true" ]; then
+ OPTS="$OPTS -Dmodule-all-except-kroviz"
+fi
+
if [ "$SKIP_OFFLINE" = "false" ]; then
OPTS="$OPTS -o"
fi
