From 3e66570596dd4f41e27eb216667ce215ffcb69ec Mon Sep 17 00:00:00 2001 From: Jakub Holy Date: Thu, 12 Nov 2020 19:59:21 +0100 Subject: [PATCH] BABASHKA_LEAN: keep some feature enabled --- script/compile | 23 ++++++++++------------- script/uberjar | 23 ++++++++++------------- 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/script/compile b/script/compile index 8f5960ed..3e6bebfe 100755 --- a/script/compile +++ b/script/compile @@ -72,19 +72,16 @@ BABASHKA_LEAN=${BABASHKA_LEAN:-} if [ "$BABASHKA_LEAN" = "true" ] then - export BABASHKA_FEATURE_JDBC=false - export BABASHKA_FEATURE_POSTGRESQL=false - export BABASHKA_FEATURE_HSQLDB=false - export BABASHKA_FEATURE_ORACLEDB=false - export BABASHKA_FEATURE_XML=false - export BABASHKA_FEATURE_YAML=false - export BABASHKA_FEATURE_CORE_ASYNC=false - export BABASHKA_FEATURE_CSV=false - export BABAHSKA_FEATURE_TRANSIT=false - export BABASHKA_FEATURE_JAVA_TIME=false - export BABASHKA_FEATURE_JAVA_NIO=false - export BABASHKA_FEATURE_HTTPKIT_CLIENT=false - export BABASHKA_FEATURE_HTTPKIT_SERVER=false + # Remove all the default features, unless explicitly set to true: + export BABASHKA_FEATURE_XML="${BABASHKA_FEATURE_XML:-false}" + export BABASHKA_FEATURE_YAML="${BABASHKA_FEATURE_YAML:-false}" + export BABASHKA_FEATURE_CORE_ASYNC="${BABASHKA_FEATURE_CORE_ASYNC:-false}" + export BABASHKA_FEATURE_CSV="${BABASHKA_FEATURE_CSV:-false}" + export BABAHSKA_FEATURE_TRANSIT="${BABAHSKA_FEATURE_TRANSIT:-false}" + export BABASHKA_FEATURE_JAVA_TIME="${BABASHKA_FEATURE_JAVA_TIME:-false}" + export BABASHKA_FEATURE_JAVA_NIO="${BABASHKA_FEATURE_JAVA_NIO:-false}" + export BABASHKA_FEATURE_HTTPKIT_CLIENT="${BABASHKA_FEATURE_HTTPKIT_CLIENT:-false}" + export BABASHKA_FEATURE_HTTPKIT_SERVER="${BABASHKA_FEATURE_HTTPKIT_SERVER:-false}" fi "$GRAALVM_HOME/bin/native-image" "${args[@]}" diff --git a/script/uberjar b/script/uberjar index 863888c5..d7f93598 100755 --- a/script/uberjar +++ b/script/uberjar @@ -12,19 +12,16 @@ set -eo pipefail if [ "$BABASHKA_LEAN" = "true" ] then - export BABASHKA_FEATURE_JDBC=false - export BABASHKA_FEATURE_POSTGRESQL=false - export BABASHKA_FEATURE_HSQLDB=false - export BABASHKA_FEATURE_ORACLEDB=false - export BABASHKA_FEATURE_XML=false - export BABASHKA_FEATURE_YAML=false - export BABASHKA_FEATURE_CORE_ASYNC=false - export BABASHKA_FEATURE_CSV=false - export BABAHSKA_FEATURE_TRANSIT=false - export BABASHKA_FEATURE_JAVA_TIME=false - export BABASHKA_FEATURE_JAVA_NIO=false - export BABASHKA_FEATURE_HTTPKIT_CLIENT=false - export BABASHKA_FEATURE_HTTPKIT_SERVER=false + # Remove all the default features, unless explicitly set to true: + export BABASHKA_FEATURE_XML="${BABASHKA_FEATURE_XML:-false}" + export BABASHKA_FEATURE_YAML="${BABASHKA_FEATURE_YAML:-false}" + export BABASHKA_FEATURE_CORE_ASYNC="${BABASHKA_FEATURE_CORE_ASYNC:-false}" + export BABASHKA_FEATURE_CSV="${BABASHKA_FEATURE_CSV:-false}" + export BABAHSKA_FEATURE_TRANSIT="${BABAHSKA_FEATURE_TRANSIT:-false}" + export BABASHKA_FEATURE_JAVA_TIME="${BABASHKA_FEATURE_JAVA_TIME:-false}" + export BABASHKA_FEATURE_JAVA_NIO="${BABASHKA_FEATURE_JAVA_NIO:-false}" + export BABASHKA_FEATURE_HTTPKIT_CLIENT="${BABASHKA_FEATURE_HTTPKIT_CLIENT:-false}" + export BABASHKA_FEATURE_HTTPKIT_SERVER="${BABASHKA_FEATURE_HTTPKIT_SERVER:-false}" fi BABASHKA_LEIN_PROFILES="+uberjar"