Bladeren bron

have a full jar and a regular jar

tags/v1.4.49
Jonathan Cobb 3 jaren geleden
bovenliggende
commit
3dc5f7c0b5
4 gewijzigde bestanden met toevoegingen van 18 en 8 verwijderingen
  1. +7
    -0
      bin/bubble_common
  2. +2
    -1
      bin/first_time_setup.sh
  3. +2
    -1
      bin/git_update_bubble.sh
  4. +7
    -6
      bubble-server/pom.xml

+ 7
- 0
bin/bubble_common Bestand weergeven

@@ -106,6 +106,13 @@ if [[ -z "${BUBBLE_JAR}" ]] ; then
BUBBLE_JAR="${BUBBLE_SCRIPTS}/../bubble.jar"
else
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
if [[ -z "${BUBBLE_JAR}" ]] ; then


+ 2
- 1
bin/first_time_setup.sh Bestand weergeven

@@ -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"

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
die "env var BUBBLE_SETUP_MODE was invalid: ${BUBBLE_SETUP_MODE}"


+ 2
- 1
bin/git_update_bubble.sh Bestand weergeven

@@ -57,5 +57,6 @@ popd
if [[ ${FAST} -eq 1 ]] ; then
mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error building bubble jar"
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

+ 7
- 6
bubble-server/pom.xml
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


Laden…
Annuleren
Opslaan