diff options
| author |   Michal Cmarada <mcmarada@cisco.com> | 2019-02-19 10:37:32 +0100 |
|---|---|---|
| committer | Michal Cmarada <mcmarada@cisco.com> | 2019-02-19 10:46:35 +0100 |
| commit | d9599f0fc9c1cdde7b03b71bd0fa32081f93a475 (patch) | |
| tree | 6c92b8bc2f315b02e20d954df11b6e50c1e4b694 | |
| parent | eb28616ca1c69184b7b2b4cf4ba96cf4df29f978 (diff) | |
update install_jvpp local script
Change-Id: I1873e36579dcfc6c03cda8226c83c50245f09423
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
| -rw-r--r-- | docs/jvpp.rst | 5 | ||||
| -rwxr-xr-x | scripts/install_jvpp.sh (renamed from install_jvpp.sh) | 27 |
2 files changed, 23 insertions, 9 deletions
diff --git a/docs/jvpp.rst b/docs/jvpp.rst index 7e07b80..ffa996a 100644 --- a/docs/jvpp.rst +++ b/docs/jvpp.rst @@ -149,9 +149,8 @@ Installing JVPP manually to local maven repository -------------------------------------------------- Once JVPP is successfully built, you can install it to local .m2 repository. -To do so use provided script in JVPP root directory: +To do so use provided script in JVPP scripts directory: .. code-block:: console - ./install_jvpp.sh - + ./scripts/install_jvpp.sh diff --git a/install_jvpp.sh b/scripts/install_jvpp.sh index 52d453e..0521287 100755 --- a/install_jvpp.sh +++ b/scripts/install_jvpp.sh @@ -13,12 +13,27 @@ # See the License for the specific language governing permissions and # limitations under the License. -MAIN_VER="$(./version | cut -f1 -d"-")" -VERSION="$(./version | cut -f1 -d"~")" +dir=$( cd "$(dirname "${BASH_SOURCE}")" ; pwd -P ) -echo "Main version: ${MAIN_VER}" -echo "full version: ${VERSION}" -cd ./java +cd "$dir" + +MAIN_VER="$(../version | cut -f1 -d"-")" +RLS_VER="$(../version | cut -f1 -d"~" | cut -f2 -d"-")" + +#update version based on release version rc* -> SNAPSHOT or release -> main version +if [[ ${RLS_VER} == rc* ]]; then + VERSION=${MAIN_VER}-SNAPSHOT +elif [[ ${RLS_VER} == release ]]; then + VERSION=${MAIN_VER} +else + echo "Error unrecognized release version. Exiting maven installation." + exit 1; +fi + +echo "Main version:" ${MAIN_VER} +echo "Maven artifacts version:" ${VERSION} + +cd "$dir/../java/" echo "Installing jars to Maven:" mvn install:install-file -Dfile=jvpp-registry-${MAIN_VER}.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-registry -Dversion=${VERSION} -Dpackaging=jar @@ -30,4 +45,4 @@ mvn install:install-file -Dfile=jvpp-nat-${MAIN_VER}.jar -DgroupId=io.fd.vpp mvn install:install-file -Dfile=jvpp-nsh-${MAIN_VER}.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-nsh -Dversion=${VERSION} -Dpackaging=jar mvn install:install-file -Dfile=jvpp-acl-${MAIN_VER}.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-acl -Dversion=${VERSION} -Dpackaging=jar -echo "all done."
\ No newline at end of file +echo "all done." |