Take 5 for javadoc change - taking a completely different approach After talking to Steve and Gunnar, I am implementing a different method for adding apidocs. We can leave the generation out of the docs build and have a separate step to generate apidocs. The new file introduced here, build_apidocs.sh will be used for the separate step. Removing the code that invokes build_apidocs.sh from the docs build.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/bf86fa41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/bf86fa41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/bf86fa41 Branch: refs/heads/master Commit: bf86fa41251e5ad82149de49f2867e607624236f Parents: 6387aab Author: Hans Zeller <[email protected]> Authored: Wed Aug 31 20:16:21 2016 +0000 Committer: Hans Zeller <[email protected]> Committed: Wed Aug 31 20:16:21 2016 +0000 ---------------------------------------------------------------------- core/sqf/sql/scripts/build_apidocs.sh | 9 --------- docs/spj_guide/pom.xml | 24 ------------------------ 2 files changed, 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/bf86fa41/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 0b57bad..e8d228f 100755 --- a/core/sqf/sql/scripts/build_apidocs.sh +++ b/core/sqf/sql/scripts/build_apidocs.sh @@ -83,15 +83,6 @@ 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 sure the set -pipefail command in the make file is - # supported by using bash as the shell - make SHELL=/bin/bash - - echo "Now make the actual Javadoc" cd $MY_SQROOT/../sql mvn javadoc:javadoc APIDOC_DIR=target/site/apidocs http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/bf86fa41/docs/spj_guide/pom.xml ---------------------------------------------------------------------- diff --git a/docs/spj_guide/pom.xml b/docs/spj_guide/pom.xml index c6f8580..51f7177 100644 --- a/docs/spj_guide/pom.xml +++ b/docs/spj_guide/pom.xml @@ -264,30 +264,6 @@ </execution> </executions> </plugin> - <!-- Build Doxygen site for Trafodion TMUDF C++ interface --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.1.1</version> - <executions> - <execution> - <id>build-javadoc</id> - <phase>site</phase> - <goals> - <goal>exec</goal> - </goals> - </execution> - </executions> - <configuration> - <executable>${env.MY_SQROOT}/sql/scripts/build_apidocs.sh</executable> - <arguments> - <argument>-o</argument> - <argument>${basedir}/target/site/apidocs</argument> - <argument>sql_javadoc</argument> - <argument>udr_doxygen</argument> - </arguments> - </configuration> - </plugin> </plugins> </build>
