Take 4 for javadoc change - add HBase-trx build

Adding a step to build HBase-trx, since that is required to generate
javadocs.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5fe014bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5fe014bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5fe014bd

Branch: refs/heads/master
Commit: 5fe014bdd2a890cafa6473d44d4e8866b39927a7
Parents: a5e77e5
Author: Hans Zeller <[email protected]>
Authored: Wed Aug 31 17:58:37 2016 +0000
Committer: Hans Zeller <[email protected]>
Committed: Wed Aug 31 17:58:37 2016 +0000

----------------------------------------------------------------------
 core/sqf/sql/scripts/build_apidocs.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5fe014bd/core/sqf/sql/scripts/build_apidocs.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/build_apidocs.sh 
b/core/sqf/sql/scripts/build_apidocs.sh
index 7035c79..4d342e3 100755
--- a/core/sqf/sql/scripts/build_apidocs.sh
+++ b/core/sqf/sql/scripts/build_apidocs.sh
@@ -83,6 +83,13 @@ do
     sql_javadoc)
 
          echo "Building Javadocs for SQL project"
+         echo "Building required HBase-trx jar"
+         cd $MY_SQROOT ; make genverhdr
+         cd $MY_SQROOT/src/seatrans/hbase-trx
+         make clean
+         make
+
+         echo "Now make the actual Javadoc"
          cd $MY_SQROOT/../sql
          mvn javadoc:javadoc
          APIDOC_DIR=target/site/apidocs
@@ -93,8 +100,9 @@ do
 
          echo "Building Doxygen for TMUDF C++ interface"
          cd $MY_SQROOT/../sql/sqludr
-         doxygen doxygen_tmudr*.config
          APIDOC_DIR=tmudr_2.0.1/html
+         rm -rf $APIDOC_DIR
+         doxygen doxygen_tmudr*.config
          TGT_SUBDIR="/tmudr_doxygen"
     ;;
 
@@ -106,10 +114,10 @@ do
 
   if [[ -n "$TGT_DIR" ]]; then
     echo "Moving $d apidocs from $APIDOC_DIR to ${TGT_DIR}${TGT_SUBDIR}"
-    echo "Current working dir is $PWD"
     if [[ ! -d ${TGT_DIR}${TGT_SUBDIR} ]]; then
-      echo "Making target directory ${TGT_DIR}${TGT_SUBDIR}"
       mkdir -p ${TGT_DIR}${TGT_SUBDIR}
+    else
+      rm -rf ${TGT_DIR}${TGT_SUBDIR}
     fi
     mv -f $APIDOC_DIR ${TGT_DIR}${TGT_SUBDIR}
   fi

Reply via email to