Browse Source

add cobbzilla-parent submodule

master
Jonathan Cobb 4 years ago
parent
commit
2d8553bc08
4 changed files with 12 additions and 4 deletions
  1. +3
    -0
      .gitmodules
  2. +8
    -4
      bin/jvc_common
  3. +0
    -0
      bin/use_https_submodules
  4. +1
    -0
      utils/cobbzilla-parent

+ 3
- 0
.gitmodules View File

@@ -1,3 +1,6 @@
[submodule "utils/cobbzilla-utils"] [submodule "utils/cobbzilla-utils"]
path = utils/cobbzilla-utils path = utils/cobbzilla-utils
url = git@git.bubblev.org:bubblev/cobbzilla-utils.git url = git@git.bubblev.org:bubblev/cobbzilla-utils.git
[submodule "utils/cobbzilla-parent"]
path = utils/cobbzilla-parent
url = git@git.bubblev.org:bubblev/cobbzilla-parent.git

+ 8
- 4
bin/jvc_common View File

@@ -61,24 +61,28 @@ if [[ -z "${JVC_JAR}" ]] ; then
die "Maven not installed (mvn command not found on PATH), cannot build JVC jar" die "Maven not installed (mvn command not found on PATH), cannot build JVC jar"
fi fi


# Build and install utility library
# Build and install utility libraries
pushd "${JVC_DIR}"/utils/cobbzilla-parent || die "Error changing directories to ${JVC_DIR}/utils/cobbzilla-parent"
mvn install || die "Error installing cobbzilla-parent"
popd || die "popd error (pwd=$(pwd))"

pushd "${JVC_DIR}"/utils/cobbzilla-utils || die "Error changing directories to ${JVC_DIR}/utils/cobbzilla-utils" pushd "${JVC_DIR}"/utils/cobbzilla-utils || die "Error changing directories to ${JVC_DIR}/utils/cobbzilla-utils"
if [[ -z "$(find target -type f -name "*.jar")" ]] ; then if [[ -z "$(find target -type f -name "*.jar")" ]] ; then
if [[ -z "$(find . -type f)" ]] ; then if [[ -z "$(find . -type f)" ]] ; then
cd ../.. && \ cd ../.. && \
./bin/use_https_submodule && \
./bin/use_https_submodules && \
git submodule update --init --recursive && \ git submodule update --init --recursive && \
cd - \ cd - \
|| die "Error updating git submodule" || die "Error updating git submodule"
fi fi
mvn -DskipTests=true clean install || die "Error building cobbzilla-utils library" mvn -DskipTests=true clean install || die "Error building cobbzilla-utils library"
popd || die "popd error"
fi fi
popd || die "popd error (pwd=$(pwd))"


# Build jvc uberjar # Build jvc uberjar
pushd "${JVC_DIR}" || die "Error changing directories to ${JVC_DIR}" pushd "${JVC_DIR}" || die "Error changing directories to ${JVC_DIR}"
mvn -DskipTests=true -Puberjar clean package || die "Error building JVC jar" mvn -DskipTests=true -Puberjar clean package || die "Error building JVC jar"
popd || die "popd error"
popd || die "popd error (pwd=$(pwd))"


JVC_JAR="$(find "${JVC_DIR}"/target -type f -name "jvc-*-prod.jar" | head -1)" JVC_JAR="$(find "${JVC_DIR}"/target -type f -name "jvc-*-prod.jar" | head -1)"
if [[ -z "${JVC_JAR}" ]] ; then if [[ -z "${JVC_JAR}" ]] ; then


bin/use_https_submodule → bin/use_https_submodules View File


+ 1
- 0
utils/cobbzilla-parent

@@ -0,0 +1 @@
Subproject commit 8e7003de03983a4a683702436b89469dac0ffe0a

Loading…
Cancel
Save