@@ -106,6 +106,13 @@ if [[ -z "${BUBBLE_JAR}" ]] ; then | |||||
BUBBLE_JAR="${BUBBLE_SCRIPTS}/../bubble.jar" | BUBBLE_JAR="${BUBBLE_SCRIPTS}/../bubble.jar" | ||||
else | else | ||||
BUBBLE_JAR="$(find "${BUBBLE_SCRIPTS}/../bubble-server/target" -type f -name "bubble*.jar" | head -1)" | BUBBLE_JAR="$(find "${BUBBLE_SCRIPTS}/../bubble-server/target" -type f -name "bubble*.jar" | head -1)" | ||||
if [[ ! -z "${BUBBLE_JAR}" ]] ; then | |||||
# Use full jar if available. Client libraries like to have the JS engine for example. This is stripped from the server. | |||||
BUBBLE_FULL_JAR="$(find "${BUBBLE_SCRIPTS}/../bubble-server/target" -type f -name "bubble*-full.jar" | head -1)" | |||||
if [[ ! -z "${BUBBLE_FULL_JAR}" ]] ; then | |||||
BUBBLE_JAR="${BUBBLE_FULL_JAR}" | |||||
fi | |||||
fi | |||||
fi | fi | ||||
fi | fi | ||||
if [[ -z "${BUBBLE_JAR}" ]] ; then | if [[ -z "${BUBBLE_JAR}" ]] ; then | ||||
@@ -61,7 +61,8 @@ elif [[ "${BUBBLE_SETUP_MODE}" == "debug" ]] ; then | |||||
DEBUG_BUILD=debug mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error building bubble jar" | DEBUG_BUILD=debug mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error building bubble jar" | ||||
elif [[ "${BUBBLE_SETUP_MODE}" == "production" ]] ; then | elif [[ "${BUBBLE_SETUP_MODE}" == "production" ]] ; then | ||||
BUBBLE_PRODUCTION=1 mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error building bubble jar" | |||||
BUBBLE_PRODUCTION=1 mvn -DskipTests=true -Dcheckstyle.skip=true -Pproduction clean package || die "Error building bubble jar" | |||||
BUBBLE_PRODUCTION=1 mvn -DskipTests=true -Dcheckstyle.skip=true -Pproduction-full package || die "Error building bubble full jar" | |||||
else | else | ||||
die "env var BUBBLE_SETUP_MODE was invalid: ${BUBBLE_SETUP_MODE}" | die "env var BUBBLE_SETUP_MODE was invalid: ${BUBBLE_SETUP_MODE}" | ||||
@@ -57,5 +57,6 @@ popd | |||||
if [[ ${FAST} -eq 1 ]] ; then | if [[ ${FAST} -eq 1 ]] ; then | ||||
mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error building bubble jar" | mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error building bubble jar" | ||||
else | else | ||||
INSTALL_WEB=web mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error building bubble jar" | |||||
BUBBLE_PRODUCTION=1 mvn -DskipTests=true -Dcheckstyle.skip=true -Pproduction clean package || die "Error building bubble jar" | |||||
BUBBLE_PRODUCTION=1 mvn -DskipTests=true -Dcheckstyle.skip=true -Pproduction-full package || die "Error building bubble full jar" | |||||
fi | fi |