icu4j + coverity!

Author: srl295

.gitignore

@@ -12,4 +12,4 @@ src/tmp
 /Makefile.local
 /local-*
 /src/bin/cov-analysis-linux64*
-/src/bin/local-coverity.sh
+/src/bin/local-*

README.md

@@ -48,8 +48,18 @@ this will make error messages work
     checking for ICU version numbers...
 ```
 
+## ICU4J
+
+- the following will build (in-source!) using adoptopenjdk9
+
+```shell
+docker-compose run fedora-j ant jar check
+```
+
 ## Coverity Scan
 
+### ICU4C
+
 https://scan.coverity.com/
 
 - download the scanning tools and install them as `src/bin/cov-analysis-linux64/`
@@ -59,23 +69,21 @@ https://scan.coverity.com/
 the following contents: (see the coverity page for the project for more details)
 
 ```shell
-export PROJ=icu4c
 export COVERITY_TOKEN=yourtoken
 export [email protected]
 ```
 
+
 - Kick it off: `docker-compose run ubuntu /src/bin/cov-icu4c.sh`
 
 Note: you may want to do `docker-compose run ubuntu` and then run the script from the command line
 if there are problems.
 
-## ICU4J
-
-- the following will build (in-source!) using adoptopenjdk9
+### ICU4J 
 
-```shell
-docker-compose run fedora-j ant jar check
-```
+- For J, create a similar `src/bin/local-coverity-j.sh`
+- Then run:
+`docker-compose -f local-docker-compose.yml run fedora-j /src/bin/cov-icu4j.sh`
 
 ## Author
 

dockerfiles/fedora-j/Dockerfile

@@ -13,6 +13,7 @@ RUN dnf -q -y upgrade $RPMOPTZ
 ADD adoptopenjdk.repo /etc/yum.repos.d
 RUN dnf -q -y install adoptopenjdk-8-openj9 $RPMOPTZ
 RUN dnf -q -y install ant $RPMOPTZ
+RUN dnf -q -y install git curl $RPMOPTZ
 #extra
 # editing
 #RUN apt-get -q -y install emacs24-nox

src/bin/cov-icu4j.sh

@@ -0,0 +1,52 @@
+#!/bin/sh
+
+PROJ=icu4j
+COVDIR=/src/bin/cov-analysis-linux64/
+#  much of the rest is common to C and J - except build and auth
+if [ ! -x /src/bin/local-coverity.sh ];
+then
+    echo missing /src/bin/local-coverity-j.sh
+    exit 1
+fi
+. /src/bin/local-coverity.sh
+if [ ! -d ${COVDIR} ];
+then
+    echo missing coverity dir ${COVDIR}
+    exit 1
+fi
+
+export PATH=${COVDIR}/bin:${PATH}
+# export WORKSPACE=$(pwd)
+export SRCDIR=/src/icu/icu4j
+# BLDDIR=${HOME}/${PROJ}.build.cov
+# echo building ${SRCDIR} in ${BLDDIR}
+# rm -rf ${BLDDIR} ; mkdir -p ${BLDDIR}
+# assume we can use C's ver!
+VERFILE=${SRCDIR}/../icu4c/source/common/unicode/uvernum.h
+# Get the ICU version from uversion.h or other headers
+geticuversion() {
+    sed -n 's/^[ 	]*#[ 	]*define[ 	]*U_ICU_VERSION[ 	]*"\([^"]*\)".*/\1/p' "$@"
+}
+ICUVER=`geticuversion ${VERFILE}`
+SVN_REVISION=$(cd ${SRCDIR} >/dev/null && (git describe --tags --exact-match 2>/dev/null || git rev-parse --short HEAD) || echo 'unknown')
+echo $ICUVER $SVN_REVISION
+cd ${SRCDIR}
+# C specific build
+# ${SRCDIR}/source/configure --disable-renaming --disable-extras --with-data-packaging=archive
+ant clean
+env COVERITY_UNSUPPORTED=1 ${COVDIR}/bin/cov-build --dir ${HOME}/cov-int ant || exit 1
+fgrep '[WARNING] No files were emitted' ${HOME}/cov-int/build-log.txt  && exit 1
+cd ${HOME} && tar cfpz ${PROJ}.tgz ./cov-int &&
+ls -lh ${PROJ}.tgz &&
+curl --form token=${COVERITY_TOKEN} \
+     --form email=${COVERITY_EMAIL} \
+     --form file=@${PROJ}.tgz \
+     --form version="${ICUVER}" \
+     --form description="Manual submit from ${COVERITY_EMAIL} ${SVN_REVISION}" \
+     https://scan.coverity.com/builds?project=${PROJ} -o form-submit.$$
+cat form-submit.$$ || exit 1
+echo uploaded r${SVN_REVISION} ${PROJ} ${ICUVER} as ${PROJ}.tgz
+echo done
+exit 0
+
+