DoxyGen file update

Change-Id: I5eb473f98b4815a1189a219424888c814f5223ad
Signed-off-by: uzchoi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13373
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

diff --git a/build_docs.sh b/build_docs.sh
deleted file mode 100755 (executable)
index d578344..0000000
--- a/build_docs.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-# Fail script on any failure
-set -e
-
-# Move to script direotory
-pushd `dirname $0` > /dev/null
-
-rm -rf docs
-
-# JavaDoc now... from Uze's script
-ANDROID_JAR="$ANDROID_HOME/platforms/android-21/android.jar"
-
-#if [ ! -e "$ANDROID_JAR" ]; then
-#    echo "Android platform not found. Expected '$ANDROID_JAR'"
-#    exit 1
-#fi
-BASE_PATH="android/android_api/base/src/main/java/"
-BASE_PKG="org.iotivity.base"
-
-ES_PATH="service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/"
-ES_PKG="org.iotivity.service.easysetup.mediator"
-
-NS_PATH="service/notification/android/notification-service/src/main/java/"
-NS_PKG_1="org.iotivity.service.ns.common"
-NS_PKG_2="org.iotivity.service.ns.provider"
-NS_PKG_3="org.iotivity.service.ns.consumer"
-
-RC_PATH="service/resource-container/android/resource-container/src/main/java/"
-RC_PKG="org.iotivity.service.resourcecontainer"
-
-RE_PATH="service/resource-encapsulation/android/service/src/main/java/"
-RE_PKG_1="org.iotivity.service"
-RE_PKG_2="org.iotivity.service.server"
-RE_PKG_3="org.iotivity.service.client"
-
-TM_PATH="service/things-manager/sdk/java/src/"
-TM_PKG="org.iotivity.service.tm"
-
-
-javadoc -splitindex \
-        -d ./docs/java \
-        -sourcepath $BASE_PATH:$RE_PATH:$RC_PATH:$ES_PATH:$NS_PATH \
-        $BASE_PKG $NS_PKG_1 $NS_PKG_2 $NS_PKG_3 $RE_PKG_1 $RE_PKG_2 $RE_PKG_3 $RC_PKG $ES_PKG 
-#        -classpath $ANDROID_JAR
-
-# Doxygen now...
-# NOTE: For now this is a workaround since I am ready to modify the doxygen setup
-pushd resource/docs > /dev/null
-doxygen
-
-# Check for warnings or errors
-if [ -s doxygen.log ]; then
-    echo "Errors running doxygen. Review doxygen.log"
-    exit 2
-fi
-
-popd > /dev/null
-rm -rf docs/cxx
-mv resource/docs/docs/html docs/cxx
-
-popd > /dev/null

diff --git a/resource/docs/c-doc/Doxyfile b/resource/docs/c-doc/Doxyfile
index cf80e57..1d82a1d 100644 (file)
--- a/resource/docs/c-doc/Doxyfile
+++ b/resource/docs/c-doc/Doxyfile
@@ -660,12 +660,12 @@ WARN_LOGFILE           = ./doxygen.log
 # with spaces.
 
 INPUT                  = . \
-             ../../csdk/security/provisioning/include/ocprovisioningmanager.h
-             ../../csdk/security/provisioning/include/pmtypes.h
-             ../../csdk/security/provisioning/include/pmutility.h
-             ../../csdk/stack/include/ocstack.h
-             ../../csdk/stack/include/octypes.h
-             ../../csdk/stack/include/ocpayload.h
+             ../../csdk/security/provisioning/include/ocprovisioningmanager.h \
+             ../../csdk/security/provisioning/include/pmtypes.h \
+             ../../csdk/security/provisioning/include/pmutility.h \
+             ../../csdk/stack/include/ocstack.h \
+             ../../csdk/stack/include/octypes.h \
+             ../../csdk/stack/include/ocpayload.h \
              ../../csdk/stack/include/ocpresence.h \
              ../../csdk/stack/include/payload_logging.h \
              ../../csdk/stack/include/ocstackconfig.h \
@@ -686,11 +686,12 @@ INPUT                  = . \
              ../../csdk/security/provisioning/include/internal \
              ../../csdk/security/provisioning/include/oxm \
              ../../csdk/security/provisioning/include/cloud \
-             ../../csdk/security/provisioning/sample/cloudAuth.h \
-             ../../csdk/security/provisioning/sample/cloudWrapper.h \
+             ../../csdk/resource-directory/include \
+             ../../csdk/routing/include \
              ../../../service/easy-setup/inc \
              ../../../service/easy-setup/enrollee/inc \
-             ../../../service/resource-directory/include \
+             ../../../service/notification/include \
+             ../../../service/coap-http-proxy/include \
 
 
 # This tag can be used to specify the character encoding of the source files

diff --git a/resource/docs/cpp-doc/Doxyfile b/resource/docs/cpp-doc/Doxyfile
index f5e55e8..3e65fc8 100644 (file)
--- a/resource/docs/cpp-doc/Doxyfile
+++ b/resource/docs/cpp-doc/Doxyfile
@@ -671,15 +671,15 @@ INPUT                  = . \
                          ../../csdk/stack/include/ocstackconfig.h \
                          guides \
                          ../../../service/resource-encapsulation/include \
-                         ../../../service/resource-hosting/include \
                          ../../../service/resource-container/include \
                          ../../../service/resource-container/bundle-api/include \
-                         ../../../service/things-manager/sdk/inc/ThingsConfiguration.h \
-                         ../../../service/things-manager/sdk/inc/ThingsMaintenance.h \
                          ../../../service/easy-setup/mediator/richsdk/inc/ \
                          ../../../service/easy-setup/inc \
                          ../../../service/scene-manager/include \
 
+                         #../../../service/resource-hosting/include \
+                         #../../../service/things-manager/sdk/inc/ThingsConfiguration.h \
+                         #../../../service/things-manager/sdk/inc/ThingsMaintenance.h \
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
 # also the default input encoding. Doxygen uses libiconv (or the iconv built

diff --git a/resource/docs/javadocGen.sh b/resource/docs/javadocGen.sh
index b8885d7..a2fa68f 100755 (executable)
--- a/resource/docs/javadocGen.sh
+++ b/resource/docs/javadocGen.sh
@@ -39,9 +39,15 @@ EASYSETUP_PKG=org.iotivity.service.easysetup.mediator
 RESOURCECONTAINER_PATH="../../service/resource-container/android/resource-container/src/main/java/"
 RESOURCECONTAINER_PKG=org.iotivity.service.resourcecontainer
 
+NS_PATH="../../service/notification/android/notification-service/src/main/java/"
+NS_PKG_1=org.iotivity.service.ns.common
+NS_PKG_2=org.iotivity.service.ns.provider
+NS_PKG_3=org.iotivity.service.ns.consumer
+
+
 javadoc -public -splitindex -d ./Java_API -sourcepath \
-    $BASE_PATH:$RE_PATH:$RH_PATH:$EASYSETUP_PATH:$RESOURCECONTAINER_PATH \
-    $BASE_PKG $RE_COMMON_PKG  $RE_CLINET_PKG $RE_SERVER_PKG $TM_SRCS $TM_PKG $RH_PKG $EASYSETUP_PKG \
-    $RESOURCECONTAINER_PKG 
+    $BASE_PATH:$RE_PATH:$RH_PATH:$EASYSETUP_PATH:$RESOURCECONTAINER_PATH:$NS_PATH \
+    $BASE_PKG $RE_COMMON_PKG  $RE_CLINET_PKG $RE_SERVER_PKG $EASYSETUP_PKG \
+    $RESOURCECONTAINER_PKG $NS_PKG_1 $NS_PKG_2 $NS_PKG_3